Resync

Author: inactive123

cdrom/cdrom.c

@@ -1395,25 +1395,26 @@ struct string_list* cdrom_get_available_drives(void)
       if (filestream_read_file("/proc/modules", (void**)&buf, &len))
       {
 #ifdef CDROM_DEBUG
-         bool found = false;
+         bool found              = false;
 #endif
-         struct string_list *mods = string_split(buf, "\n");
+         struct string_list mods = {0};
 
-         if (mods)
+         string_list_initialize(&mods);
+         
+         if (string_split_noalloc(&mods, buf, "\n"))
          {
-            for (i = 0; i < mods->size; i++)
+            for (i = 0; i < mods.size; i++)
             {
-               if (strcasestr(mods->elems[i].data, "sg "))
+               if (strcasestr(mods.elems[i].data, "sg "))
                {
 #ifdef CDROM_DEBUG
                   found = true;
 #endif
                   break;
                }
             }
-
-            string_list_free(mods);
          }
+         string_list_deinitialize(&mods);
 
 #ifdef CDROM_DEBUG
          if (found)

file/archive_file.c

@@ -58,37 +58,34 @@ static int file_archive_get_file_list_cb(
       size_t path_len              = strlen(path);
       /* Checks if this entry is a directory or a file. */
       char last_char               = path[path_len - 1];
-      struct string_list *ext_list = NULL;
+      struct string_list ext_list  = {0};
 
       /* Skip if directory. */
       if (last_char == '/' || last_char == '\\' )
-      {
-         string_list_free(ext_list);
          return 0;
-      }
 
-      ext_list                = string_split(valid_exts, "|");
-
-      if (ext_list)
+      string_list_initialize(&ext_list);
+      if (string_split_noalloc(&ext_list, valid_exts, "|"))
       {
          const char *file_ext = path_get_extension(path);
 
          if (!file_ext)
          {
-            string_list_free(ext_list);
+            string_list_deinitialize(&ext_list);
             return 0;
          }
 
-         if (!string_list_find_elem_prefix(ext_list, ".", file_ext))
+         if (!string_list_find_elem_prefix(&ext_list, ".", file_ext))
          {
             /* keep iterating */
-            string_list_free(ext_list);
+            string_list_deinitialize(&ext_list);
             return -1;
          }
 
          attr.i = RARCH_COMPRESSED_FILE_IN_ARCHIVE;
-         string_list_free(ext_list);
       }
+
+      string_list_deinitialize(&ext_list);
    }
 
    return string_list_append(userdata->list, path, attr);

file/config_file_userdata.c

@@ -76,12 +76,14 @@ int config_userdata_get_float_array(void *userdata, const char *key_str,
          config_get_string(usr->conf, key[1], &str))
    {
       unsigned i;
-      struct string_list *list = string_split(str, " ");
-      *values = (float*)calloc(list->size, sizeof(float));
-      for (i = 0; i < list->size; i++)
-         (*values)[i] = (float)strtod(list->elems[i].data, NULL);
-      *out_num_values = (unsigned)list->size;
-      string_list_free(list);
+      struct string_list list = {0};
+      string_list_initialize(&list);
+      string_split_noalloc(&list, str, " ");
+      *values = (float*)calloc(list.size, sizeof(float));
+      for (i = 0; i < list.size; i++)
+         (*values)[i] = (float)strtod(list.elems[i].data, NULL);
+      *out_num_values = (unsigned)list.size;
+      string_list_deinitialize(&list);
       free(str);
       return true;
    }
@@ -106,12 +108,14 @@ int config_userdata_get_int_array(void *userdata, const char *key_str,
          config_get_string(usr->conf, key[1], &str))
    {
       unsigned i;
-      struct string_list *list = string_split(str, " ");
-      *values = (int*)calloc(list->size, sizeof(int));
-      for (i = 0; i < list->size; i++)
-         (*values)[i] = (int)strtod(list->elems[i].data, NULL);
-      *out_num_values = (unsigned)list->size;
-      string_list_free(list);
+      struct string_list list = {0};
+      string_list_initialize(&list);
+      string_split_noalloc(&list, str, " ");
+      *values = (int*)calloc(list.size, sizeof(int));
+      for (i = 0; i < list.size; i++)
+         (*values)[i] = (int)strtod(list.elems[i].data, NULL);
+      *out_num_values = (unsigned)list.size;
+      string_list_deinitialize(&list);
       free(str);
       return true;
    }

include/lists/string_list.h

@@ -88,6 +88,9 @@ bool string_list_find_elem_prefix(const struct string_list *list,
  */
 struct string_list *string_split(const char *str, const char *delim);
 
+bool string_split_noalloc(struct string_list *list,
+      const char *str, const char *delim);
+
 /**
  * string_separate:
  * @str              : string to turn into a string list

lists/dir_list.c

@@ -214,12 +214,19 @@ bool dir_list_append(struct string_list *list,
       bool include_hidden, bool include_compressed,
       bool recursive)
 {
-   struct string_list *ext_list   = ext ? string_split(ext, "|") : NULL;
-   bool ret                       = dir_list_read(dir, list, ext_list,
-         include_dirs, include_hidden, include_compressed, recursive) != -1;
-
-   string_list_free(ext_list);
+   bool ret                         = false;
+   struct string_list ext_list      = {0};
+   struct string_list *ext_list_ptr = NULL;
 
+   if (ext)
+   {
+      string_list_initialize(&ext_list);
+      string_split_noalloc(&ext_list, ext, "|");
+      ext_list_ptr                  = &ext_list;
+   }
+   ret                            = dir_list_read(dir, list, ext_list_ptr,
+         include_dirs, include_hidden, include_compressed, recursive) != -1;
+   string_list_deinitialize(&ext_list);
    return ret;
 }
 

lists/string_list.c

@@ -286,7 +286,7 @@ struct string_list *string_split(const char *str, const char *delim)
    struct string_list *list = string_list_new();
 
    if (!list)
-      goto error;
+      return NULL;
 
    copy = strdup(str);
    if (!copy)
@@ -314,6 +314,40 @@ struct string_list *string_split(const char *str, const char *delim)
    return NULL;
 }
 
+bool string_split_noalloc(struct string_list *list,
+      const char *str, const char *delim)
+{
+   char *save      = NULL;
+   char *copy      = NULL;
+   const char *tmp = NULL;
+
+   if (!list)
+      return false;
+
+   copy            = strdup(str);
+   if (!copy)
+      return false;
+
+   tmp             = strtok_r(copy, delim, &save);
+   while (tmp)
+   {
+      union string_list_elem_attr attr;
+
+      attr.i = 0;
+
+      if (!string_list_append(list, tmp, attr))
+      {
+         free(copy);
+         return false;
+      }
+
+      tmp = strtok_r(NULL, delim, &save);
+   }
+
+   free(copy);
+   return true;
+}
+
 /**
  * string_separate:
  * @str              : string to turn into a string list