[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55277] trunk/blender/source/blender: use BLI_strncpy_rlen() rather then BLI_snprintf() when no formatting is needed.

Campbell Barton ideasman42 at gmail.com
Thu Mar 14 11:39:19 CET 2013


Revision: 55277
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55277
Author:   campbellbarton
Date:     2013-03-14 10:39:18 +0000 (Thu, 14 Mar 2013)
Log Message:
-----------
use BLI_strncpy_rlen() rather then BLI_snprintf() when no formatting is needed.
also replace sprintf with strcpy when no formatting is done.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/unit.c
    trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
    trunk/blender/source/blender/collada/ExtraHandler.cpp
    trunk/blender/source/blender/editors/armature/editarmature_retarget.c
    trunk/blender/source/blender/editors/armature/editarmature_sketch.c
    trunk/blender/source/blender/editors/object/object_vgroup.c
    trunk/blender/source/blender/editors/space_buttons/buttons_texture.c
    trunk/blender/source/blender/editors/space_clip/clip_draw.c
    trunk/blender/source/blender/editors/space_image/image_buttons.c
    trunk/blender/source/blender/editors/space_info/info_stats.c
    trunk/blender/source/blender/editors/space_nla/nla_draw.c
    trunk/blender/source/blender/editors/transform/transform.c
    trunk/blender/source/blender/editors/transform/transform_orientations.c
    trunk/blender/source/blender/imbuf/intern/indexer.c
    trunk/blender/source/blender/quicktime/apple/quicktime_export.c
    trunk/blender/source/blender/quicktime/apple/quicktime_import.c
    trunk/blender/source/blender/windowmanager/intern/wm_keymap.c

Modified: trunk/blender/source/blender/blenkernel/intern/unit.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/unit.c	2013-03-14 10:15:10 UTC (rev 55276)
+++ trunk/blender/source/blender/blenkernel/intern/unit.c	2013-03-14 10:39:18 UTC (rev 55277)
@@ -718,7 +718,7 @@
 
 				/* print the alt_name */
 				if (unit->name_alt)
-					len_name = BLI_snprintf(str, len_max, "%s", unit->name_alt);
+					len_name = BLI_strncpy_rlen(str, unit->name_alt, len_max);
 				else
 					len_name = 0;
 

Modified: trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c	2013-03-14 10:15:10 UTC (rev 55276)
+++ trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c	2013-03-14 10:39:18 UTC (rev 55277)
@@ -786,7 +786,7 @@
 
 	fmt->audio_codec = ffmpeg_audio_codec;
 
-	BLI_snprintf(of->filename, sizeof(of->filename), "%s", name);
+	BLI_strncpy(of->filename, name, sizeof(of->filename));
 	/* set the codec to the user's selection */
 	switch (ffmpeg_type) {
 		case FFMPEG_AVI:

Modified: trunk/blender/source/blender/collada/ExtraHandler.cpp
===================================================================
--- trunk/blender/source/blender/collada/ExtraHandler.cpp	2013-03-14 10:15:10 UTC (rev 55276)
+++ trunk/blender/source/blender/collada/ExtraHandler.cpp	2013-03-14 10:39:18 UTC (rev 55277)
@@ -57,7 +57,7 @@
 	
 	if (currentElement.length() == 0 || currentExtraTags == 0) return false;
 	
-	BLI_snprintf(buf, textLength + 1, "%s", text);
+	BLI_strncpy(buf, text, textLength + 1);
 	currentExtraTags->addTag(currentElement, std::string(buf));
 	return true;
 }

