Cleanup: redundant use of string formatting functions

14 files changed, 39 insertions, 36 deletions

diff --git a/source/blender/makesrna/intern/rna_boid.c b/source/blender/makesrna/intern/rna_boid.c
index 9906fa49dcb..27e4ee639c5 100644
--- a/source/blender/makesrna/intern/rna_boid.c
+++ b/source/blender/makesrna/intern/rna_boid.c
@@ -207,8 +207,9 @@ static char *rna_BoidSettings_path(PointerRNA *ptr)
 	if (particle_id_check(ptr)) {
 		ParticleSettings *part = (ParticleSettings *)ptr->id.data;
 
-		if (part->boids == boids)
-			return BLI_sprintfN("boids");
+		if (part->boids == boids) {
+			return BLI_strdup("boids");
+		}
 	}
 	return NULL;
 }
diff --git a/source/blender/makesrna/intern/rna_color.c b/source/blender/makesrna/intern/rna_color.c
index 61c2600a021..faf9a99ace1 100644
--- a/source/blender/makesrna/intern/rna_color.c
+++ b/source/blender/makesrna/intern/rna_color.c
@@ -432,7 +432,7 @@ static void rna_ColorManagedDisplaySettings_display_device_update(Main *bmain, S
 
 static char *rna_ColorManagedDisplaySettings_path(PointerRNA *UNUSED(ptr))
 {
-	return BLI_sprintfN("display_settings");
+	return BLI_strdup("display_settings");
 }
 
 static int rna_ColorManagedViewSettings_view_transform_get(PointerRNA *ptr)
@@ -518,7 +518,7 @@ static void rna_ColorManagedViewSettings_use_curves_set(PointerRNA *ptr, bool va
 
 static char *rna_ColorManagedViewSettings_path(PointerRNA *UNUSED(ptr))
 {
-	return BLI_sprintfN("view_settings");
+	return BLI_strdup("view_settings");
 }
 
 
@@ -627,12 +627,12 @@ static void rna_ColorManagedColorspaceSettings_reload_update(Main *bmain, Scene
 
 static char *rna_ColorManagedSequencerColorspaceSettings_path(PointerRNA *UNUSED(ptr))
 {
-	return BLI_sprintfN("sequencer_colorspace_settings");
+	return BLI_strdup("sequencer_colorspace_settings");
 }
 
 static char *rna_ColorManagedInputColorspaceSettings_path(PointerRNA *UNUSED(ptr))
 {
-	return BLI_sprintfN("colorspace_settings");
+	return BLI_strdup("colorspace_settings");
 }
 
 static void rna_ColorManagement_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
diff --git a/source/blender/makesrna/intern/rna_constraint.c b/source/blender/makesrna/intern/rna_constraint.c
index 0b5269cd5d8..eae9ca2f8f8 100644
--- a/source/blender/makesrna/intern/rna_constraint.c
+++ b/source/blender/makesrna/intern/rna_constraint.c
@@ -449,7 +449,7 @@ static void rna_ArmatureConstraint_target_remove(
 	bConstraintTarget *tgt = target_ptr->data;
 
 	if (BLI_findindex(&acon->targets, tgt) < 0) {
-		BKE_reportf(reports, RPT_ERROR, "Target is not in the constraint target list");
+		BKE_report(reports, RPT_ERROR, "Target is not in the constraint target list");
 		return;
 	}
 
diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c
index 7c8a79a7563..dcdad5ce314 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -756,7 +756,7 @@ static void rna_GpencilVertex_groups_begin(CollectionPropertyIterator *iter, Poi
 
 static char *rna_GreasePencilGrid_path(PointerRNA *UNUSED(ptr))
 {
-	return BLI_sprintfN("grid");
+	return BLI_strdup("grid");
 }
 
 #else
diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c
index 994efc36f00..5033ba42570 100644
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@ -307,7 +307,7 @@ static void rna_gpcolordata_uv_update(Main *bmain, Scene *scene, PointerRNA *ptr
 
 static char *rna_GpencilColorData_path(PointerRNA *UNUSED(ptr))
 {
-	return BLI_sprintfN("grease_pencil");
+	return BLI_strdup("grease_pencil");
 }
 
 static int rna_GpencilColorData_is_stroke_visible_get(PointerRNA *ptr)
diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c
index 158f4535303..ce1f4202f16 100644
--- a/source/blender/makesrna/intern/rna_mesh.c
+++ b/source/blender/makesrna/intern/rna_mesh.c
@@ -958,7 +958,7 @@ static void rna_Mesh_face_map_remove(struct Mesh *me, ReportList *reports, struc
 	}
 
 	if (BKE_mesh_clear_facemap_customdata(me) == false) {
-		BKE_reportf(reports, RPT_ERROR, "Error removing face-map");
+		BKE_report(reports, RPT_ERROR, "Error removing face-map");
 	}
 }
 
diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c
index c8e84c07b5c..5e90f1feddf 100644
--- a/source/blender/makesrna/intern/rna_object_api.c
+++ b/source/blender/makesrna/intern/rna_object_api.c
@@ -359,12 +359,12 @@ static void rna_Object_shape_key_remove(
 	Key *key = BKE_key_from_object(ob);
 
 	if ((key == NULL) || BLI_findindex(&key->block, kb) == -1) {
-		BKE_reportf(reports, RPT_ERROR, "ShapeKey not found");
+		BKE_report(reports, RPT_ERROR, "ShapeKey not found");
 		return;
 	}
 
 	if (!BKE_object_shapekey_remove(bmain, ob, kb)) {
-		BKE_reportf(reports, RPT_ERROR, "Could not remove ShapeKey");
+		BKE_report(reports, RPT_ERROR, "Could not remove ShapeKey");
 		return;
 	}
 
diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c
index e620a8f6526..337b44a534b 100644
--- a/source/blender/makesrna/intern/rna_object_force.c
+++ b/source/blender/makesrna/intern/rna_object_force.c
@@ -532,16 +532,16 @@ static char *rna_FieldSettings_path(PointerRNA *ptr)
 		ParticleSettings *part = (ParticleSettings *)ptr->id.data;
 
 		if (part->pd == pd)
-			return BLI_sprintfN("force_field_1");
+			return BLI_strdup("force_field_1");
 		else if (part->pd2 == pd)
-			return BLI_sprintfN("force_field_2");
+			return BLI_strdup("force_field_2");
 	}
 	else {
 		/* object force field */
 		Object *ob = (Object *)ptr->id.data;
 
 		if (ob->pd == pd)
-			return BLI_sprintfN("field");
+			return BLI_strdup("field");
 	}
 	return NULL;
 }
@@ -582,8 +582,9 @@ static char *rna_EffectorWeight_path(PointerRNA *ptr)
 		/* particle effector weights */
 		ParticleSettings *part = (ParticleSettings *)ptr->id.data;
 
-		if (part->effector_weights == ew)
-			return BLI_sprintfN("effector_weights");
+		if (part->effector_weights == ew) {
+			return BLI_strdup("effector_weights");
+		}
 	}
 	else {
 		Object *ob = (Object *)ptr->id.data;
diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c
index 9d4ef83e8a0..635beed74fb 100644
--- a/source/blender/makesrna/intern/rna_particle.c
+++ b/source/blender/makesrna/intern/rna_particle.c
@@ -1052,8 +1052,9 @@ static char *rna_SPHFluidSettings_path(PointerRNA *ptr)
 	if (particle_id_check(ptr)) {
 		ParticleSettings *part = (ParticleSettings *)ptr->id.data;
 
-		if (part->fluid == fluid)
-			return BLI_sprintfN("fluid");
+		if (part->fluid == fluid) {
+			return BLI_strdup("fluid");
+		}
 	}
 	return NULL;
 }
diff --git a/source/blender/makesrna/intern/rna_rigidbody.c b/source/blender/makesrna/intern/rna_rigidbody.c
index 7f0ee14ef18..169db8cf246 100644
--- a/source/blender/makesrna/intern/rna_rigidbody.c
+++ b/source/blender/makesrna/intern/rna_rigidbody.c
@@ -119,7 +119,7 @@ static void rna_RigidBodyWorld_reset(Main *UNUSED(bmain), Scene *UNUSED(scene),
 
 static char *rna_RigidBodyWorld_path(PointerRNA *UNUSED(ptr))
 {
-	return BLI_sprintfN("rigidbody_world");
+	return BLI_strdup("rigidbody_world");
 }
 
 static void rna_RigidBodyWorld_num_solver_iterations_set(PointerRNA *ptr, int value)
@@ -193,7 +193,7 @@ static void rna_RigidBodyOb_shape_reset(Main *UNUSED(bmain), Scene *scene, Point
 static char *rna_RigidBodyOb_path(PointerRNA *UNUSED(ptr))
 {
 	/* NOTE: this hardcoded path should work as long as only Objects have this */
-	return BLI_sprintfN("rigid_body");
+	return BLI_strdup("rigid_body");
 }
 
 static void rna_RigidBodyOb_type_set(PointerRNA *ptr, int value)
@@ -383,7 +383,7 @@ static void rna_RigidBodyOb_angular_damping_set(PointerRNA *ptr, float value)
 static char *rna_RigidBodyCon_path(PointerRNA *UNUSED(ptr))
 {
 	/* NOTE: this hardcoded path should work as long as only Objects have this */
-	return BLI_sprintfN("rigid_body_constraint");
+	return BLI_strdup("rigid_body_constraint");
 }
 
 static void rna_RigidBodyCon_type_set(PointerRNA *ptr, int value)
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index bdf9686174b..9bab1bf5d6d 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -907,12 +907,12 @@ static void rna_RenderSettings_stereoViews_begin(CollectionPropertyIterator *ite
 
 static char *rna_RenderSettings_path(PointerRNA *UNUSED(ptr))
 {
-	return BLI_sprintfN("render");
+	return BLI_strdup("render");
 }
 
 static char *rna_BakeSettings_path(PointerRNA *UNUSED(ptr))
 {
-	return BLI_sprintfN("render.bake");
+	return BLI_strdup("render.bake");
 }
 
 static char *rna_ImageFormatSettings_path(PointerRNA *ptr)
@@ -926,12 +926,12 @@ static char *rna_ImageFormatSettings_path(PointerRNA *ptr)
 			Scene *scene = (Scene *)id;
 
 			if (&scene->r.im_format == imf) {
-				return BLI_sprintfN("render.image_settings");
+				return BLI_strdup("render.image_settings");
 			}
 			else if (&scene->r.bake.im_format == imf) {
-				return BLI_sprintfN("render.bake.image_settings");
+				return BLI_strdup("render.bake.image_settings");
 			}
-			return BLI_sprintfN("..");
+			return BLI_strdup("..");
 		}
 		case ID_NT:
 		{
@@ -955,10 +955,10 @@ static char *rna_ImageFormatSettings_path(PointerRNA *ptr)
 					}
 				}
 			}
-			return BLI_sprintfN("..");
+			return BLI_strdup("..");
 		}
 		default:
-			return BLI_sprintfN("..");
+			return BLI_strdup("..");
 	}
 }
 
