Resync

Author: LibretroAdmin

dynamic/dylib.c

@@ -135,11 +135,11 @@ dylib_t dylib_load(const char *path)
     {
         char fw_path[PATH_MAX_LENGTH];
         const char *fw_name = path_basename(path);
-        size_t sz = strlcpy(fw_path, path, sizeof(fw_path));
-        sz += strlcpy(fw_path + sz, "/", sizeof(fw_path) - sz);
+        size_t _len         = strlcpy(fw_path, path, sizeof(fw_path));
+        _len += strlcpy(fw_path + _len, "/", sizeof(fw_path) - _len);
         /* Assume every framework binary is named for the framework. Not always
          * a great assumption but correct enough for our uses. */
-        strlcpy(fw_path + sz, fw_name, strlen(fw_name) - STRLEN_CONST(fw_suffix) + 1);
+        strlcpy(fw_path + _len, fw_name, strlen(fw_name) - STRLEN_CONST(fw_suffix) + 1);
         lib = dlopen(fw_path, RTLD_LAZY | RTLD_LOCAL);
     }
     else

features/features_cpu.c

@@ -758,20 +758,6 @@ uint64_t cpu_features_get(void)
 #endif
 #endif
    }
-
-#if 0
-    check_arm_cpu_feature("swp");
-    check_arm_cpu_feature("half");
-    check_arm_cpu_feature("thumb");
-    check_arm_cpu_feature("fastmult");
-    check_arm_cpu_feature("vfp");
-    check_arm_cpu_feature("edsp");
-    check_arm_cpu_feature("thumbee");
-    check_arm_cpu_feature("tls");
-    check_arm_cpu_feature("idiva");
-    check_arm_cpu_feature("idivt");
-#endif
-
 #elif defined(__ARM_NEON__)
    cpu |= RETRO_SIMD_NEON;
 #if defined(__arm__)

file/archive_file.c

@@ -479,6 +479,40 @@ bool file_archive_perform_mode(const char *path, const char *valid_exts,
    return true;
 }
 
+/**
+ * string_list_append_n:
+ * @list             : pointer to string list
+ * @elem             : element to add to the string list
+ * @length           : read at most this many bytes from elem
+ * @attr             : attributes of new element.
+ *
+ * Appends a new element to the string list.
+ *
+ * @return true if successful, otherwise false.
+ **/
+static bool string_list_append_n(struct string_list *list,
+      const char *elem, unsigned length,
+      union string_list_elem_attr attr)
+{
+   char *data_dup = NULL;
+
+   if (list->size >= list->cap &&
+         !string_list_capacity(list, list->cap * 2))
+      return false;
+
+   if (!(data_dup = (char*)malloc(length + 1)))
+      return false;
+
+   strlcpy(data_dup, elem, length + 1);
+
+   list->elems[list->size].data = data_dup;
+   list->elems[list->size].attr = attr;
+
+   list->size++;
+   return true;
+}
+
+
 /**
  * file_archive_filename_split:
  * @str              : filename to turn into a string list

file/file_path.c

@@ -384,15 +384,18 @@ char *find_last_slash(const char *str)
  **/
 size_t fill_pathname_slash(char *s, size_t len)
 {
-   char       *last_slash = find_last_slash(s);
+   char *last_slash = find_last_slash(s);
+   len              = strlen(s);
    if (!last_slash)
-      return strlcat(s, PATH_DEFAULT_SLASH(), len);
-   len         = strlen(s);
-   /* Try to preserve slash type. */
-   if (last_slash != (s + len - 1))
    {
-      s[  len] = last_slash[0];
-      s[++len] = '\0';
+      s[  len]      = PATH_DEFAULT_SLASH_C();
+      s[++len]      = '\0';
+   }
+   else if (last_slash != (s + len - 1))
+   {
+      /* Try to preserve slash type. */
+      s[  len]       = last_slash[0];
+      s[++len]       = '\0';
    }
    return len;
 }
@@ -992,20 +995,17 @@ size_t fill_pathname_join_special(char *s,
 
    if (*s)
    {
-      char *last_slash       = find_last_slash(s);
-      if (last_slash)
+      char *last_slash = find_last_slash(s);
+      if (!last_slash)
       {
-         /* Try to preserve slash type. */
-         if (last_slash != (s + _len - 1))
-         {
-            s[  _len] = last_slash[0];
-            s[++_len] = '\0';
-         }
+         s[  _len]     = PATH_DEFAULT_SLASH_C();
+         s[++_len]     = '\0';
       }
-      else
+      else if (last_slash != (s + _len - 1))
       {
-         s[  _len]    = PATH_DEFAULT_SLASH_C();
-         s[++_len]    = '\0';
+         /* Try to preserve slash type. */
+         s[  _len]     = last_slash[0];
+         s[++_len]     = '\0';
       }
    }
 
@@ -1327,14 +1327,14 @@ void path_basedir_wrapper(char *s)
       *last_slash   = '\0';
 #endif
    last_slash       = find_last_slash(s);
-   if (last_slash)
-      last_slash[1] = '\0';
-   else
+   if (!last_slash)
    {
       s[0]          = '.';
       s[1]          = PATH_DEFAULT_SLASH_C();
       s[2]          = '\0';
    }
+   else
+      last_slash[1] = '\0';
 }
 
 #if !defined(RARCH_CONSOLE) && defined(RARCH_INTERNAL)

