AcoSail/wayland
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

cursor: simplify xcursor_library_path

Browse Source 
- Use early returns
- De-duplicate XDG_DATA_HOME code-paths
- Don't crash on allocation failure
- Use size_t when appropriate
- Fix indentation

Signed-off-by: Simon Ser <contact@emersion.fr>
This commit is contained in:
Simon Ser 2022-05-27 17:14:24 +02:00
parent f33356742e
commit 7a399383fc
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
cursor/xcursor.c
View File

@ -539,24 +539,24 @@ xcursor_xc_file_load_images(FILE *file, int size)
static char *
xcursor_library_path(void)
{
const char *env_var;
char *path = NULL;
int pathlen = 0;
const char *env_var, *suffix;
char *path;
size_t path_size;
env_var = getenv("XCURSOR_PATH");
if (env_var) {
path = strdup(env_var);
} else {
env_var = getenv("XDG_DATA_HOME");
if (env_var) {
pathlen = strlen(env_var) + strlen(CURSORDIR ":" XCURSORPATH) + 1;
path = malloc(pathlen);
snprintf(path, pathlen, "%s%s", env_var,
CURSORDIR ":" XCURSORPATH);
} else {
path = strdup(XDG_DATA_HOME_FALLBACK CURSORDIR ":" XCURSORPATH);
}
}
if (env_var)
return strdup(env_var);
env_var = getenv("XDG_DATA_HOME");
if (!env_var)
env_var = XDG_DATA_HOME_FALLBACK;
suffix = CURSORDIR ":" XCURSORPATH;
path_size = strlen(env_var) + strlen(suffix) + 1;
path = malloc(path_size);
if (!path)
return NULL;
snprintf(path, path_size, "%s%s", env_var, suffix);
return path;
}