From 845a5146e7ae8aaccb92f1ed3fed72fdc8c74dbd Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 6 Aug 2023 16:03:10 +1000 Subject: [PATCH] Cleanup: avoid term '_len' for buffer size --- source/blender/blenkernel/BKE_blender_version.h | 2 +- source/blender/blenkernel/intern/blender.cc | 6 +++--- .../editors/sculpt_paint/paint_image_proj.cc | 4 ++-- .../space_sequencer/sequencer_gizmo_retime_type.cc | 13 +++++++------ 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index 3f2157638cc..957470e7ab2 100644 --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@ -56,7 +56,7 @@ bool BKE_blender_version_is_alpha(void); * `file_version` is used. */ void BKE_blender_version_blendfile_string_from_values(char *str_buff, - const size_t str_buff_len, + const size_t str_buff_maxncpy, const short file_version, const short file_subversion); diff --git a/source/blender/blenkernel/intern/blender.cc b/source/blender/blenkernel/intern/blender.cc index 13690870de0..2a12b370982 100644 --- a/source/blender/blenkernel/intern/blender.cc +++ b/source/blender/blenkernel/intern/blender.cc @@ -126,7 +126,7 @@ const char *BKE_blender_version_string() } void BKE_blender_version_blendfile_string_from_values(char *str_buff, - const size_t str_buff_len, + const size_t str_buff_maxncpy, const short file_version, const short file_subversion) { @@ -134,14 +134,14 @@ void BKE_blender_version_blendfile_string_from_values(char *str_buff, const short file_version_minor = file_version % 100; if (file_subversion >= 0) { BLI_snprintf(str_buff, - str_buff_len, + str_buff_maxncpy, "%d.%d (sub %d)", file_version_major, file_version_minor, file_subversion); } else { - BLI_snprintf(str_buff, str_buff_len, "%d.%d", file_version_major, file_version_minor); + BLI_snprintf(str_buff, str_buff_maxncpy, "%d.%d", file_version_major, file_version_minor); } } diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.cc b/source/blender/editors/sculpt_paint/paint_image_proj.cc index be33cdc8c06..f3fc783c3e6 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.cc +++ b/source/blender/editors/sculpt_paint/paint_image_proj.cc @@ -6832,11 +6832,11 @@ static int texture_paint_add_texture_paint_slot_exec(bContext *C, wmOperator *op static void get_default_texture_layer_name_for_object(Object *ob, int texture_type, char *dst, - int dst_length) + int dst_maxncpy) { Material *ma = BKE_object_material_get(ob, ob->actcol); const char *base_name = ma ? &ma->id.name[2] : &ob->id.name[2]; - BLI_snprintf(dst, dst_length, "%s %s", base_name, layer_type_items[texture_type].name); + BLI_snprintf(dst, dst_maxncpy, "%s %s", base_name, layer_type_items[texture_type].name); } static int texture_paint_add_texture_paint_slot_invoke(bContext *C, diff --git a/source/blender/editors/space_sequencer/sequencer_gizmo_retime_type.cc b/source/blender/editors/space_sequencer/sequencer_gizmo_retime_type.cc index 4397beb65c8..21f1456a9c1 100644 --- a/source/blender/editors/space_sequencer/sequencer_gizmo_retime_type.cc +++ b/source/blender/editors/space_sequencer/sequencer_gizmo_retime_type.cc @@ -596,21 +596,22 @@ void GIZMO_GT_retime_remove(wmGizmoType *gzt) static size_t label_str_get(const Sequence *seq, const SeqRetimingHandle *handle, - size_t str_len, - char *r_label_str) + char *r_label_str, + const size_t label_str_maxncpy) { const SeqRetimingHandle *next_handle = handle + 1; if (SEQ_retiming_handle_is_transition_type(handle)) { const float prev_speed = SEQ_retiming_handle_speed_get(seq, handle - 1); const float next_speed = SEQ_retiming_handle_speed_get(seq, next_handle + 1); return BLI_snprintf_rlen(r_label_str, - str_len, + label_str_maxncpy, "%d%% - %d%%", round_fl_to_int(prev_speed * 100.0f), round_fl_to_int(next_speed * 100.0f)); } const float speed = SEQ_retiming_handle_speed_get(seq, next_handle); - return BLI_snprintf_rlen(r_label_str, str_len, "%d%%", round_fl_to_int(speed * 100.0f)); + return BLI_snprintf_rlen( + r_label_str, label_str_maxncpy, "%d%%", round_fl_to_int(speed * 100.0f)); } static bool label_rect_get(const bContext *C, @@ -669,7 +670,7 @@ static void retime_speed_text_draw(const bContext *C, char label_str[40]; rctf label_rect; - size_t label_len = label_str_get(seq, handle, sizeof(label_str), label_str); + size_t label_len = label_str_get(seq, handle, label_str, sizeof(label_str)); if (!label_rect_get(C, seq, handle, label_str, label_len, &label_rect)) { return; /* Not enough space to draw label. */ @@ -720,7 +721,7 @@ static int gizmo_retime_speed_set_test_select(bContext *C, wmGizmo *gz, const in char label_str[40]; rctf label_rect; - size_t label_len = label_str_get(seq, &handle, sizeof(label_str), label_str); + size_t label_len = label_str_get(seq, &handle, label_str, sizeof(label_str)); if (!label_rect_get(C, seq, &handle, label_str, label_len, &label_rect)) { continue;