summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas E. Dickey <dickey@invisible-island.net>2021-05-06 20:10:41 -0400
committerThomas E. Dickey <dickey@invisible-island.net>2021-05-06 20:12:37 -0400
commit801925839d26e7c8d942c5e02c4897652ead26c8 (patch)
tree620b12cc8f7e31f8687407854983e9857e1ca983
parentf807ac9c786714ef4e86ad7edfa60f92baf0b4a6 (diff)
more cppcheck-style fixes
Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net>
-rw-r--r--src/cursor.c2
-rw-r--r--src/library.c24
2 files changed, 12 insertions, 14 deletions
diff --git a/src/cursor.c b/src/cursor.c
index 9f0442c..8dd61a0 100644
--- a/src/cursor.c
+++ b/src/cursor.c
@@ -91,6 +91,7 @@ XcursorAnimateNext (XcursorAnimate *animate)
return cursor;
}
+#if RENDER_MAJOR > 0 || RENDER_MINOR >= 5
static int
nativeByteOrder (void)
{
@@ -98,6 +99,7 @@ nativeByteOrder (void)
return (*((char *) &x) == 1) ? LSBFirst : MSBFirst;
}
+#endif
static XcursorUInt
_XcursorPixelBrightness (XcursorPixel p)
diff --git a/src/library.c b/src/library.c
index c43d190..c8fa2c5 100644
--- a/src/library.c
+++ b/src/library.c
@@ -87,7 +87,7 @@ _XcursorBuildThemeDir (const char *dir, const char *theme)
int len;
if (!dir || !theme)
- return NULL;
+ return NULL;
colon = strchr (dir, ':');
if (!colon)
@@ -137,7 +137,7 @@ _XcursorBuildFullname (const char *dir, const char *subdir, const char *file)
char *full;
if (!dir || !subdir || !file)
- return NULL;
+ return NULL;
full = malloc (strlen (dir) + 1 + strlen (subdir) + 1 + strlen (file) + 1);
if (!full)
@@ -170,7 +170,7 @@ _XcursorThemeInherits (const char *full)
FILE *f;
if (!full)
- return NULL;
+ return NULL;
f = fopen (full, "r");
if (f)
@@ -223,7 +223,7 @@ XcursorScanTheme (const char *theme, const char *name)
int d;
if (!theme || !name)
- return NULL;
+ return NULL;
/*
* XCURSOR_CORE_THEME is a magic name; cursors from the core set
@@ -309,15 +309,13 @@ XcursorLibraryLoadImage (const char *file, const char *theme, int size)
XcursorImage *image = NULL;
if (!file)
- return NULL;
+ return NULL;
if (theme)
f = XcursorScanTheme (theme, file);
if (!f)
f = XcursorScanTheme ("default", file);
- if (f == XCURSOR_SCAN_CORE)
- return NULL;
- if (f)
+ if (f != NULL && f != XCURSOR_SCAN_CORE)
{
image = XcursorFileLoadImage (f, size);
fclose (f);
@@ -332,15 +330,13 @@ XcursorLibraryLoadImages (const char *file, const char *theme, int size)
XcursorImages *images = NULL;
if (!file)
- return NULL;
+ return NULL;
if (theme)
f = XcursorScanTheme (theme, file);
if (!f)
f = XcursorScanTheme ("default", file);
- if (f == XCURSOR_SCAN_CORE)
- return NULL;
- if (f)
+ if (f != NULL && f != XCURSOR_SCAN_CORE)
{
images = XcursorFileLoadImages (f, size);
if (images)
@@ -359,7 +355,7 @@ XcursorLibraryLoadCursor (Display *dpy, const char *file)
Cursor cursor;
if (!file)
- return 0;
+ return 0;
if (!images)
{
@@ -387,7 +383,7 @@ XcursorLibraryLoadCursors (Display *dpy, const char *file)
XcursorCursors *cursors;
if (!file)
- return NULL;
+ return NULL;
if (!images)
{