formats/bmp/rbmp.c

@@ -346,21 +346,6 @@ static unsigned char *rbmp_bmp_load(rbmp_context *s, unsigned *x, unsigned *y,
             switch (compress)
             {
                case 0:
-#if 0
-                  if (bpp == 32)
-                  {
-                     mr = 0xffu << 16;
-                     mg = 0xffu <<  8;
-                     mb = 0xffu <<  0;
-                     ma = 0xffu << 24;
-                  }
-                  else
-                  {
-                     mr = 31u << 10;
-                     mg = 31u <<  5;
-                     mb = 31u <<  0;
-                  }
-#endif
                   break;
                case 3:
                   mr = (uint32_t)RBMP_GET32LE(s);
@@ -373,9 +358,6 @@ static unsigned char *rbmp_bmp_load(rbmp_context *s, unsigned *x, unsigned *y,
                      return 0;
                   break;
                default:
-#if 0
-                  mr = mg = mb = 0;
-#endif
                   break;
             }
 

formats/m3u/m3u_file.c

@@ -474,7 +474,6 @@ bool m3u_file_save(
 {
    size_t i;
    char base_dir[DIR_MAX_LENGTH];
-   char *last_slash = NULL;
    RFILE *file      = NULL;
 
    if (!m3u_file || !m3u_file->entries)
@@ -485,7 +484,7 @@ bool m3u_file_save(
       return false;
 
    /* Get M3U file base directory */
-   if ((last_slash = find_last_slash(m3u_file->path)))
+   if (find_last_slash(m3u_file->path))
       fill_pathname_basedir(base_dir, m3u_file->path, sizeof(base_dir));
    else
       base_dir[0]   = '\0';

formats/tga/rtga.c

@@ -337,11 +337,16 @@ static uint8_t *rtga_tga_load(rtga_context *s,
                /* read in the data raw */
                /* manually unroll, probably GCC bug 92955 */
                j = 0;
-               switch (tga_bits_per_pixel) {
-                  case 32: raw_data[j++] = rtga_get8(s); /* fallthrough */
-                  case 24: raw_data[j++] = rtga_get8(s); /* fallthrough */
-                  case 16: raw_data[j++] = rtga_get8(s); /* fallthrough */
-                  case  8: raw_data[j++] = rtga_get8(s);
+               switch (tga_bits_per_pixel)
+               {
+                  case 32:
+                     raw_data[j++] = rtga_get8(s); /* fallthrough */
+                  case 24:
+                     raw_data[j++] = rtga_get8(s); /* fallthrough */
+                  case 16:
+                     raw_data[j++] = rtga_get8(s); /* fallthrough */
+                  case  8:
+                     raw_data[j++] = rtga_get8(s);
                }
             }
 

formats/xml/rxml.c

@@ -142,6 +142,7 @@ rxml_document_t *rxml_load_document_string(const char *str)
    doc                           = (rxml_document_t*)malloc(sizeof(*doc));
    if (!doc)
       goto error;
+   doc->root_node                = NULL;
 
    yxml_init(&x, buf->xml, BUFSIZE);
 

include/defines/d3d_defines.h

@@ -29,64 +29,19 @@
 
 #if defined(HAVE_D3D9)
 /* Direct3D 9 */
-#if 0
-#include <d3d9.h>
-#endif
-
-#if 0
-#define LPDIRECT3D                     LPDIRECT3D9
-#define LPDIRECT3DDEVICE               LPDIRECT3DDEVICE9
-#define LPDIRECT3DTEXTURE              LPDIRECT3DTEXTURE9
-#define LPDIRECT3DCUBETEXTURE          LPDIRECT3DCUBETEXTURE9
-#define LPDIRECT3DVERTEXBUFFER         LPDIRECT3DVERTEXBUFFER9
-#define LPDIRECT3DVERTEXSHADER         LPDIRECT3DVERTEXSHADER9
-#define LPDIRECT3DPIXELSHADER          LPDIRECT3DPIXELSHADER9
-#define LPDIRECT3DSURFACE              LPDIRECT3DSURFACE9
-#define LPDIRECT3DVERTEXDECLARATION    LPDIRECT3DVERTEXDECLARATION9
-#define LPDIRECT3DVOLUMETEXTURE        LPDIRECT3DVOLUMETEXTURE9
-#define LPDIRECT3DRESOURCE             LPDIRECT3DRESOURCE9
-#define D3DVERTEXELEMENT               D3DVERTEXELEMENT9
-#define D3DVIEWPORT                    D3DVIEWPORT9
-#endif
 
 #ifndef D3DCREATE_SOFTWARE_VERTEXPROCESSING
 #define D3DCREATE_SOFTWARE_VERTEXPROCESSING 0
 #endif
 
 #elif defined(HAVE_D3D8)
-#if 0
-#ifdef _XBOX
-#include <xtl.h>
-#else
-#include "../gfx/include/d3d8/d3d8.h"
-#endif
-#endif
 
 /* Direct3D 8 */
-#if 0
-#define LPDIRECT3D                     LPDIRECT3D8
-#define LPDIRECT3DDEVICE               LPDIRECT3DDEVICE8
-#define LPDIRECT3DTEXTURE              LPDIRECT3DTEXTURE8
-#define LPDIRECT3DCUBETEXTURE          LPDIRECT3DCUBETEXTURE8
-#define LPDIRECT3DVOLUMETEXTURE        LPDIRECT3DVOLUMETEXTURE8
-#define LPDIRECT3DVERTEXBUFFER         LPDIRECT3DVERTEXBUFFER8
-#define LPDIRECT3DVERTEXDECLARATION    (void*)
-#define LPDIRECT3DSURFACE              LPDIRECT3DSURFACE8
-#define LPDIRECT3DRESOURCE             LPDIRECT3DRESOURCE8
-#define D3DVERTEXELEMENT               D3DVERTEXELEMENT8
-#define D3DVIEWPORT                    D3DVIEWPORT8
-#endif
 
 #if !defined(D3DLOCK_NOSYSLOCK) && defined(_XBOX)
 #define D3DLOCK_NOSYSLOCK (0)
 #endif
 
-#if 0
-#define D3DSAMP_ADDRESSU D3DTSS_ADDRESSU
-#define D3DSAMP_ADDRESSV D3DTSS_ADDRESSV
-#define D3DSAMP_MAGFILTER D3DTSS_MAGFILTER
-#define D3DSAMP_MINFILTER D3DTSS_MINFILTER
-#endif
 #endif
 
 #endif

include/lists/string_list.h

@@ -91,22 +91,6 @@ 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
- * @delim            : delimiter character to use for separating the string.
- *
- * Creates a new string list based on string @str, delimited by @delim.
- * Includes empty strings - i.e. two adjacent delimiters will resolve
- * to a string list element of "".
- *
- * @return New string list if successful, otherwise NULL.
- **/
-struct string_list *string_separate(char *str, const char *delim);
-
-bool string_separate_noalloc(struct string_list *list,
-      char *str, const char *delim);
-
 bool string_list_deinitialize(struct string_list *list);
 
 bool string_list_initialize(struct string_list *list);
@@ -137,25 +121,6 @@ struct string_list *string_list_new(void);
 bool string_list_append(struct string_list *list, const char *elem,
       union string_list_elem_attr attr);
 
-/**
- * string_list_append_n:
- * @list             : pointer to string list
- * @elem             : element to add to the string list
- * @length           : read at most this many bytes from elem
- * @attr             : attributes of new element.
- *
- * Appends a new element to the string list.
- *
- * Hidden non-leaf function cost:
- * - Calls string_list_capacity()
- * - Calls malloc
- * - Calls strlcpy
- *
- * @return true if successful, otherwise false.
- **/
-bool string_list_append_n(struct string_list *list, const char *elem,
-      unsigned length, union string_list_elem_attr attr);
-
 /**
  * string_list_free
  * @list             : pointer to string list object
@@ -200,19 +165,15 @@ void string_list_join_concat_special(char *s, size_t len,
       const struct string_list *list, const char *delim);
 
 /**
- * string_list_set:
+ * string_list_capacity:
  * @list             : pointer to string list
- * @idx              : index of element in string list
- * @str              : value for the element.
+ * @cap              : new capacity for string list.
  *
- * Set value of element inside string list.
+ * Change maximum capacity of string list's size.
  *
- * Hidden non-leaf function cost:
- * - Calls free
- * - Calls strdup
+ * @return true if successful, otherwise false.
  **/
-void string_list_set(struct string_list *list, unsigned idx,
-      const char *str);
+bool string_list_capacity(struct string_list *list, size_t cap);
 
 struct string_list *string_list_clone(const struct string_list *src);