misc minor edits.

- pass string size to BLI_timestr() to avoid possible buffer overrun.
- quiet warning for mingw.
- include guards for windows utf conversion funcs.
- fix for mistage in edge-angle-selection check.
- some style cleanup.

intern/cycles/blender/blender_session.cpp

@@ -576,7 +576,7 @@ void BlenderSession::update_status_progress()
 		timestatus += ", "  + b_rlay_name;
 	timestatus += " | ";
 
-	BLI_timestr(total_time, time_str);
+	BLI_timestr(total_time, time_str, sizeof(time_str));
 	timestatus += "Elapsed: " + string(time_str) + " | ";
 
 	if(substatus.size() > 0)

intern/cycles/blender/blender_util.h

@@ -30,7 +30,7 @@
  * todo: clean this up ... */
 
 extern "C" {
-void BLI_timestr(double _time, char *str);
+void BLI_timestr(double _time, char *str, size_t maxlen);
 void BKE_image_user_frame_calc(void *iuser, int cfra, int fieldnr);
 void BKE_image_user_file_path(void *iuser, void *ima, char *path);
 unsigned char *BKE_image_get_pixels_for_frame(void *image, int frame);

intern/utfconv/utf_winfunc.h

@@ -23,6 +23,9 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#ifndef __UTF_WINFUNC_H__
+#define __UTF_WINFUNC_H__
+
 #ifndef WIN32
 #  error "This file can only compile on windows"
 #endif
@@ -41,3 +44,5 @@ int uput_getenv(const char *varname, char * value, size_t buffsize);
 int uputenv(const char *name, const char *value);
 
 int umkdir(const char *pathname);
+
+#endif  /* __UTF_WINFUNC_H__ */

intern/utfconv/utfconv.h

@@ -23,6 +23,9 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#ifndef __UTFCONV_H__
+#define __UTFCONV_H__
+
 #include <wchar.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -98,3 +101,5 @@ wchar_t *alloc_utf16_from_8(const char *in8, size_t add);
 #ifdef __cplusplus 
 }
 #endif
+
+#endif  /* __UTFCONV_H__ */

source/blender/blenkernel/intern/image.c

@@ -1601,7 +1601,7 @@ static void stampdata(Scene *scene, Object *camera, StampData *stamp_data, int d
 		RenderStats *stats = re ? RE_GetStats(re) : NULL;
 
 		if (stats && (scene->r.stamp & R_STAMP_RENDERTIME)) {
-			BLI_timestr(stats->lastframetime, text);
+			BLI_timestr(stats->lastframetime, text, sizeof(text));
 
 			BLI_snprintf(stamp_data->rendertime, sizeof(stamp_data->rendertime), do_prefix ? "RenderTime %s" : "%s", text);
 		}

source/blender/blenlib/BLI_string.h

@@ -150,7 +150,7 @@ __attribute__((warn_unused_result))
 __attribute__((nonnull))
 #endif
 ;
-void BLI_timestr(double _time, char *str)
+void BLI_timestr(double _time, char *str, size_t maxlen)
 #ifdef __GNUC__
 __attribute__((nonnull))
 #endif

source/blender/blenlib/intern/string.c

@@ -490,22 +490,20 @@ int BLI_natstrcmp(const char *s1, const char *s2)
 	return 0;
 }
 
-void BLI_timestr(double _time, char *str)
+void BLI_timestr(double _time, char *str, size_t maxlen)
 {
 	/* format 00:00:00.00 (hr:min:sec) string has to be 12 long */
 	int  hr = ( (int)  _time) / (60 * 60);
 	int min = (((int)  _time) / 60 ) % 60;
-	int sec = ( (int) (_time)) % 60;
+	int sec = ( (int)  _time) % 60;
 	int hun = ( (int) (_time   * 100.0)) % 100;
 
 	if (hr) {
-		sprintf(str, "%.2d:%.2d:%.2d.%.2d", hr, min, sec, hun);
+		BLI_snprintf(str, maxlen, "%.2d:%.2d:%.2d.%.2d", hr, min, sec, hun);
 	}
 	else {
-		sprintf(str, "%.2d:%.2d.%.2d", min, sec, hun);
+		BLI_snprintf(str, maxlen, "%.2d:%.2d.%.2d", min, sec, hun);
 	}
-	
-	str[11] = 0;
 }
 
 /* determine the length of a fixed-size string */

