[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58706] trunk/blender/source/blender: minor changes for confusing code.

[Campbell Barton]

Revision: 58706
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58706
Author:   campbellbarton
Date:     2013-07-29 04:45:40 +0000 (Mon, 29 Jul 2013)
Log Message:
-----------
minor changes for confusing code.
- memset() was argument was truncated.
- outliner had redundant NULL check.
- node texture was allocating memory to make a unique name which isnt needed for a fixed size string.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/render/render_preview.c
    trunk/blender/source/blender/editors/space_outliner/outliner_tree.c
    trunk/blender/source/blender/nodes/texture/nodes/node_texture_output.c

Modified: trunk/blender/source/blender/editors/render/render_preview.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_preview.c	2013-07-29 04:18:01 UTC (rev 58705)
+++ trunk/blender/source/blender/editors/render/render_preview.c	2013-07-29 04:45:40 UTC (rev 58706)
@@ -964,7 +964,7 @@
 
 		br->icon_imbuf = get_brush_icon(br);
 
-		memset(sp->pr_rect, 0x888888, sp->sizex * sp->sizey * sizeof(unsigned int));
+		memset(sp->pr_rect, 0x88, sp->sizex * sp->sizey * sizeof(unsigned int));
 
 		if (!(br->icon_imbuf) || !(br->icon_imbuf->rect))
 			return;

Modified: trunk/blender/source/blender/editors/space_outliner/outliner_tree.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_tree.c	2013-07-29 04:18:01 UTC (rev 58705)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_tree.c	2013-07-29 04:45:40 UTC (rev 58706)
@@ -1131,7 +1131,7 @@
 {
 	Sequence *p;
 
-	if ((!seq->strip) || (!seq->strip->stripdata) || (!seq->strip->stripdata->name))
+	if ((!seq->strip) || (!seq->strip->stripdata))
 		return(1);
 
 	/*

Modified: trunk/blender/source/blender/nodes/texture/nodes/node_texture_output.c
===================================================================
--- trunk/blender/source/blender/nodes/texture/nodes/node_texture_output.c	2013-07-29 04:18:01 UTC (rev 58705)
+++ trunk/blender/source/blender/nodes/texture/nodes/node_texture_output.c	2013-07-29 04:45:40 UTC (rev 58706)
@@ -80,12 +80,13 @@
 static void unique_name(bNode *node)
 {
 	TexNodeOutput *tno = (TexNodeOutput *)node->storage;
-	char *new_name = NULL;
+	char new_name[sizeof(tno->name)];
 	int new_len = 0;
 	int suffix;
 	bNode *i;
 	char *name = tno->name;
 	
+	new_name[0] = '\0';
 	i = node;
 	while (i->prev) i = i->prev;
 	for (; i; i = i->next) {
@@ -96,7 +97,7 @@
 			continue;
 		}
 
-		if (!new_name) {
+		if (new_name[0] == '\0') {
 			int len = strlen(name);
 			if (len >= 4 && sscanf(name + len - 4, ".%03d", &suffix) == 1) {
 				new_len = len;
@@ -107,17 +108,15 @@
 				if (new_len > (sizeof(tno->name) - 1))
 					new_len = (sizeof(tno->name) - 1);
 			}
-			
-			new_name = MEM_mallocN(new_len + 1, "new_name");
-			strcpy(new_name, name);
+
+			BLI_strncpy(new_name, name, sizeof(tno->name));
 			name = new_name;
 		}
 		sprintf(new_name + new_len - 4, ".%03d", ++suffix);
 	}
 	
-	if (new_name) {
-		strcpy(tno->name, new_name);
-		MEM_freeN(new_name);
+	if (new_name[0] != '\0') {
+		BLI_strncpy(tno->name, new_name, sizeof(tno->name));
 	}
 }