mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-10-29 05:40:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
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 * static char *
xcursor_library_path(void) xcursor_library_path(void)
{ {
const char *env_var; const char *env_var, *suffix;
char *path = NULL; char *path;
int pathlen = 0; size_t path_size;
env_var = getenv("XCURSOR_PATH"); env_var = getenv("XCURSOR_PATH");
if (env_var) { if (env_var)
path = strdup(env_var); return strdup(env_var);
} else {
env_var = getenv("XDG_DATA_HOME"); env_var = getenv("XDG_DATA_HOME");
if (env_var) { if (!env_var)
pathlen = strlen(env_var) + strlen(CURSORDIR ":" XCURSORPATH) + 1; env_var = XDG_DATA_HOME_FALLBACK;
path = malloc(pathlen);
snprintf(path, pathlen, "%s%s", env_var, suffix = CURSORDIR ":" XCURSORPATH;
CURSORDIR ":" XCURSORPATH); path_size = strlen(env_var) + strlen(suffix) + 1;
} else { path = malloc(path_size);
path = strdup(XDG_DATA_HOME_FALLBACK CURSORDIR ":" XCURSORPATH); if (!path)
} return NULL;
} snprintf(path, path_size, "%s%s", env_var, suffix);
return path; return path;
} }