Modified: trunk/blender/source/blender/editors/armature/editarmature_retarget.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature_retarget.c	2013-03-14 10:15:10 UTC (rev 55276)
+++ trunk/blender/source/blender/editors/armature/editarmature_retarget.c	2013-03-14 10:39:18 UTC (rev 55277)
@@ -409,11 +409,11 @@
 	for (i = 0, j = 0; i < (MAXBONENAME - 1) && j < (MAXBONENAME - 1) && template_name[i] != '\0'; i++) {
 		if (template_name[i] == '&') {
 			if (template_name[i + 1] == 'S' || template_name[i + 1] == 's') {
-				j += sprintf(name + j, "%s", side_string);
+				j += BLI_strncpy_rlen(name + j, side_string, MAXBONENAME);
 				i++;
 			}
 			else if (template_name[i + 1] == 'N' || template_name[i + 1] == 'n') {
-				j += sprintf(name + j, "%s", num_string);
+				j += BLI_strncpy_rlen(name + j, num_string, MAXBONENAME);
 				i++;
 			}
 			else {

Modified: trunk/blender/source/blender/editors/armature/editarmature_sketch.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature_sketch.c	2013-03-14 10:15:10 UTC (rev 55276)
+++ trunk/blender/source/blender/editors/armature/editarmature_sketch.c	2013-03-14 10:39:18 UTC (rev 55277)
@@ -170,17 +170,17 @@
 	GHashIterator ghi;
 	const char *menu_header = IFACE_("Template %t|None %x0|");
 	char *p;
+	const size_t template_size = (BLI_ghash_size(TEMPLATES_HASH) * 32 + 30);
 
 	if (TEMPLATES_MENU != NULL) {
 		MEM_freeN(TEMPLATES_MENU);
 	}
 
-	TEMPLATES_MENU = MEM_callocN(sizeof(char) * (BLI_ghash_size(TEMPLATES_HASH) * 32 + 30), "skeleton template menu");
+	TEMPLATES_MENU = MEM_callocN(sizeof(char) * template_size, "skeleton template menu");
 
 	p = TEMPLATES_MENU;
+	p += BLI_strncpy_rlen(p, menu_header, template_size);
 
-	p += sprintf(TEMPLATES_MENU, "%s", menu_header);
-
 	BLI_ghashIterator_init(&ghi, TEMPLATES_HASH);
 
 	while (BLI_ghashIterator_notDone(&ghi)) {

Modified: trunk/blender/source/blender/editors/object/object_vgroup.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_vgroup.c	2013-03-14 10:15:10 UTC (rev 55276)
+++ trunk/blender/source/blender/editors/object/object_vgroup.c	2013-03-14 10:39:18 UTC (rev 55277)
@@ -1037,7 +1037,7 @@
 		BLI_snprintf(name, sizeof(name), "%s_copy", dg->name);
 	}
 	else {
-		BLI_snprintf(name, sizeof(name), "%s", dg->name);
+		BLI_strncpy(name, dg->name, sizeof(name));
 	}
 
 	cdg = defgroup_duplicate(dg);

Modified: trunk/blender/source/blender/editors/space_buttons/buttons_texture.c
===================================================================
--- trunk/blender/source/blender/editors/space_buttons/buttons_texture.c	2013-03-14 10:15:10 UTC (rev 55276)
+++ trunk/blender/source/blender/editors/space_buttons/buttons_texture.c	2013-03-14 10:39:18 UTC (rev 55277)
@@ -404,7 +404,7 @@
 	}
 
 	/* create button */
-	BLI_snprintf(name, UI_MAX_NAME_STR, "%s", user->name);
+	BLI_strncpy(name, user->name, UI_MAX_NAME_STR);
 
 	if (user->icon) {
 		but = uiDefIconTextMenuBut(block, template_texture_user_menu, NULL,

Modified: trunk/blender/source/blender/editors/space_clip/clip_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_draw.c	2013-03-14 10:15:10 UTC (rev 55276)
+++ trunk/blender/source/blender/editors/space_clip/clip_draw.c	2013-03-14 10:39:18 UTC (rev 55277)
@@ -944,7 +944,7 @@
 	if (state[0])
 		BLI_snprintf(str, sizeof(str), "%s: %s", track->name, state);
 	else
-		BLI_snprintf(str, sizeof(str), "%s", track->name);
+		BLI_strncpy(str, track->name, sizeof(str));
 
 	BLF_position(fontid, pos[0], pos[1], 0.0f);
 	BLF_draw(fontid, str, sizeof(str));

Modified: trunk/blender/source/blender/editors/space_image/image_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_buttons.c	2013-03-14 10:15:10 UTC (rev 55276)
+++ trunk/blender/source/blender/editors/space_image/image_buttons.c	2013-03-14 10:39:18 UTC (rev 55277)
@@ -82,17 +82,18 @@
 		return;
 
 	if (ibuf == NULL) {
-		ofs += BLI_snprintf(str + ofs, len - ofs, "%s", IFACE_("Can't Load Image"));
+		ofs += BLI_strncpy_rlen(str + ofs, IFACE_("Can't Load Image"), len - ofs);
 	}
 	else {
 		if (ima->source == IMA_SRC_MOVIE) {
-			ofs += BLI_snprintf(str + ofs, len - ofs, "%s", IFACE_("Movie"));
+			ofs += BLI_strncpy_rlen(str + ofs, IFACE_("Movie"), len - ofs);
 			if (ima->anim)
 				ofs += BLI_snprintf(str + ofs, len - ofs, IFACE_(" %d frs"),
 				                    IMB_anim_get_duration(ima->anim, IMB_TC_RECORD_RUN));
 		}
-		else
-			ofs += BLI_snprintf(str, len - ofs, "%s", IFACE_("Image"));
+		else {
+			ofs += BLI_strncpy_rlen(str, IFACE_("Image"), len - ofs);
+		}
 
 		ofs += BLI_snprintf(str + ofs, len - ofs, IFACE_(": size %d x %d,"), ibuf->x, ibuf->y);
 
@@ -101,18 +102,18 @@
 				ofs += BLI_snprintf(str + ofs, len - ofs, IFACE_("%d float channel(s)"), ibuf->channels);
 			}
 			else if (ibuf->planes == R_IMF_PLANES_RGBA)
-				ofs += BLI_snprintf(str + ofs, len - ofs, "%s", IFACE_(" RGBA float"));
+				ofs += BLI_strncpy_rlen(str + ofs, IFACE_(" RGBA float"), len - ofs);
 			else
-				ofs += BLI_snprintf(str + ofs, len - ofs, "%s", IFACE_(" RGB float"));
+				ofs += BLI_strncpy_rlen(str + ofs, IFACE_(" RGB float"), len - ofs);
 		}
 		else {
 			if (ibuf->planes == R_IMF_PLANES_RGBA)
-				ofs += BLI_snprintf(str + ofs, len - ofs, "%s", IFACE_(" RGBA byte"));
+				ofs += BLI_strncpy_rlen(str + ofs, IFACE_(" RGBA byte"), len - ofs);
 			else
-				ofs += BLI_snprintf(str + ofs, len - ofs, "%s", IFACE_(" RGB byte"));
+				ofs += BLI_strncpy_rlen(str + ofs, IFACE_(" RGB byte"), len - ofs);
 		}
 		if (ibuf->zbuf || ibuf->zbuf_float)
-			ofs += BLI_snprintf(str + ofs, len - ofs, "%s", IFACE_(" + Z"));
+			ofs += BLI_strncpy_rlen(str + ofs, IFACE_(" + Z"), len - ofs);
 
 		if (ima->source == IMA_SRC_SEQUENCE) {
 			const char *file = BLI_last_slash(ibuf->name);

Modified: trunk/blender/source/blender/editors/space_info/info_stats.c
===================================================================
--- trunk/blender/source/blender/editors/space_info/info_stats.c	2013-03-14 10:15:10 UTC (rev 55276)
+++ trunk/blender/source/blender/editors/space_info/info_stats.c	2013-03-14 10:39:18 UTC (rev 55277)
@@ -384,7 +384,7 @@
 
 	if (scene->obedit) {
 		if (BKE_keyblock_from_object(scene->obedit))
-			ofs += BLI_snprintf(s + ofs, MAX_INFO_LEN - ofs, "%s", IFACE_("(Key) "));
+			ofs += BLI_strncpy_rlen(s + ofs, IFACE_("(Key) "), MAX_INFO_LEN - ofs);
 
 		if (scene->obedit->type == OB_MESH) {
 			ofs += BLI_snprintf(s + ofs, MAX_INFO_LEN - ofs,
@@ -400,7 +400,7 @@
 			ofs += BLI_snprintf(s + ofs, MAX_INFO_LEN - ofs, IFACE_("Verts:%d/%d"), stats->totvertsel, stats->totvert);
 		}
 
-		ofs += BLI_snprintf(s + ofs, MAX_INFO_LEN - ofs, "%s", memstr);
+		ofs += BLI_strncpy_rlen(s + ofs, memstr, MAX_INFO_LEN - ofs);
 	}
 	else if (ob && (ob->mode & OB_MODE_POSE)) {
 		ofs += BLI_snprintf(s + ofs, MAX_INFO_LEN - ofs, IFACE_("Bones:%d/%d %s"),

Modified: trunk/blender/source/blender/editors/space_nla/nla_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_nla/nla_draw.c	2013-03-14 10:15:10 UTC (rev 55276)
+++ trunk/blender/source/blender/editors/space_nla/nla_draw.c	2013-03-14 10:39:18 UTC (rev 55277)
@@ -695,11 +695,8 @@
 					
 					special = ICON_ACTION;
 					
-					if (act)
-						BLI_snprintf(name, sizeof(name), "%s", act->id.name + 2);
-					else
-						BLI_strncpy(name, "<No Action>", sizeof(name));
-						
+					BLI_strncpy(name, act ? act->id.name + 2 : "<No Action>", sizeof(name));
+
 					/* draw manually still */
 					do_draw = TRUE;
 				}

Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c	2013-03-14 10:15:10 UTC (rev 55276)
+++ trunk/blender/source/blender/editors/transform/transform.c	2013-03-14 10:39:18 UTC (rev 55277)
@@ -4112,7 +4112,7 @@
 	applyNumInput(&t->num, &distance);
 
 	/* header print for NumInput */
-	ofs += BLI_snprintf(str + ofs, MAX_INFO_LEN - ofs, "%s", IFACE_("Shrink/Fatten:"));
+	ofs += BLI_strncpy_rlen(str + ofs, IFACE_("Shrink/Fatten:"), MAX_INFO_LEN - ofs);
 	if (hasNumInput(&t->num)) {
 		char c[NUM_STR_REP_LEN];
 		outputNumInput(&(t->num), c);
@@ -6481,12 +6481,12 @@
 	}
 
 	/* header string */

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list