ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some style nits.

This commit is contained in:
Themaister 2013-12-24 23:02:45 +01:00
parent b71b8f0be4
commit c52f328a4e
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
file_path.c
View File

@ -758,7 +758,7 @@ void fill_pathname_expand_special(char *out_path, const char *in_path, size_t si
in_path++; in_path++;
} }
} }
else if ((*in_path == ':') && else if ((in_path[0] == ':') &&
#ifdef _WIN32 #ifdef _WIN32
((in_path[1] == '/') || (in_path[1] == '\\'))) ((in_path[1] == '/') || (in_path[1] == '\\')))
#else #else
@ -784,19 +784,19 @@ void fill_pathname_expand_special(char *out_path, const char *in_path, size_t si
void fill_pathname_abbreviate_special(char *out_path, const char *in_path, size_t size) void fill_pathname_abbreviate_special(char *out_path, const char *in_path, size_t size)
{ {
#if !defined(RARCH_CONSOLE) #if !defined(RARCH_CONSOLE)
int i; unsigned i;
const char* home = getenv("HOME"); const char *home = getenv("HOME");
char application_dir[PATH_MAX]; char application_dir[PATH_MAX];
fill_pathname_application_path(application_dir, sizeof(application_dir)); fill_pathname_application_path(application_dir, sizeof(application_dir));
path_basedir(application_dir); path_basedir(application_dir);
// Keep application dir in front of home, moving app dir to a new location inside // Keep application dir in front of home, moving app dir to a new location inside
// home would break otherwise. // home would break otherwise.
const char *candidates[3] = { application_dir, home, 0 }; const char *candidates[3] = { application_dir, home, NULL };
const char *notations[3] = { ":", "~", 0 }; const char *notations[3] = { ":", "~", NULL };
for (i = 0; candidates[i]; i ++) for (i = 0; candidates[i]; i++)
{ {
if (strstr(in_path, candidates[i]) == in_path) if (strstr(in_path, candidates[i]) == in_path)
{ {
@ -810,8 +810,8 @@ void fill_pathname_abbreviate_special(char *out_path, const char *in_path, size_
if (!path_char_is_slash(*in_path)) if (!path_char_is_slash(*in_path))
{ {
rarch_assert(strlcpy(out_path, path_default_slash(), size) < size); rarch_assert(strlcpy(out_path, path_default_slash(), size) < size);
out_path ++; out_path++;
size --; size--;
} }
} }
} }
@ -841,11 +841,9 @@ void fill_pathname_application_path(char *buf, size_t size)
CFRelease(bundle_url); CFRelease(bundle_url);
rarch_assert(strlcat(buf, "nobin", size) < size); rarch_assert(strlcat(buf, "nobin", size) < size);
return; return;
} }
#else #else
*buf = '\0'; *buf = '\0';
pid_t pid = getpid(); pid_t pid = getpid();
char link_path[PATH_MAX]; char link_path[PATH_MAX];