style cleanup: also quiet harmless compiler warning.

source/blender/editors/space_logic/space_logic.c

@@ -93,10 +93,10 @@ static SpaceLink *logic_new(const bContext *UNUSED(C))
 	slogic->spacetype= SPACE_LOGIC;
 	
 	/* default options */
-	slogic->scaflag =	(BUTS_SENS_SEL|BUTS_SENS_ACT|BUTS_SENS_LINK) 	|
+	slogic->scaflag = ((BUTS_SENS_SEL|BUTS_SENS_ACT|BUTS_SENS_LINK) |
 	                   (BUTS_CONT_SEL|BUTS_CONT_ACT|BUTS_CONT_LINK) |
 	                   (BUTS_ACT_SEL|BUTS_ACT_ACT|BUTS_ACT_LINK)    |
-						(BUTS_SENS_STATE|BUTS_ACT_STATE);
+	                   (BUTS_SENS_STATE|BUTS_ACT_STATE));
 	
 	
 	/* header */

source/blender/editors/transform/transform_generics.c

@@ -1712,7 +1712,7 @@ void calculatePropRatio(TransInfo *t)
 				/*
 				 * The elements are sorted according to their dist member in the array,
 				 * that means we can stop when it finds one element outside of the propsize.
-				 * do not set td->flag |= TD_NOACTION , the prop circle is being changed.
+				 * do not set 'td->flag |= TD_NOACTION', the prop circle is being changed.
 				 */
 				
 				td->factor = 0.0f;

source/blender/modifiers/intern/MOD_array.c

@@ -314,7 +314,8 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
 	BMesh *bm = DM_to_bmesh(dm);
 	BMOperator first_dupe_op, dupe_op, old_dupe_op, weld_op;
 	BMVert **first_geom = NULL;
-	int i, j, indexLen;
+	int i, j;
+	int index_len = -1;  /* initialize to an invalid value */
 	/* offset matrix */
 	float offset[4][4];
 	float final_offset[4][4];
@@ -452,12 +453,15 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
 			/*calculate merge mapping*/
 			if (j == 0) {
 				indexMap = find_doubles_index_map(bm, &dupe_op,
-				                                  amd, &indexLen);
+				                                  amd, &index_len);
 			}
 
 			#define _E(s, i) ((BMVert **)(s)->data.buf)[i]
 
-			for (i = 0; i < indexLen; i++) {
+			/* ensure this is set */
+			BLI_assert(index_len != -1);
+
+			for (i = 0; i < index_len; i++) {
 				if (!indexMap[i]) continue;
 
 				/* merge v (from 'newout') into v2 (from old 'geom') */