[Bf-blender-cvs] [16694ed408a] master: Cleanup: redundant use of string formatting functions
Campbell Barton
noreply at git.blender.org
Sun Mar 24 06:20:56 CET 2019
Commit: 16694ed408a533fcf275db8f92a5d0c7c0cbd854
Author: Campbell Barton
Date: Sun Mar 24 16:09:46 2019 +1100
Branches: master
https://developer.blender.org/rB16694ed408a533fcf275db8f92a5d0c7c0cbd854
Cleanup: redundant use of string formatting functions
===================================================================
M source/blender/blenkernel/intern/DerivedMesh.c
M source/blender/blenkernel/intern/collection.c
M source/blender/blenkernel/intern/mesh_runtime.c
M source/blender/blenkernel/intern/tracking.c
M source/blender/blenloader/intern/blend_validate.c
M source/blender/draw/engines/eevee/eevee_materials.c
M source/blender/draw/engines/eevee/eevee_screen_raytrace.c
M source/blender/draw/engines/workbench/workbench_materials.c
M source/blender/draw/intern/draw_cache_impl_particles.c
M source/blender/draw/intern/draw_manager_profiling.c
M source/blender/editors/object/object_add.c
M source/blender/editors/transform/transform.c
M source/blender/gpu/intern/gpu_codegen.c
M source/blender/gpu/intern/gpu_texture.c
M source/blender/gpu/intern/gpu_uniformbuffer.c
M source/blender/makesrna/intern/rna_boid.c
M source/blender/makesrna/intern/rna_color.c
M source/blender/makesrna/intern/rna_constraint.c
M source/blender/makesrna/intern/rna_gpencil.c
M source/blender/makesrna/intern/rna_material.c
M source/blender/makesrna/intern/rna_mesh.c
M source/blender/makesrna/intern/rna_object_api.c
M source/blender/makesrna/intern/rna_object_force.c
M source/blender/makesrna/intern/rna_particle.c
M source/blender/makesrna/intern/rna_rigidbody.c
M source/blender/makesrna/intern/rna_scene.c
M source/blender/makesrna/intern/rna_space.c
M source/blender/makesrna/intern/rna_tracking.c
M source/blender/makesrna/intern/rna_wm_gizmo.c
===================================================================
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 86ec491b43e..28b87d034b1 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -2833,7 +2833,7 @@ char *DM_debug_info(DerivedMesh *dm)
char *ret;
const char *tstr;
- BLI_dynstr_appendf(dynstr, "{\n");
+ BLI_dynstr_append(dynstr, "{\n");
BLI_dynstr_appendf(dynstr, " 'ptr': '%p',\n", (void *)dm);
switch (dm->type) {
case DM_TYPE_CDDM: tstr = "DM_TYPE_CDDM"; break;
@@ -2847,27 +2847,27 @@ char *DM_debug_info(DerivedMesh *dm)
BLI_dynstr_appendf(dynstr, " 'numPolyData': %d,\n", dm->numPolyData);
BLI_dynstr_appendf(dynstr, " 'deformedOnly': %d,\n", dm->deformedOnly);
- BLI_dynstr_appendf(dynstr, " 'vertexLayers': (\n");
+ BLI_dynstr_append(dynstr, " 'vertexLayers': (\n");
dm_debug_info_layers(dynstr, dm, &dm->vertData, dm->getVertDataArray);
- BLI_dynstr_appendf(dynstr, " ),\n");
+ BLI_dynstr_append(dynstr, " ),\n");
- BLI_dynstr_appendf(dynstr, " 'edgeLayers': (\n");
+ BLI_dynstr_append(dynstr, " 'edgeLayers': (\n");
dm_debug_info_layers(dynstr, dm, &dm->edgeData, dm->getEdgeDataArray);
- BLI_dynstr_appendf(dynstr, " ),\n");
+ BLI_dynstr_append(dynstr, " ),\n");
- BLI_dynstr_appendf(dynstr, " 'loopLayers': (\n");
+ BLI_dynstr_append(dynstr, " 'loopLayers': (\n");
dm_debug_info_layers(dynstr, dm, &dm->loopData, dm->getLoopDataArray);
- BLI_dynstr_appendf(dynstr, " ),\n");
+ BLI_dynstr_append(dynstr, " ),\n");
- BLI_dynstr_appendf(dynstr, " 'polyLayers': (\n");
+ BLI_dynstr_append(dynstr, " 'polyLayers': (\n");
dm_debug_info_layers(dynstr, dm, &dm->polyData, dm->getPolyDataArray);
- BLI_dynstr_appendf(dynstr, " ),\n");
+ BLI_dynstr_append(dynstr, " ),\n");
- BLI_dynstr_appendf(dynstr, " 'tessFaceLayers': (\n");
+ BLI_dynstr_append(dynstr, " 'tessFaceLayers': (\n");
dm_debug_info_layers(dynstr, dm, &dm->faceData, dm->getTessFaceDataArray);
- BLI_dynstr_appendf(dynstr, " ),\n");
+ BLI_dynstr_append(dynstr, " ),\n");
- BLI_dynstr_appendf(dynstr, "}\n");
+ BLI_dynstr_append(dynstr, "}\n");
ret = BLI_dynstr_get_cstring(dynstr);
BLI_dynstr_free(dynstr);
diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c
index 29d9d105d6b..336a4739760 100644
--- a/source/blender/blenkernel/intern/collection.c
+++ b/source/blender/blenkernel/intern/collection.c
@@ -360,7 +360,7 @@ void BKE_collection_new_name_get(Collection *collection_parent, char *rname)
char *name;
if (!collection_parent) {
- name = BLI_sprintfN("Collection");
+ name = BLI_strdup("Collection");
}
else if (collection_parent->flag & COLLECTION_IS_MASTER) {
name = BLI_sprintfN("Collection %d", BLI_listbase_count(&collection_parent->children) + 1);
diff --git a/source/blender/blenkernel/intern/mesh_runtime.c b/source/blender/blenkernel/intern/mesh_runtime.c
index 2f845e32ee7..f7c16b763fe 100644
--- a/source/blender/blenkernel/intern/mesh_runtime.c
+++ b/source/blender/blenkernel/intern/mesh_runtime.c
@@ -274,7 +274,7 @@ char *BKE_mesh_runtime_debug_info(Mesh *me_eval)
DynStr *dynstr = BLI_dynstr_new();
char *ret;
- BLI_dynstr_appendf(dynstr, "{\n");
+ BLI_dynstr_append(dynstr, "{\n");
BLI_dynstr_appendf(dynstr, " 'ptr': '%p',\n", (void *)me_eval);
#if 0
const char *tstr;
@@ -291,27 +291,27 @@ char *BKE_mesh_runtime_debug_info(Mesh *me_eval)
BLI_dynstr_appendf(dynstr, " 'totpoly': %d,\n", me_eval->totpoly);
BLI_dynstr_appendf(dynstr, " 'deformed_only': %d,\n", me_eval->runtime.deformed_only);
- BLI_dynstr_appendf(dynstr, " 'vertexLayers': (\n");
+ BLI_dynstr_append(dynstr, " 'vertexLayers': (\n");
mesh_runtime_debug_info_layers(dynstr, &me_eval->vdata);
- BLI_dynstr_appendf(dynstr, " ),\n");
+ BLI_dynstr_append(dynstr, " ),\n");
- BLI_dynstr_appendf(dynstr, " 'edgeLayers': (\n");
+ BLI_dynstr_append(dynstr, " 'edgeLayers': (\n");
mesh_runtime_debug_info_layers(dynstr, &me_eval->edata);
- BLI_dynstr_appendf(dynstr, " ),\n");
+ BLI_dynstr_append(dynstr, " ),\n");
- BLI_dynstr_appendf(dynstr, " 'loopLayers': (\n");
+ BLI_dynstr_append(dynstr, " 'loopLayers': (\n");
mesh_runtime_debug_info_layers(dynstr, &me_eval->ldata);
- BLI_dynstr_appendf(dynstr, " ),\n");
+ BLI_dynstr_append(dynstr, " ),\n");
- BLI_dynstr_appendf(dynstr, " 'polyLayers': (\n");
+ BLI_dynstr_append(dynstr, " 'polyLayers': (\n");
mesh_runtime_debug_info_layers(dynstr, &me_eval->pdata);
- BLI_dynstr_appendf(dynstr, " ),\n");
+ BLI_dynstr_append(dynstr, " ),\n");
- BLI_dynstr_appendf(dynstr, " 'tessFaceLayers': (\n");
+ BLI_dynstr_append(dynstr, " 'tessFaceLayers': (\n");
mesh_runtime_debug_info_layers(dynstr, &me_eval->fdata);
- BLI_dynstr_appendf(dynstr, " ),\n");
+ BLI_dynstr_append(dynstr, " ),\n");
- BLI_dynstr_appendf(dynstr, "}\n");
+ BLI_dynstr_append(dynstr, "}\n");
ret = BLI_dynstr_get_cstring(dynstr);
BLI_dynstr_free(dynstr);
diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c
index 79102742927..28f47cbf067 100644
--- a/source/blender/blenkernel/intern/tracking.c
+++ b/source/blender/blenkernel/intern/tracking.c
@@ -2998,7 +2998,7 @@ void BKE_tracking_get_rna_path_prefix_for_track(
MovieTrackingObject *object =
BKE_tracking_find_object_for_track(tracking, track);
if (object == NULL) {
- BLI_snprintf(rna_path, rna_path_len, "tracking.tracks");
+ BLI_strncpy(rna_path, "tracking.tracks", rna_path_len);
}
else {
char object_name_esc[MAX_NAME * 2];
@@ -3043,7 +3043,7 @@ void BKE_tracking_get_rna_path_prefix_for_plane_track(
MovieTrackingObject *object =
BKE_tracking_find_object_for_plane_track(tracking, plane_track);
if (object == NULL) {
- BLI_snprintf(rna_path, rna_path_len, "tracking.plane_tracks");
+ BLI_strncpy(rna_path, "tracking.plane_tracks", rna_path_len);
}
else {
char object_name_esc[MAX_NAME * 2];
diff --git a/source/blender/blenloader/intern/blend_validate.c b/source/blender/blenloader/intern/blend_validate.c
index cc0ce61ec15..4d4a20adbdf 100644
--- a/source/blender/blenloader/intern/blend_validate.c
+++ b/source/blender/blenloader/intern/blend_validate.c
@@ -70,8 +70,8 @@ bool BLO_main_validate_libraries(Main *bmain, ReportList *reports)
for (Main *curmain = bmain->next; curmain != NULL; curmain = curmain->next) {
Library *curlib = curmain->curlib;
if (curlib == NULL) {
- BKE_reportf(reports, RPT_ERROR,
- "Library database with NULL library datablock!");
+ BKE_report(reports, RPT_ERROR,
+ "Library database with NULL library datablock!");
continue;
}
diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c
index 6b395660401..15b3457874d 100644
--- a/source/blender/draw/engines/eevee/eevee_materials.c
+++ b/source/blender/draw/engines/eevee/eevee_materials.c
@@ -274,58 +274,58 @@ static char *eevee_get_defines(int options)
char *str = NULL;
DynStr *ds = BLI_dynstr_new();
- BLI_dynstr_appendf(ds, SHADER_DEFINES);
+ BLI_dynstr_append(ds, SHADER_DEFINES);
if ((options & VAR_MAT_MESH) != 0) {
- BLI_dynstr_appendf(ds, "#define MESH_SHADER\n");
+ BLI_dynstr_append(ds, "#define MESH_SHADER\n");
}
if ((options & VAR_MAT_HAIR) != 0) {
- BLI_dynstr_appendf(ds, "#define HAIR_SHADER\n");
+ BLI_dynstr_append(ds, "#define HAIR_SHADER\n");
}
if ((options & VAR_MAT_PROBE) != 0) {
- BLI_dynstr_appendf(ds, "#define PROBE_CAPTURE\n");
+ BLI_dynstr_append(ds, "#define PROBE_CAPTURE\n");
}
if ((options & VAR_MAT_FLAT) != 0) {
- BLI_dynstr_appendf(ds, "#define USE_FLAT_NORMAL\n");
+ BLI_dynstr_append(ds, "#define USE_FLAT_NORMAL\n");
}
if ((options & VAR_MAT_CLIP) != 0) {
- BLI_dynstr_appendf(ds, "#define USE_ALPHA_CLIP\n");
+ BLI_dynstr_append(ds, "#define USE_ALPHA_CLIP\n");
}
if ((options & VAR_MAT_SHADOW) != 0) {
- BLI_dynstr_appendf(ds, "#define SHADOW_SHADER\n");
+ BLI_dynstr_append(ds, "#define SHADOW_SHADER\n");
}
if ((options & VAR_MAT_HASH) != 0) {
- BLI_dynstr_appendf(ds, "#define USE_ALPHA_HASH\n");
+ BLI_dynstr_append(ds, "#define USE_ALPHA_HASH\n");
}
if ((options & VAR_MAT_BLEND) != 0) {
- BLI_dynstr_appendf(ds, "#define USE_ALPHA_BLEND\n");
+ BLI_dynstr_append(ds, "#define USE_ALPHA_BLEND\n");
}
if ((options & VAR_MAT_MULT) != 0) {
- BLI_dynstr_appendf(ds, "#define USE_MULTIPLY\n");
+ BLI_dynstr_append(ds, "#define USE_MULTIPLY\n");
}
if ((options & VAR_MAT_REFRACT) != 0) {
- BLI_dynstr_appendf(ds, "#define USE_REFRACTION\n");
+ BLI_dynstr_append(ds, "#define USE_REFRACTION\n");
}
if ((options & VAR_MAT_SSS) != 0) {
- BLI_dynstr_appendf(ds, "#define USE_SSS\n");
+ BLI_dynstr_append(ds, "#define USE_SSS\n");
}
if ((options & VAR_MAT_SSSALBED) != 0) {
- BLI_dynstr_appendf(ds, "#define USE_SSS_ALBEDO\n");
+ BLI_dynstr_append(ds, "#define USE_SSS_ALBEDO\n");
}
if ((options & VAR_MAT_TRANSLUC) != 0) {
- BLI_dynstr_appendf(ds, "#define USE_TRANSLUCENCY\n");
+ BLI_dynstr_append(ds, "#define USE_TRANSLUCENCY\n");
}
if ((options & VAR_MAT_VSM) != 0) {
- BLI_dynstr_appendf(ds, "#define SHADOW_VSM\n");
+ BLI_dynstr_append(ds, "#define SHADOW_VSM\n");
}
if ((options & VAR_MAT_ESM) != 0) {
- BLI_dynstr_appendf(ds, "#define SHADOW_ESM\n");
+ BLI_dynstr_append(ds, "#define SHADOW_ESM\n");
}
if (((options & VAR_MAT_VOLUME) != 0) && ((options & VAR_MAT_BLEND) != 0)) {
- BLI_dynstr_appendf(ds, "#define USE_ALPHA_BLEND_VOLUMETRICS\n");
+ BLI_dynstr_append(ds, "#define USE_ALPHA_BLEND_VOLUMETRICS\n");
}
if ((options & VAR_MAT_LOOKDEV) != 0) {
- BLI_dynstr_appendf(ds, "#define LOOKDEV\n");
+ BLI_dynstr_append(ds, "#define LOOKDEV\n");
}
str = BLI_dynstr_get_cstring(ds);
@@ -339,11 +339,11 @@ static char *eevee_get_volume_defines(int options)
char *str = NULL;
DynStr *ds = BLI_dynstr_new();
- BLI_dynstr_appendf(ds, SHADER_DEFINES);
- BLI_dynstr_appendf(ds, "#define VOLUMETRICS\n");
+ BLI_dynstr_append(ds, SHADER_DEFINES);
+ BLI_dynstr_append(ds, "#define VOLUMETRI
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list