From 16694ed408a533fcf275db8f92a5d0c7c0cbd854 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 24 Mar 2019 16:09:46 +1100 Subject: Cleanup: redundant use of string formatting functions --- source/blender/blenkernel/intern/DerivedMesh.c | 24 ++++++++++++------------ source/blender/blenkernel/intern/collection.c | 2 +- source/blender/blenkernel/intern/mesh_runtime.c | 24 ++++++++++++------------ source/blender/blenkernel/intern/tracking.c | 4 ++-- 4 files changed, 27 insertions(+), 27 deletions(-) (limited to 'source/blender/blenkernel') 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]; -- cgit v1.2.3