Sophie

Sophie

distrib > Mageia > 1 > i586 > media > core-updates-src > by-pkgid > cc1449fd094f04e3bf58d09425996df5 > files > 22

blender-2.49b-11.3.mga1.src.rpm

diff -p -up blender-2.49a/intern/opennl/superlu/util.c.wformat blender-2.49a/intern/opennl/superlu/util.c
--- blender-2.49a/intern/opennl/superlu/util.c.wformat	2005-03-09 20:45:59.000000000 +0100
+++ blender-2.49a/intern/opennl/superlu/util.c	2009-06-19 01:29:13.000000000 +0200
@@ -34,7 +34,7 @@ float DenseSize(int n, float sum_nw);
 
 void superlu_abort_and_exit(char* msg)
 {
-    fprintf(stderr, msg);
+    fprintf(stderr, "%s", msg);
     exit (-1);
 }
 
diff -p -up blender-2.49a/source/blender/python/api2_2x/EXPP_interface.c.wformat blender-2.49a/source/blender/python/api2_2x/EXPP_interface.c
--- blender-2.49a/source/blender/python/api2_2x/EXPP_interface.c.wformat	2008-04-17 00:40:48.000000000 +0200
+++ blender-2.49a/source/blender/python/api2_2x/EXPP_interface.c	2009-06-19 01:52:08.000000000 +0200
@@ -73,7 +73,7 @@ char *bpy_gethome(int append_scriptsdir)
 	}
 
 	if( strstr( s, ".blender" ) )
-		PyOS_snprintf( homedir, FILE_MAXDIR, s );
+		PyOS_snprintf( homedir, FILE_MAXDIR, "%s", s );
 	else
 		BLI_make_file_string( "/", homedir, s, ".blender" );
 
diff -p -up blender-2.49a/source/blender/python/api2_2x/Mesh.c.wformat blender-2.49a/source/blender/python/api2_2x/Mesh.c
--- blender-2.49a/source/blender/python/api2_2x/Mesh.c.wformat	2009-01-15 19:06:06.000000000 +0100
+++ blender-2.49a/source/blender/python/api2_2x/Mesh.c	2009-06-19 01:53:36.000000000 +0200
@@ -6729,7 +6729,7 @@ static PyObject *Mesh_renameVertGroup( B
 		return EXPP_ReturnPyObjError( PyExc_RuntimeError,
 					      "couldn't find the vertex group" );
 
-	PyOS_snprintf( defGroup->name, 32, newGr );
+	PyOS_snprintf( defGroup->name, 32, "%s", newGr );
 	unique_vertexgroup_name( defGroup, object );
 
 	Py_RETURN_NONE;
diff -p -up blender-2.49a/source/blender/python/api2_2x/NMesh.c.wformat blender-2.49a/source/blender/python/api2_2x/NMesh.c
--- blender-2.49a/source/blender/python/api2_2x/NMesh.c.wformat	2009-01-01 17:18:54.000000000 +0100
+++ blender-2.49a/source/blender/python/api2_2x/NMesh.c	2009-06-19 01:55:30.000000000 +0200
@@ -4068,7 +4068,7 @@ static PyObject *NMesh_renameVertGroup( 
 		return EXPP_ReturnPyObjError( PyExc_RuntimeError,
 					      "Couldn't find the expected vertex group" );
 
-	PyOS_snprintf( defGroup->name, 32, newGr );
+	PyOS_snprintf( defGroup->name, 32, "%s", newGr );
 	unique_vertexgroup_name( defGroup, ( ( BPy_NMesh * ) self )->object );
 
 	Py_RETURN_NONE;
diff -p -up blender-2.49a/source/blender/render/intern/source/pipeline.c.wformat blender-2.49a/source/blender/render/intern/source/pipeline.c
--- blender-2.49a/source/blender/render/intern/source/pipeline.c.wformat	2009-06-19 01:29:13.000000000 +0200
+++ blender-2.49a/source/blender/render/intern/source/pipeline.c	2009-06-19 01:29:13.000000000 +0200
@@ -159,7 +159,7 @@ static void stats_background(RenderStats
 		else 
 			spos+= sprintf(spos, "Sce: %s Ve:%d Fa:%d La:%d", G.scene->id.name+2, rs->totvert, rs->totface, rs->totlamp);
 	}
-	printf(str); printf("\n");
+	printf("%s", str); printf("\n");
 }
 
 void RE_FreeRenderResult(RenderResult *res)
diff -p -up blender-2.49a/source/blender/src/drawaction.c.wformat blender-2.49a/source/blender/src/drawaction.c
--- blender-2.49a/source/blender/src/drawaction.c.wformat	2008-10-20 11:24:25.000000000 +0200
+++ blender-2.49a/source/blender/src/drawaction.c	2009-06-19 01:47:18.000000000 +0200
@@ -495,7 +495,7 @@ static void draw_channel_names(void) 
 						protect = ICON_LOCKED;
 						
 					sel = SEL_AGRP(agrp);
-					sprintf(name, agrp->name);
+					sprintf(name, "%s", agrp->name);
 				}
 					break;
 				case ACTTYPE_ACHAN: /* action channel */
@@ -526,7 +526,7 @@ static void draw_channel_names(void) 
 					}
 					
 					sel = SEL_ACHAN(achan);
-					sprintf(name, achan->name);
+					sprintf(name, "%s", achan->name);
 				}
 					break;
 				case ACTTYPE_CONCHAN: /* constraint channel */
