minor cleanup for string use - no functional changes

- use more logical names for strings, noticed too many strings called `str` when reviewing name patch.
- pass __func__ macro to uiBeginBlock(), quite a few names were wrong (copy/paste error).

2 files changed, 10 insertions, 10 deletions

diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index a5c8f5c905d..6ee2da9f7dc 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -1202,14 +1202,14 @@ static void stampdata(Scene *scene, Object *camera, StampData *stamp_data, int d
 	}
 	
 	if (scene->r.stamp & R_STAMP_FRAME) {
-		char format[32];
+		char fmtstr[32];
 		int digits= 1;
 		
 		if(scene->r.efra>9)
 			digits= 1 + (int) log10(scene->r.efra);
 
-		BLI_snprintf(format, sizeof(format), do_prefix ? "Frame %%0%di":"%%0%di", digits);
-		BLI_snprintf (stamp_data->frame, sizeof(stamp_data->frame), format, scene->r.cfra);
+		BLI_snprintf(fmtstr, sizeof(fmtstr), do_prefix ? "Frame %%0%di":"%%0%di", digits);
+		BLI_snprintf (stamp_data->frame, sizeof(stamp_data->frame), fmtstr, scene->r.cfra);
 	} else {
 		stamp_data->frame[0] = '\0';
 	}
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index 315f1e14e61..795cf75820f 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -991,7 +991,7 @@ static void IDnames_to_dyn_pupstring(DynStr *pupds, ListBase *lb, ID *link, shor
 		ID *id;
 		
 		for (i=0, id= lb->first; id; id= id->next, i++) {
-			char buf[32];
+			char numstr[32];
 			
 			if (nr && id==link) *nr= i+1;
 
@@ -1002,12 +1002,12 @@ static void IDnames_to_dyn_pupstring(DynStr *pupds, ListBase *lb, ID *link, shor
 					if ( ((Image *)id)->source==IMA_SRC_VIEWER )
 						continue;
 			
-			get_flags_for_id(id, buf);
+			get_flags_for_id(id, numstr);
 				
-			BLI_dynstr_append(pupds, buf);
+			BLI_dynstr_append(pupds, numstr);
 			BLI_dynstr_append(pupds, id->name+2);
-			BLI_snprintf(buf, sizeof(buf), "%%x%d", i+1);
-			BLI_dynstr_append(pupds, buf);
+			BLI_snprintf(numstr, sizeof(numstr), "%%x%d", i+1);
+			BLI_dynstr_append(pupds, numstr);
 			
 			/* icon */
 			switch(GS(id->name))
@@ -1017,8 +1017,8 @@ static void IDnames_to_dyn_pupstring(DynStr *pupds, ListBase *lb, ID *link, shor
 			case ID_IM: /* fall through */
 			case ID_WO: /* fall through */
 			case ID_LA: /* fall through */
-				BLI_snprintf(buf, sizeof(buf), "%%i%d", BKE_icon_getid(id) );
-				BLI_dynstr_append(pupds, buf);
+				BLI_snprintf(numstr, sizeof(numstr), "%%i%d", BKE_icon_getid(id) );
+				BLI_dynstr_append(pupds, numstr);
 				break;
 			default:
 				break;