source/blender/compositor/intern/COM_ExecutionGroup.cpp

@@ -435,7 +435,7 @@ void ExecutionGroup::printBackgroundStats(void)
 	fprintf(stdout, "Mem:%.2fM (%.2fM, Peak %.2fM) ",
 	        megs_used_memory, mmap_used_memory, megs_peak_memory);
 
-	BLI_timestr(execution_time, timestr);
+	BLI_timestr(execution_time, timestr, sizeof(timestr));
 	printf("| Elapsed %s ", timestr);
 	printf("| Tree %s, Tile %d-%d ", this->m_bTree->id.name + 2,
 	       this->m_chunksFinished, this->m_numberOfChunks);

source/blender/editors/physics/dynamicpaint_ops.c

@@ -394,7 +394,7 @@ static int dynamicPaint_initBake(struct bContext *C, struct wmOperator *op)
 		/* Format time string */
 		char time_str[30];
 		double time = PIL_check_seconds_timer() - timer;
-		BLI_timestr(time, time_str);
+		BLI_timestr(time, time_str, sizeof(time_str));
 
 		/* Show bake info */
 		BKE_reportf(op->reports, RPT_INFO, "Bake complete! (%s)", time_str);

source/blender/editors/render/render_internal.c

@@ -311,7 +311,7 @@ static void make_renderinfo_string(RenderStats *rs, Scene *scene, char *str)
 			spos += sprintf(spos, IFACE_("Blur %d "), rs->curblur);
 	}
 
-	BLI_timestr(rs->lastframetime, info_time_str);
+	BLI_timestr(rs->lastframetime, info_time_str, sizeof(info_time_str));
 	spos += sprintf(spos, IFACE_("Time:%s "), info_time_str);
 
 	if (rs->curfsa)

source/blender/editors/space_view3d/drawobject.c

@@ -2671,8 +2671,8 @@ static void draw_em_measure_stats(View3D *v3d, Object *ob, BMEditMesh *em, UnitS
 				                   /* special case, this is useful to show when vertes connected to this edge via a
 				                    * face are being transformed */
 				                   BM_elem_flag_test(l_a->next->next->v, BM_ELEM_SELECT) ||
-				                   BM_elem_flag_test(l_b->prev->v, BM_ELEM_SELECT)       ||
+				                   BM_elem_flag_test(l_a->prev->v, BM_ELEM_SELECT)       ||
-				                   BM_elem_flag_test(l_a->next->next->v, BM_ELEM_SELECT) ||
+				                   BM_elem_flag_test(l_b->next->next->v, BM_ELEM_SELECT) ||
 				                   BM_elem_flag_test(l_b->prev->v, BM_ELEM_SELECT)
 				                   )))
 				{

source/blender/render/intern/source/pipeline.c

@@ -2357,12 +2357,12 @@ static int do_write_image_or_movie(Render *re, Main *bmain, Scene *scene, bMovie
 	render_time = re->i.lastframetime;
 	re->i.lastframetime = PIL_check_seconds_timer() - re->i.starttime;
 	
-	BLI_timestr(re->i.lastframetime, name);
+	BLI_timestr(re->i.lastframetime, name, sizeof(name));
 	printf(" Time: %s", name);
 	
 	BLI_callback_exec(G.main, NULL, BLI_CB_EVT_RENDER_STATS);
 
-	BLI_timestr(re->i.lastframetime - render_time, name);
+	BLI_timestr(re->i.lastframetime - render_time, name, sizeof(name));
 	printf(" (Saving: %s)\n", name);
 	
 	fputc('\n', stdout);

source/blender/windowmanager/intern/wm_files.c

@@ -956,7 +956,7 @@ void wm_autosave_location(char *filepath)
 {
 	char pidstr[32];
 #ifdef WIN32
-	char *savedir;
+	const char *savedir;
 #endif
 
 	BLI_snprintf(pidstr, sizeof(pidstr), "%d.blend", abs(getpid()));