@@ -551,7 +551,7 @@ static void draw_channel_names(void) 
 					}
 					
 					sel = SEL_CONCHAN(conchan);
-					sprintf(name, conchan->name);
+					sprintf(name, "%s", conchan->name);
 				}
 					break;
 				case ACTTYPE_ICU: /* ipo-curve channel */
@@ -571,9 +571,9 @@ static void draw_channel_names(void) 
 					
 					sel = SEL_ICU(icu);
 					if (G.saction->pin)
-						sprintf(name, getname_ipocurve(icu, NULL));
+						sprintf(name, "%s", getname_ipocurve(icu, NULL));
 					else
-						sprintf(name, getname_ipocurve(icu, OBACT));
+						sprintf(name, "%s", getname_ipocurve(icu, OBACT));
 				}
 					break;
 				case ACTTYPE_SHAPEKEY: /* shapekey channel */
@@ -586,7 +586,7 @@ static void draw_channel_names(void) 
 					if (kb->name[0] == '\0')
 						sprintf(name, "Key %d", ale->index);
 					else
-						sprintf(name, kb->name);
+						sprintf(name, "%s", kb->name);
 				}
 					break;
 				case ACTTYPE_FILLIPO: /* ipo expand widget */
diff -p -up blender-2.49a/source/blender/src/editaction.c.wformat blender-2.49a/source/blender/src/editaction.c
--- blender-2.49a/source/blender/src/editaction.c.wformat	2008-10-20 08:39:08.000000000 +0200
+++ blender-2.49a/source/blender/src/editaction.c	2009-06-19 01:43:42.000000000 +0200
@@ -1297,7 +1297,7 @@ void verify_pchan2achan_grouping (bActio
 			grp->flag |= (AGRP_ACTIVE|AGRP_SELECTED|AGRP_EXPANDED);
 			
 			/* copy name */
-			sprintf(grp->name, agrp->name);
+			sprintf(grp->name, "%s", agrp->name);
 			
 			/* deal with group-color copying (grp is destination, agrp is source) */
 			memcpy(grp, agrp, sizeof(bActionGroup));
@@ -2424,9 +2424,9 @@ static void numbuts_action ()
 		icu= (IpoCurve *)act_channel;
 		
 		if (G.saction->pin)
-			sprintf(str, getname_ipocurve(icu, NULL));
+			sprintf(str, "%s", getname_ipocurve(icu, NULL));
 		else
-			sprintf(str, getname_ipocurve(icu, OBACT));
+			sprintf(str, "%s", getname_ipocurve(icu, OBACT));
 		
 		if (IS_EQ(icu->slide_max, icu->slide_min)) {
 			if (IS_EQ(icu->ymax, icu->ymin)) {
@@ -4706,7 +4706,7 @@ void action_rename_localmarker (bAction 
 	if (marker == NULL) return;
 	
 	/* get name of marker */
-	sprintf(name, marker->name);
+	sprintf(name, "%s", marker->name);
 	if (sbutton(name, 0, sizeof(name)-1, "Name: ") == 0)
 		return;
 	
diff -p -up blender-2.49a/source/blender/src/editarmature.c.wformat blender-2.49a/source/blender/src/editarmature.c
--- blender-2.49a/source/blender/src/editarmature.c.wformat	2009-04-29 21:33:05.000000000 +0200
+++ blender-2.49a/source/blender/src/editarmature.c	2009-06-19 01:48:31.000000000 +0200
@@ -737,7 +737,7 @@ int join_armature(void)
 					joined_armature_fix_links(ob, base->object, pchan, curbone);
 					
 					/* Rename pchan */
-					sprintf(pchan->name, curbone->name);
+					sprintf(pchan->name, "%s", curbone->name);
 					
 					/* Jump Ship! */
 					BLI_remlink(&eblist, curbone);
diff -p -up blender-2.49a/source/blender/src/editarmature_retarget.c.wformat blender-2.49a/source/blender/src/editarmature_retarget.c
--- blender-2.49a/source/blender/src/editarmature_retarget.c.wformat	2009-04-01 00:34:34.000000000 +0200
+++ blender-2.49a/source/blender/src/editarmature_retarget.c	2009-06-19 01:38:54.000000000 +0200
@@ -463,12 +463,12 @@ static void renameTemplateBone(char *nam
 		{
 			if (template_name[i+1] == 'S' || template_name[i+1] == 's')
 			{
-				j += sprintf(name + j, side_string);
+				j += sprintf(name + j, "%s", side_string);
 				i++;
 			}
 			else if (template_name[i+1] == 'N' || template_name[i+1] == 'n')
 			{
-				j += sprintf(name + j, num_string);
+				j += sprintf(name + j, "%s", num_string);
 				i++;
 			}
 			else
diff -p -up blender-2.49a/source/blender/src/keyframing.c.wformat blender-2.49a/source/blender/src/keyframing.c
--- blender-2.49a/source/blender/src/keyframing.c.wformat	2008-10-26 10:41:59.000000000 +0100
+++ blender-2.49a/source/blender/src/keyframing.c	2009-06-19 01:41:37.000000000 +0200
@@ -945,7 +945,7 @@ static short incl_v3d_ob_shapekey (bKeyi
 	
 	/* if ks is shapekey entry (this could be callled for separator before too!) */
 	if (ks->flag == -3)
-		sprintf(ks->name, newname);
+		sprintf(ks->name, "%s", newname);
 	
 	/* if it gets here, it's ok */
 	return 1;