mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2026-04-06 07:15:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

cursor: drop XcursorTrue and XcursorFalse

Browse source 
Just use <stdbool.h> instead.

Signed-off-by: Simon Ser <contact@emersion.fr>
This commit is contained in:
Simon Ser 2022-04-17 17:01:18 +02:00
parent 4ea5ad1d11
commit 7658cff241
1 changed files with 13 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

33
cursor/xcursor.c
View file

@ -31,13 +31,6 @@
#include <string.h> #include <string.h>
#include <dirent.h> #include <dirent.h>
/*
* From libXcursor/include/X11/extensions/Xcursor.h
*/
#define XcursorTrue 1
#define XcursorFalse 0
/* /*
* Cursor files start with a header. The header * Cursor files start with a header. The header
* contains a magic number, a version number and a * contains a magic number, a version number and a
@ -283,16 +276,16 @@ _XcursorReadUInt (XcursorFile *file, uint32_t *u)
unsigned char bytes[4]; unsigned char bytes[4];
if (!file || !u) if (!file || !u)
return XcursorFalse; return false;
if ((*file->read) (file, bytes, 4) != 4) if ((*file->read) (file, bytes, 4) != 4)
return XcursorFalse; return false;
*u = ((uint32_t)(bytes[0]) << 0) | *u = ((uint32_t)(bytes[0]) << 0) |
((uint32_t)(bytes[1]) << 8) | ((uint32_t)(bytes[1]) << 8) |
((uint32_t)(bytes[2]) << 16) | ((uint32_t)(bytes[2]) << 16) |
((uint32_t)(bytes[3]) << 24); ((uint32_t)(bytes[3]) << 24);
return XcursorTrue; return true;
} }
static void static void
@ -375,8 +368,8 @@ _XcursorSeekToToc (XcursorFile *file,
{ {
if (!file || !fileHeader || \ if (!file || !fileHeader || \
(*file->seek) (file, fileHeader->tocs[toc].position, SEEK_SET) == EOF) (*file->seek) (file, fileHeader->tocs[toc].position, SEEK_SET) == EOF)
return XcursorFalse; return false;
return XcursorTrue; return true;
} }
static bool static bool
@ -386,22 +379,22 @@ _XcursorFileReadChunkHeader (XcursorFile *file,
XcursorChunkHeader *chunkHeader) XcursorChunkHeader *chunkHeader)
{ {
if (!file || !fileHeader || !chunkHeader) if (!file || !fileHeader || !chunkHeader)
return XcursorFalse; return false;
if (!_XcursorSeekToToc (file, fileHeader, toc)) if (!_XcursorSeekToToc (file, fileHeader, toc))
return XcursorFalse; return false;
if (!_XcursorReadUInt (file, &chunkHeader->header)) if (!_XcursorReadUInt (file, &chunkHeader->header))
return XcursorFalse; return false;
if (!_XcursorReadUInt (file, &chunkHeader->type)) if (!_XcursorReadUInt (file, &chunkHeader->type))
return XcursorFalse; return false;
if (!_XcursorReadUInt (file, &chunkHeader->subtype)) if (!_XcursorReadUInt (file, &chunkHeader->subtype))
return XcursorFalse; return false;
if (!_XcursorReadUInt (file, &chunkHeader->version)) if (!_XcursorReadUInt (file, &chunkHeader->version))
return XcursorFalse; return false;
/* sanity check */ /* sanity check */
if (chunkHeader->type != fileHeader->tocs[toc].type || if (chunkHeader->type != fileHeader->tocs[toc].type ||
chunkHeader->subtype != fileHeader->tocs[toc].subtype) chunkHeader->subtype != fileHeader->tocs[toc].subtype)
return XcursorFalse; return false;
return XcursorTrue; return true;
} }
#define dist(a,b) ((a) > (b) ? (a) - (b) : (b) - (a)) #define dist(a,b) ((a) > (b) ? (a) - (b) : (b) - (a))