@@ -2210,7 +2210,7 @@ static void rna_UnitSettings_system_update(Main *UNUSED(bmain), Scene *scene, Po
 
 static char *rna_UnitSettings_path(PointerRNA *UNUSED(ptr))
 {
-	return BLI_sprintfN("unit_settings");
+	return BLI_strdup("unit_settings");
 }
 
 #else
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index f827615ab03..5a9598818de 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -939,7 +939,7 @@ static int rna_SpaceView3D_icon_from_show_object_viewport_get(PointerRNA *ptr)
 
 static char *rna_View3DShading_path(PointerRNA *UNUSED(ptr))
 {
-    return BLI_sprintfN("shading");
+    return BLI_strdup("shading");
 }
 
 static PointerRNA rna_SpaceView3D_overlay_get(PointerRNA *ptr)
@@ -949,7 +949,7 @@ static PointerRNA rna_SpaceView3D_overlay_get(PointerRNA *ptr)
 
 static char *rna_View3DOverlay_path(PointerRNA *UNUSED(ptr))
 {
-    return BLI_sprintfN("overlay");
+    return BLI_strdup("overlay");
 }
 
 /* Space Image Editor */
diff --git a/source/blender/makesrna/intern/rna_tracking.c b/source/blender/makesrna/intern/rna_tracking.c
index 8df1d3115cc..154388e4228 100644
--- a/source/blender/makesrna/intern/rna_tracking.c
+++ b/source/blender/makesrna/intern/rna_tracking.c
@@ -55,7 +55,7 @@
 
 static char *rna_tracking_path(PointerRNA *UNUSED(ptr))
 {
-	return BLI_sprintfN("tracking");
+	return BLI_strdup("tracking");
 }
 
 static void rna_tracking_defaultSettings_patternUpdate(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
@@ -307,7 +307,7 @@ static void rna_trackingPlaneTrack_name_set(PointerRNA *ptr, const char *value)
 
 static char *rna_trackingCamera_path(PointerRNA *UNUSED(ptr))
 {
-	return BLI_sprintfN("tracking.camera");
+	return BLI_strdup("tracking.camera");
 }
 
 static float rna_trackingCamera_focal_mm_get(PointerRNA *ptr)
@@ -336,7 +336,7 @@ static void rna_trackingCamera_focal_mm_set(PointerRNA *ptr, float value)
 
 static char *rna_trackingStabilization_path(PointerRNA *UNUSED(ptr))
 {
-	return BLI_sprintfN("tracking.stabilization");
+	return BLI_strdup("tracking.stabilization");
 }
 
 static int rna_track_2d_stabilization(CollectionPropertyIterator *UNUSED(iter), void *data)
diff --git a/source/blender/makesrna/intern/rna_wm_gizmo.c b/source/blender/makesrna/intern/rna_wm_gizmo.c
index 2a084cbd526..45d664c4522 100644
--- a/source/blender/makesrna/intern/rna_wm_gizmo.c
+++ b/source/blender/makesrna/intern/rna_wm_gizmo.c
@@ -810,7 +810,7 @@ static StructRNA *rna_GizmoGroup_register(
 
 	wmGizmoMapType *gzmap_type = WM_gizmomaptype_ensure(&wmap_params);
 	if (gzmap_type == NULL) {
-		BKE_reportf(reports, RPT_ERROR, "Area type does not support gizmos");
+		BKE_report(reports, RPT_ERROR, "Area type does not support gizmos");
 		return NULL;
 	}