Resync

Author: LibretroAdmin

file/config_file.c

@@ -841,7 +841,7 @@ config_file_t *config_file_new_from_path_to_string(const char *path)
 {
    if (path_is_valid(path))
    {
-	   uint8_t *ret_buf                 = NULL;
+      uint8_t *ret_buf                 = NULL;
       int64_t length                   = 0;
       if (filestream_read_file(path, (void**)&ret_buf, &length))
       {

file/file_path.c

@@ -146,7 +146,7 @@ void path_linked_list_add_path(struct path_linked_list *in_path_llist,
       in_path_llist->path = strdup(path);
    else
    {
-      struct path_linked_list *node = (struct path_linked_list*) malloc(sizeof(*node));
+      struct path_linked_list *node = (struct path_linked_list*)malloc(sizeof(*node));
 
       if (node)
       {
@@ -1401,7 +1401,7 @@ size_t fill_pathname_application_path(char *s, size_t len)
             return strlcpy(s, info.name, len);
       }
 #elif defined(__QNX__)
-      char *buff = malloc(len);
+      char *buff  = (char*)malloc(len);
       size_t _len = 0;
       if (_cmdname(buff))
          _len = strlcpy(s, buff, len);

formats/bmp/rbmp.c

@@ -231,22 +231,22 @@ static int rbmp_bitcount(unsigned int a)
 
 static int rbmp_shiftsigned(int v, int shift, int bits)
 {
-   int result;
+   int ret;
    int z = bits;
 
    if (shift < 0)
       v <<= -shift;
    else
       v >>= shift;
 
-   result = v;
+   ret = v;
 
    while (z < 8)
    {
-      result += v >> z;
-      z      += bits;
+      ret += v >> z;
+      z   += bits;
    }
-   return result;
+   return ret;
 }
 
 static unsigned char *rbmp_bmp_load(rbmp_context *s, unsigned *x, unsigned *y,

formats/json/rjson.c

@@ -1011,7 +1011,7 @@ double rjson_get_double(rjson_t *json)
          snprintf(test, sizeof(test), "%.1f", 0.0f);
          json->decimal_sep = test[1];
       }
-      if (json->decimal_sep != '.' && (p = strchr(str, '.')) != NULL)
+      if (json->decimal_sep != '.' && (p = memchr(str, '.', strlen(str) + 1)) != NULL)
       {
          double res;
          *p  = json->decimal_sep;

formats/png/rpng_encode.c

@@ -410,7 +410,7 @@ uint8_t* rpng_save_image_bgr24_string(const uint8_t *data,
    if (!buf)
       GOTO_END_ERROR();
 
-   intf_s = intfstream_open_writable_memory(buf,
+   intf_s = intfstream_open_memory(buf,
          RETRO_VFS_FILE_ACCESS_WRITE,
          RETRO_VFS_FILE_ACCESS_HINT_NONE,
          _len);

include/cdrom/cdrom.h

@@ -74,7 +74,7 @@ unsigned cdrom_msf_to_lba(unsigned char min, unsigned char sec, unsigned char fr
 
 void increment_msf(unsigned char *min, unsigned char *sec, unsigned char *frame);
 
-int cdrom_read_subq(libretro_vfs_implementation_file *stream, unsigned char *buf, size_t len);
+int cdrom_read_subq(libretro_vfs_implementation_file *stream, unsigned char *s, size_t len);
 
 int cdrom_write_cue(libretro_vfs_implementation_file *stream, char **out_buf, size_t *out_len, char cdrom_drive, unsigned char *num_tracks, cdrom_toc_t *toc);
 

include/file/file_path.h

@@ -194,49 +194,49 @@ size_t path_basedir(char *path);
 
 /**
  * path_parent_dir:
- * @path               : path
- * @len                : length of @path
+ * @s                  : path
+ * @len                : size of buffer
  *
  * Extracts parent directory by mutating path.
  * Assumes that path is a directory. Keeps trailing '/'.
  * If the path was already at the root directory, returns empty string
  **/
-size_t path_parent_dir(char *path, size_t len);
+size_t path_parent_dir(char *s, size_t len);
 
 /**
  * path_resolve_realpath:
- * @buf                : input and output buffer for path
+ * @s                  : input and output buffer for path
  * @size               : size of buffer
  * @resolve_symlinks   : whether to resolve symlinks or not
  *
  * Resolves use of ".", "..", multiple slashes etc in absolute paths.
  *
  * Relative paths are rebased on the current working dir.
  *
- * @return @buf if successful, NULL otherwise.
+ * @return @s if successful, NULL otherwise.
  * Note: Not implemented on consoles
  * Note: Symlinks are only resolved on Unix-likes
  * Note: The current working dir might not be what you expect,
  *       e.g. on Android it is "/"
  *       Use of fill_pathname_resolve_relative() should be preferred
  **/
-char *path_resolve_realpath(char *buf, size_t len, bool resolve_symlinks);
+char *path_resolve_realpath(char *s, size_t len, bool resolve_symlinks);
 
 /**
  * path_relative_to:
- * @out                : buffer to write the relative path to
+ * @s                  : buffer to write the relative path to
  * @path               : path to be expressed relatively
  * @base               : relative to this
- * @size               : size of output buffer
+ * @len                : size of output buffer
  *
- * Turns @path into a path relative to @base and writes it to @out.
+ * Turns @path into a path relative to @base and writes it to @s.
  *
  * @base is assumed to be a base directory, i.e. a path ending with '/' or '\'.
  * Both @path and @base are assumed to be absolute paths without "." or "..".
  *
  * E.g. path /a/b/e/f.cgp with base /a/b/c/d/ turns into ../../e/f.cgp
  *
- * @return Length of the string copied into @out
+ * @return Length of the string copied into @s
  **/
 size_t path_relative_to(char *s, const char *path, const char *base,
       size_t len);
@@ -277,7 +277,7 @@ bool path_is_absolute(const char *path);
  * - calls strrchr
  * - calls strlcat
  *
- * @return Length of the string copied into @out
+ * @return Length of the string copied into @s
  */
 size_t fill_pathname(char *s, const char *in_path,
       const char *replace, size_t len);
@@ -371,23 +371,23 @@ size_t fill_pathname_dir(char *s, const char *in_basename,
  * fill_pathname_base:
  * @s                  : output path
  * @in_path            : input path
- * @size               : size of output path
+ * @len                : size of output path
  *
  * Copies basename of @in_path into @s.
  *
  * Hidden non-leaf function cost:
  * - Calls path_basename()
  * - Calls strlcpy
  *
- * @return length of the string copied into @out
+ * @return length of the string copied into @s
  **/
 size_t fill_pathname_base(char *s, const char *in_path, size_t len);
 
 /**
  * fill_pathname_basedir:
  * @s                  : output directory
  * @in_path            : input path
- * @size               : size of output directory
+ * @len                : size of output directory
  *
  * Copies base directory of @in_path into @s.
  * If in_path is a path without any slashes (relative current directory),
@@ -405,7 +405,7 @@ size_t fill_pathname_basedir(char *s, const char *in_path, size_t len);
  * @in_dir             : input directory
  * @len                : size of @s
  *
- * Copies only the parent directory name of @in_dir into @out_dir.
+ * Copies only the parent directory name of @in_dir into @s.
  * The two buffers must not overlap. Removes trailing '/'.
  *
  * Hidden non-leaf function cost:
@@ -419,17 +419,17 @@ size_t fill_pathname_parent_dir_name(char *s,
 
 /**
  * fill_pathname_parent_dir:
- * @out_dir            : output directory
+ * @s                  : output directory
  * @in_dir             : input directory
- * @size               : size of output directory
+ * @len                : size of output directory
  *
- * Copies parent directory of @in_dir into @out_dir.
+ * Copies parent directory of @in_dir into @s.
  * Assumes @in_dir is a directory. Keeps trailing '/'.
- * If the path was already at the root directory, @out_dir will be an empty string.
+ * If the path was already at the root directory, @s will be an empty string.
  *
  * Hidden non-leaf function cost:
- * - Can call strlcpy if (@out_dir != @in_dir)
- * - Calls strlen if (@out_dir == @in_dir)
+ * - Can call strlcpy if (@s!= @in_dir)
+ * - Calls strlen if (@s == @in_dir)
  * - Calls path_parent_dir()
  *
  * @return Length of the string copied into @s
@@ -442,7 +442,7 @@ size_t fill_pathname_parent_dir(char *s,
  * @s                  : output path
  * @in_refpath         : input reference path
  * @in_path            : input path
- * @size               : size of @s
+ * @len                : size of @s
  *
  * Joins basedir of @in_refpath together with @in_path.
  * If @in_path is an absolute path, s = in_path.
@@ -457,7 +457,7 @@ void fill_pathname_resolve_relative(char *s, const char *in_refpath,
  * @s                  : output path
  * @dir                : directory
  * @path               : path
- * @size               : size of output path
+ * @len                : size of output path
  *
  * Joins a directory (@dir) and path (@path) together.
  * Makes sure not to get two consecutive slashes
@@ -480,7 +480,7 @@ size_t fill_pathname_join(char *s, const char *dir,
  * @s                  : output path
  * @dir                : directory. Cannot be identical to @s
  * @path               : path
- * @size               : size of output path
+ * @len                : size of output path
  *
  *
  * Specialized version of fill_pathname_join.
@@ -510,7 +510,7 @@ size_t fill_pathname_join_special_ext(char *s,
  * @dir                : directory
  * @path               : path
  * @delim              : delimiter
- * @size               : size of output path
+ * @len                : size of output path
  *
  * Joins a directory (@dir) and path (@path) together
  * using the given delimiter (@delim).
@@ -548,7 +548,7 @@ size_t fill_pathname_abbreviated_or_relative(char *s,
  * sanitize_path_part:
  *
  * @path_part          : directory or filename
- * @size               : length of path_part
+ * @len                : length of path_part
  *
  * Takes single part of a path eg. single filename
  * or directory, and removes any special chars that are
@@ -621,8 +621,8 @@ void path_basedir_wrapper(char *s);
 
 /**
  * fill_pathname_slash:
- * @path               : path
- * @size               : size of path
+ * @s                  : path
+ * @len                : size of path
  *
  * Assumes path is a directory. Appends a slash
  * if not already there.

include/libretro.h

@@ -2575,6 +2575,18 @@ enum retro_mod
  */
 #define RETRO_ENVIRONMENT_GET_FILE_BROWSER_START_DIRECTORY 80
 
+/**
+ * Returns the audio sample rate the frontend is targeting, in Hz.
+ * The intended use case is for the core to use the result to select an ideal sample rate.
+ *
+ * @param[out] data <tt>unsigned *</tt>.
+ * Pointer to the \c unsigned integer in which the frontend will store its target sample rate.
+ * Behavior is undefined if \c data is <tt>NULL</tt>.
+ * @return \c true if this environment call is available,
+ * regardless of the value returned in \c data.
+*/
+#define RETRO_ENVIRONMENT_GET_TARGET_SAMPLE_RATE (81 | RETRO_ENVIRONMENT_EXPERIMENTAL)
+
 /**@}*/
 
 /**

include/streams/file_stream_transforms.h

@@ -96,7 +96,7 @@ int64_t rfread(void* buffer,
    size_t elem_size, size_t elem_count, RFILE* stream);
 
 /** @see https://en.cppreference.com/w/c/io/fgets */
-char *rfgets(char *buffer, int maxCount, RFILE* stream);
+char *rfgets(char *s, int maxCount, RFILE* stream);
 
 /** @see https://en.cppreference.com/w/c/io/fgetc */
 int rfgetc(RFILE* stream);

include/streams/interface_stream.h

@@ -121,6 +121,8 @@ intfstream_t *intfstream_open_file(const char *path,
 intfstream_t *intfstream_open_memory(void *data,
       unsigned mode, unsigned hints, uint64_t size);
 
+/* Deprecated.  Has the same effect as `intfstream_open_memory` with
+   a mode including `RETRO_VFS_FILE_ACCESS_WRITE`. */
 intfstream_t *intfstream_open_writable_memory(void *data,
       unsigned mode, unsigned hints, uint64_t size);