diff options
author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-03-10 13:53:29 +0000 |
---|---|---|
committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-03-10 13:53:29 +0000 |
commit | d21da6df5098e18cc8bb436acc89d2262a157fb7 (patch) | |
tree | bbeb36a0273c2a6641533a8c1b53316ad2e0441c /lib/libXcursor/src/library.c | |
parent | e269829efe9831e4d828da7862b1c5312c7a0a2e (diff) |
upate to libXcursor 1.1.13
Diffstat (limited to 'lib/libXcursor/src/library.c')
-rw-r--r-- | lib/libXcursor/src/library.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/libXcursor/src/library.c b/lib/libXcursor/src/library.c index 86f2d7668..48b75bffd 100644 --- a/lib/libXcursor/src/library.c +++ b/lib/libXcursor/src/library.c @@ -50,7 +50,7 @@ static void _XcursorAddPathElt (char *path, const char *elt, int len) { int pathlen = strlen (path); - + /* append / if the path doesn't currently have one */ if (path[0] == '\0' || path[pathlen - 1] != '/') { @@ -83,11 +83,11 @@ _XcursorBuildThemeDir (const char *dir, const char *theme) if (!dir || !theme) return NULL; - + colon = strchr (dir, ':'); if (!colon) colon = dir + strlen (dir); - + dirlen = colon - dir; tcolon = strchr (theme, ':'); @@ -95,7 +95,7 @@ _XcursorBuildThemeDir (const char *dir, const char *theme) tcolon = theme + strlen (theme); themelen = tcolon - theme; - + home = NULL; homelen = 0; if (*dir == '~') @@ -113,7 +113,7 @@ _XcursorBuildThemeDir (const char *dir, const char *theme) * and one for the trailing null */ len = 1 + homelen + 1 + dirlen + 1 + themelen + 1; - + full = malloc (len); if (!full) return NULL; @@ -184,14 +184,14 @@ _XcursorThemeInherits (const char *full) if (result) { r = result; - while (*l) + while (*l) { while (XcursorSep(*l) || XcursorWhite (*l)) l++; if (!*l) break; if (r != result) *r++ = ':'; - while (*l && !XcursorWhite(*l) && + while (*l && !XcursorWhite(*l) && !XcursorSep(*l)) *r++ = *l++; } @@ -324,7 +324,7 @@ XcursorLibraryLoadCursor (Display *dpy, const char *file) if (!file) return 0; - + if (!images) { int id = XcursorLibraryShape (file); @@ -349,10 +349,10 @@ XcursorLibraryLoadCursors (Display *dpy, const char *file) char *theme = XcursorGetTheme (dpy); XcursorImages *images = XcursorLibraryLoadImages (file, theme, size); XcursorCursors *cursors; - + if (!file) return NULL; - + if (!images) { int id = XcursorLibraryShape (file); |