Use string_list_append_n where appropriate

LibretroAdmin · LibretroAdmin · commit cb58dbc1feb7 · 2026-03-10T13:55:55.000+01:00
diff --git a/gfx/drivers_shader/glslang_util.c b/gfx/drivers_shader/glslang_util.c
@@ -168,18 +168,19 @@ bool glslang_read_shader_file(const char *path,
 
                /* Allows us to use #line to make dealing with shader
                 * errors easier. */
-               if (!string_list_append(output,
+               if (!string_list_append_n(output,
                      "#extension GL_GOOGLE_cpp_style_line_directive : require",
+                     STRLEN_CONST("#extension GL_GOOGLE_cpp_style_line_directive : require"),
                      attr))
                {
                   *newline = saved;
                   goto cleanup;
                }
 
                /* Append feature defines */
-               if (!string_list_append(output, "#define _HAS_ORIGINALASPECT_UNIFORMS", attr)
-                     || !string_list_append(output, "#define _HAS_FRAMETIME_UNIFORMS", attr)
-                     || !string_list_append(output, "#define _HAS_SENSOR_UNIFORMS", attr))
+               if (!string_list_append_n(output, "#define _HAS_ORIGINALASPECT_UNIFORMS", STRLEN_CONST("#define _HAS_ORIGINALASPECT_UNIFORMS"), attr)
+                || !string_list_append_n(output, "#define _HAS_FRAMETIME_UNIFORMS", STRLEN_CONST("#define _HAS_FRAMETIME_UNIFORMS"), attr)
+                || !string_list_append_n(output, "#define _HAS_SENSOR_UNIFORMS", STRLEN_CONST("#define _HAS_SENSOR_UNIFORMS"), attr))
                {
                   *newline = saved;
                   goto cleanup;
@@ -202,9 +203,9 @@ bool glslang_read_shader_file(const char *path,
             /* Non-root or non-slang: emit feature defines + #line once */
             if (root_file)
             {
-               if (!string_list_append(output, "#define _HAS_ORIGINALASPECT_UNIFORMS", attr)
-                     || !string_list_append(output, "#define _HAS_FRAMETIME_UNIFORMS", attr)
-                     || !string_list_append(output, "#define _HAS_SENSOR_UNIFORMS", attr))
+               if (!string_list_append_n(output, "#define _HAS_ORIGINALASPECT_UNIFORMS", STRLEN_CONST("#define _HAS_ORIGINALASPECT_UNIFORMS"), attr)
+                || !string_list_append_n(output, "#define _HAS_FRAMETIME_UNIFORMS", STRLEN_CONST("#define _HAS_FRAMETIME_UNIFORMS"), attr)
+                || !string_list_append_n(output, "#define _HAS_SENSOR_UNIFORMS", STRLEN_CONST("#define _HAS_SENSOR_UNIFORMS"), attr))
                {
                   *newline = saved;
                   goto cleanup;
@@ -219,9 +220,9 @@ bool glslang_read_shader_file(const char *path,
             }
             else
             {
-               if (!string_list_append(output, "#define _HAS_ORIGINALASPECT_UNIFORMS", attr)
-                     || !string_list_append(output, "#define _HAS_FRAMETIME_UNIFORMS", attr)
-                     || !string_list_append(output, "#define _HAS_SENSOR_UNIFORMS", attr))
+               if (!string_list_append_n(output, "#define _HAS_ORIGINALASPECT_UNIFORMS", STRLEN_CONST("#define _HAS_ORIGINALASPECT_UNIFORMS"), attr)
+                || !string_list_append_n(output, "#define _HAS_FRAMETIME_UNIFORMS", STRLEN_CONST("#define _HAS_FRAMETIME_UNIFORMS"), attr)
+                || !string_list_append_n(output, "#define _HAS_SENSOR_UNIFORMS", STRLEN_CONST("#define _HAS_SENSOR_UNIFORMS"), attr))
                {
                   *newline = saved;
                   goto cleanup;
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
@@ -6240,8 +6240,8 @@ static int action_ok_add_entry_to_playlist(const char *path,
       }
       else
       {
-         string_list_append(str_list, FILE_PATH_DETECT, attr);
-         string_list_append(str_list, FILE_PATH_DETECT, attr);
+         string_list_append_n(str_list, FILE_PATH_DETECT, STRLEN_CONST(FILE_PATH_DETECT), attr);
+         string_list_append_n(str_list, FILE_PATH_DETECT, STRLEN_CONST(FILE_PATH_DETECT), attr);
       }
 
       /* crc32 */
@@ -6415,7 +6415,8 @@ static int action_ok_add_to_favorites_playlist(const char *path,
           * (always use display name, if available) */
          if (core_info_find(core_path, &core_info))
             if (!string_is_empty(core_info->display_name))
-               strlcpy(core_display_name, core_info->display_name, sizeof(core_display_name));
+               strlcpy(core_display_name, core_info->display_name,
+               sizeof(core_display_name));
 
          if (!string_is_empty(core_display_name))
             string_list_append(str_list, core_display_name, attr);
@@ -6424,8 +6425,8 @@ static int action_ok_add_to_favorites_playlist(const char *path,
       }
       else
       {
-         string_list_append(str_list, FILE_PATH_DETECT, attr);
-         string_list_append(str_list, FILE_PATH_DETECT, attr);
+         string_list_append_n(str_list, FILE_PATH_DETECT, STRLEN_CONST(FILE_PATH_DETECT), attr);
+         string_list_append_n(str_list, FILE_PATH_DETECT, STRLEN_CONST(FILE_PATH_DETECT), attr);
       }
 
       /* crc32 */
diff --git a/retroarch.c b/retroarch.c
@@ -567,8 +567,8 @@ static bool rarch_midi_drv_output_pending;
 
 static void null_midi_free(void *p) { }
 static void *null_midi_init(const char *input, const char *output) { return (void*)-1; }
-static bool null_midi_get_avail_inputs(struct string_list *inputs) { union string_list_elem_attr attr = {0}; return string_list_append(inputs, "Null", attr); }
-static bool null_midi_get_avail_outputs(struct string_list *outputs) { union string_list_elem_attr attr = {0}; return string_list_append(outputs, "Null", attr); }
+static bool null_midi_get_avail_inputs(struct string_list *inputs) { union string_list_elem_attr attr = {0}; return string_list_append_n(inputs, "Null", STRLEN_CONST("Null"), attr); }
+static bool null_midi_get_avail_outputs(struct string_list *outputs) { union string_list_elem_attr attr = {0}; return string_list_append_n(outputs, "Null", STRLEN_CONST("Null"), attr); }
 static bool null_midi_set_input(void *p, const char *input) { return input == NULL || string_is_equal(input, "Null"); }
 static bool null_midi_set_output(void *p, const char *output) { return output == NULL || string_is_equal(output, "Null"); }
 static bool null_midi_read(void *p, midi_event_t *event) { return false; }
@@ -782,8 +782,8 @@ static bool midi_driver_init(void *data)
 
    if (!rarch_midi_drv_inputs || !rarch_midi_drv_outputs)
       ret = false;
-   else if (!string_list_append(rarch_midi_drv_inputs, MIDI_DRIVER_OFF, attr) ||
-            !string_list_append(rarch_midi_drv_outputs, MIDI_DRIVER_OFF, attr))
+   else if (!string_list_append_n(rarch_midi_drv_inputs, MIDI_DRIVER_OFF, STRLEN_CONST(MIDI_DRIVER_OFF), attr) ||
+            !string_list_append_n(rarch_midi_drv_outputs, MIDI_DRIVER_OFF, STRLEN_CONST(MIDI_DRIVER_OFF), attr))
       ret = false;
    else
    {
diff --git a/tasks/task_cloudsync.c b/tasks/task_cloudsync.c
@@ -357,31 +357,32 @@ static struct string_list *task_cloud_sync_directory_map(void)
 
       if (settings->bools.cloud_sync_sync_configs)
       {
-         string_list_append(list, "config", attr);
+         string_list_append_n(list, "config", STRLEN_CONST("config"), attr);
          fill_pathname_application_special(dir,
                sizeof(dir), APPLICATION_SPECIAL_DIRECTORY_CONFIG);
          list->elems[list->size - 1].userdata = strdup(dir);
       }
 
       if (settings->bools.cloud_sync_sync_saves)
       {
-         string_list_append(list, "saves", attr);
+         string_list_append_n(list, "saves", STRLEN_CONST("saves"), attr);
          list->elems[list->size - 1].userdata = strdup(dir_get_ptr(RARCH_DIR_SAVEFILE));
 
-         string_list_append(list, "states", attr);
+         string_list_append_n(list, "states", STRLEN_CONST("states"), attr);
          list->elems[list->size - 1].userdata = strdup(dir_get_ptr(RARCH_DIR_SAVESTATE));
       }
 
       if (settings->bools.cloud_sync_sync_thumbs)
       {
-         string_list_append(list, "thumbnails", attr);
+         string_list_append_n(list, "thumbnails", STRLEN_CONST("thumbnails"),
+         attr);
          strlcpy(dir, settings->paths.directory_thumbnails, sizeof(dir));
          list->elems[list->size - 1].userdata = strdup(dir);
       }
 
       if (settings->bools.cloud_sync_sync_system)
       {
-         string_list_append(list, "system", attr);
+         string_list_append_n(list, "system", STRLEN_CONST("system"), attr);
          strlcpy(dir, settings->paths.directory_system, sizeof(dir));
          list->elems[list->size - 1].userdata = strdup(dir);
       }
diff --git a/tasks/task_content.c b/tasks/task_content.c
@@ -466,7 +466,7 @@ static const char *content_file_list_append_temporary(
    return NULL;
 }
 
-/* Note: Takes ownership of supplied 'data' buffer */
+/* NOTE: Takes ownership of supplied 'data' buffer */
 static bool content_file_list_set_info(
       content_file_list_t *file_list,
       const char *path,
@@ -1287,8 +1287,8 @@ static void content_file_set_attributes(
       {
          if (  (flags & CONTENT_ST_FLAG_CORE_DOES_NOT_NEED_CONTENT)
              && content_ctx->flags
-             & CONTENT_INFO_FLAG_SET_SUPPORTS_NO_GAME_ENABLE)
-            string_list_append(content, "", attr);
+             &  CONTENT_INFO_FLAG_SET_SUPPORTS_NO_GAME_ENABLE)
+            string_list_append_n(content, "", STRLEN_CONST(""), attr);
       }
       else
          string_list_append(content, content_path, attr);
diff --git a/tasks/task_database.c b/tasks/task_database.c
@@ -2190,7 +2190,7 @@ static void task_manual_content_scan_handler(retro_task_t *task)
                {
                   union string_list_elem_attr attr;
                   attr.i = 0;
-                  /* Note: If string_list_append() fails, there is
+                  /* NOTE: If string_list_append() fails, there is
                    * really nothing we can do. The M3U file will
                    * just be ignored... */
                   string_list_append(

Original file line number	Diff line number	Diff line change
`@@ -6240,8 +6240,8 @@ static int action_ok_add_entry_to_playlist(const char *path,`
`6240`	`6240`	`}`
`6241`	`6241`	`else`
`6242`	`6242`	`{`
`6243`		`- string_list_append(str_list, FILE_PATH_DETECT, attr);`
`6244`		`- string_list_append(str_list, FILE_PATH_DETECT, attr);`
	`6243`	`+ string_list_append_n(str_list, FILE_PATH_DETECT, STRLEN_CONST(FILE_PATH_DETECT), attr);`
	`6244`	`+ string_list_append_n(str_list, FILE_PATH_DETECT, STRLEN_CONST(FILE_PATH_DETECT), attr);`
`6245`	`6245`	`}`
`6246`	`6246`
`6247`	`6247`	`/* crc32 */`
`@@ -6415,7 +6415,8 @@ static int action_ok_add_to_favorites_playlist(const char *path,`
`6415`	`6415`	`* (always use display name, if available) */`
`6416`	`6416`	`if (core_info_find(core_path, &core_info))`
`6417`	`6417`	`if (!string_is_empty(core_info->display_name))`
`6418`		`- strlcpy(core_display_name, core_info->display_name, sizeof(core_display_name));`
	`6418`	`+ strlcpy(core_display_name, core_info->display_name,`
	`6419`	`+ sizeof(core_display_name));`
`6419`	`6420`
`6420`	`6421`	`if (!string_is_empty(core_display_name))`
`6421`	`6422`	`string_list_append(str_list, core_display_name, attr);`
`@@ -6424,8 +6425,8 @@ static int action_ok_add_to_favorites_playlist(const char *path,`
`6424`	`6425`	`}`
`6425`	`6426`	`else`
`6426`	`6427`	`{`
`6427`		`- string_list_append(str_list, FILE_PATH_DETECT, attr);`
`6428`		`- string_list_append(str_list, FILE_PATH_DETECT, attr);`
	`6428`	`+ string_list_append_n(str_list, FILE_PATH_DETECT, STRLEN_CONST(FILE_PATH_DETECT), attr);`
	`6429`	`+ string_list_append_n(str_list, FILE_PATH_DETECT, STRLEN_CONST(FILE_PATH_DETECT), attr);`
`6429`	`6430`	`}`
`6430`	`6431`
`6431`	`6432`	`/* crc32 */`
Original file line number	Diff line number	Diff line change
`@@ -357,31 +357,32 @@ static struct string_list *task_cloud_sync_directory_map(void)`
`357`	`357`
`358`	`358`	`if (settings->bools.cloud_sync_sync_configs)`
`359`	`359`	`{`
`360`		`- string_list_append(list, "config", attr);`
	`360`	`+ string_list_append_n(list, "config", STRLEN_CONST("config"), attr);`
`361`	`361`	`fill_pathname_application_special(dir,`
`362`	`362`	`sizeof(dir), APPLICATION_SPECIAL_DIRECTORY_CONFIG);`
`363`	`363`	`list->elems[list->size - 1].userdata = strdup(dir);`
`364`	`364`	`}`
`365`	`365`
`366`	`366`	`if (settings->bools.cloud_sync_sync_saves)`
`367`	`367`	`{`
`368`		`- string_list_append(list, "saves", attr);`
	`368`	`+ string_list_append_n(list, "saves", STRLEN_CONST("saves"), attr);`
`369`	`369`	`list->elems[list->size - 1].userdata = strdup(dir_get_ptr(RARCH_DIR_SAVEFILE));`
`370`	`370`
`371`		`- string_list_append(list, "states", attr);`
	`371`	`+ string_list_append_n(list, "states", STRLEN_CONST("states"), attr);`
`372`	`372`	`list->elems[list->size - 1].userdata = strdup(dir_get_ptr(RARCH_DIR_SAVESTATE));`
`373`	`373`	`}`
`374`	`374`
`375`	`375`	`if (settings->bools.cloud_sync_sync_thumbs)`
`376`	`376`	`{`
`377`		`- string_list_append(list, "thumbnails", attr);`
	`377`	`+ string_list_append_n(list, "thumbnails", STRLEN_CONST("thumbnails"),`
	`378`	`+ attr);`
`378`	`379`	`strlcpy(dir, settings->paths.directory_thumbnails, sizeof(dir));`
`379`	`380`	`list->elems[list->size - 1].userdata = strdup(dir);`
`380`	`381`	`}`
`381`	`382`
`382`	`383`	`if (settings->bools.cloud_sync_sync_system)`
`383`	`384`	`{`
`384`		`- string_list_append(list, "system", attr);`
	`385`	`+ string_list_append_n(list, "system", STRLEN_CONST("system"), attr);`
`385`	`386`	`strlcpy(dir, settings->paths.directory_system, sizeof(dir));`
`386`	`387`	`list->elems[list->size - 1].userdata = strdup(dir);`
`387`	`388`	`}`
Original file line number	Diff line number	Diff line change
`@@ -466,7 +466,7 @@ static const char *content_file_list_append_temporary(`
`466`	`466`	`return NULL;`
`467`	`467`	`}`
`468`	`468`
`469`		`-/* Note: Takes ownership of supplied 'data' buffer */`
	`469`	`+/* NOTE: Takes ownership of supplied 'data' buffer */`
`470`	`470`	`static bool content_file_list_set_info(`
`471`	`471`	`content_file_list_t *file_list,`
`472`	`472`	`const char *path,`
`@@ -1287,8 +1287,8 @@ static void content_file_set_attributes(`
`1287`	`1287`	`{`
`1288`	`1288`	`if ( (flags & CONTENT_ST_FLAG_CORE_DOES_NOT_NEED_CONTENT)`
`1289`	`1289`	`&& content_ctx->flags`
`1290`		`- & CONTENT_INFO_FLAG_SET_SUPPORTS_NO_GAME_ENABLE)`
`1291`		`- string_list_append(content, "", attr);`
	`1290`	`+ & CONTENT_INFO_FLAG_SET_SUPPORTS_NO_GAME_ENABLE)`
	`1291`	`+ string_list_append_n(content, "", STRLEN_CONST(""), attr);`
`1292`	`1292`	`}`
`1293`	`1293`	`else`
`1294`	`1294`	`string_list_append(content, content_path, attr);`
Original file line number	Diff line number	Diff line change
`@@ -2190,7 +2190,7 @@ static void task_manual_content_scan_handler(retro_task_t *task)`
`2190`	`2190`	`{`
`2191`	`2191`	`union string_list_elem_attr attr;`
`2192`	`2192`	`attr.i = 0;`
`2193`		`- /* Note: If string_list_append() fails, there is`
	`2193`	`+ /* NOTE: If string_list_append() fails, there is`
`2194`	`2194`	`* really nothing we can do. The M3U file will`
`2195`	`2195`	`* just be ignored... */`
`2196`	`2196`	`string_list_append(`