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

cursor: fix variable declaration style

Browse source 
Use a single space between type and variable name.

Signed-off-by: Simon Ser <contact@emersion.fr>
This commit is contained in:
Simon Ser 2022-04-17 17:28:44 +02:00
parent b0a4e63351
commit 92e758834c
1 changed files with 46 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

92
cursor/xcursor.c
View file

@ -183,7 +183,7 @@ typedef struct _XcursorComments {
static XcursorImage * static XcursorImage *
XcursorImageCreate(int width, int height) XcursorImageCreate(int width, int height)
{ {
XcursorImage *image; XcursorImage *image;
if (width < 0 || height < 0) if (width < 0 || height < 0)
return NULL; return NULL;
@ -212,7 +212,7 @@ XcursorImageDestroy(XcursorImage *image)
static XcursorImages * static XcursorImages *
XcursorImagesCreate(int size) XcursorImagesCreate(int size)
{ {
XcursorImages *images; XcursorImages *images;
images = malloc(sizeof(XcursorImages) + images = malloc(sizeof(XcursorImages) +
size * sizeof(XcursorImage *)); size * sizeof(XcursorImage *));
@ -227,7 +227,7 @@ XcursorImagesCreate(int size)
void void
XcursorImagesDestroy(XcursorImages *images) XcursorImagesDestroy(XcursorImages *images)
{ {
int n; int n;
if (!images) if (!images)
return; return;
@ -242,7 +242,7 @@ XcursorImagesDestroy(XcursorImages *images)
static void static void
XcursorImagesSetName(XcursorImages *images, const char *name) XcursorImagesSetName(XcursorImages *images, const char *name)
{ {
char *new; char *new;
if (!images || !name) if (!images || !name)
return; return;
@ -261,7 +261,7 @@ XcursorImagesSetName(XcursorImages *images, const char *name)
static bool static bool
_XcursorReadUInt(XcursorFile *file, uint32_t *u) _XcursorReadUInt(XcursorFile *file, uint32_t *u)
{ {
unsigned char bytes[4]; unsigned char bytes[4];
if (!file || !u) if (!file || !u)
return false; return false;
@ -285,7 +285,7 @@ _XcursorFileHeaderDestroy(XcursorFileHeader *fileHeader)
static XcursorFileHeader * static XcursorFileHeader *
_XcursorFileHeaderCreate(uint32_t ntoc) _XcursorFileHeaderCreate(uint32_t ntoc)
{ {
XcursorFileHeader *fileHeader; XcursorFileHeader *fileHeader;
if (ntoc > 0x10000) if (ntoc > 0x10000)
return NULL; return NULL;
@ -304,9 +304,9 @@ _XcursorFileHeaderCreate(uint32_t ntoc)
static XcursorFileHeader * static XcursorFileHeader *
_XcursorReadFileHeader(XcursorFile *file) _XcursorReadFileHeader(XcursorFile *file)
{ {
XcursorFileHeader head, *fileHeader; XcursorFileHeader head, *fileHeader;
uint32_t skip; uint32_t skip;
unsigned int n; unsigned int n;
if (!file) if (!file)
return NULL; return NULL;
@ -393,9 +393,9 @@ _XcursorFindBestSize(XcursorFileHeader *fileHeader,
int *nsizesp) int *nsizesp)
{ {
unsigned int n; unsigned int n;
int nsizes = 0; int nsizes = 0;
uint32_t bestSize = 0; uint32_t bestSize = 0;
uint32_t thisSize; uint32_t thisSize;
if (!fileHeader || !nsizesp) if (!fileHeader || !nsizesp)
return 0; return 0;
@ -422,8 +422,8 @@ _XcursorFindImageToc(XcursorFileHeader *fileHeader,
uint32_t size, uint32_t size,
int count) int count)
{ {
unsigned int toc; unsigned int toc;
uint32_t thisSize; uint32_t thisSize;
if (!fileHeader) if (!fileHeader)
return 0; return 0;
@ -449,11 +449,11 @@ _XcursorReadImage(XcursorFile *file,
XcursorFileHeader *fileHeader, XcursorFileHeader *fileHeader,
int toc) int toc)
{ {
XcursorChunkHeader chunkHeader; XcursorChunkHeader chunkHeader;
XcursorImage head; XcursorImage head;
XcursorImage *image; XcursorImage *image;
int n; int n;
uint32_t *p; uint32_t *p;
if (!file || !fileHeader) if (!file || !fileHeader)
return NULL; return NULL;
@ -506,12 +506,12 @@ _XcursorReadImage(XcursorFile *file,
static XcursorImages * static XcursorImages *
XcursorXcFileLoadImages(XcursorFile *file, int size) XcursorXcFileLoadImages(XcursorFile *file, int size)
{ {
XcursorFileHeader *fileHeader; XcursorFileHeader *fileHeader;
uint32_t bestSize; uint32_t bestSize;
int nsize; int nsize;
XcursorImages *images; XcursorImages *images;
int n; int n;
int toc; int toc;
if (!file || size < 0) if (!file || size < 0)
return NULL; return NULL;
@ -553,21 +553,21 @@ XcursorXcFileLoadImages(XcursorFile *file, int size)
static int static int
_XcursorStdioFileRead(XcursorFile *file, unsigned char *buf, int len) _XcursorStdioFileRead(XcursorFile *file, unsigned char *buf, int len)
{ {
FILE *f = file->closure; FILE *f = file->closure;
return fread(buf, 1, len, f); return fread(buf, 1, len, f);
} }
static int static int
_XcursorStdioFileWrite(XcursorFile *file, unsigned char *buf, int len) _XcursorStdioFileWrite(XcursorFile *file, unsigned char *buf, int len)
{ {
FILE *f = file->closure; FILE *f = file->closure;
return fwrite(buf, 1, len, f); return fwrite(buf, 1, len, f);
} }
static int static int
_XcursorStdioFileSeek(XcursorFile *file, long offset, int whence) _XcursorStdioFileSeek(XcursorFile *file, long offset, int whence)
{ {
FILE *f = file->closure; FILE *f = file->closure;
return fseek(f, offset, whence); return fseek(f, offset, whence);
} }
@ -583,7 +583,7 @@ _XcursorStdioFileInitialize(FILE *stdfile, XcursorFile *file)
static XcursorImages * static XcursorImages *
XcursorFileLoadImages(FILE *file, int size) XcursorFileLoadImages(FILE *file, int size)
{ {
XcursorFile f; XcursorFile f;
if (!file) if (!file)
return NULL; return NULL;
@ -619,9 +619,9 @@ XcursorFileLoadImages(FILE *file, int size)
static char * static char *
XcursorLibraryPath(void) XcursorLibraryPath(void)
{ {
const char *env_var; const char *env_var;
char *path = NULL; char *path = NULL;
int pathlen = 0; int pathlen = 0;
env_var = getenv("XCURSOR_PATH"); env_var = getenv("XCURSOR_PATH");
if (env_var) if (env_var)
@ -648,7 +648,7 @@ XcursorLibraryPath(void)
static void static void
_XcursorAddPathElt(char *path, const char *elt, int len) _XcursorAddPathElt(char *path, const char *elt, int len)
{ {
int pathlen = strlen(path); int pathlen = strlen(path);
/* append / if the path doesn't currently have one */ /* append / if the path doesn't currently have one */
if (path[0] == '\0' || path[pathlen - 1] != '/') if (path[0] == '\0' || path[pathlen - 1] != '/')
@ -671,14 +671,14 @@ _XcursorAddPathElt(char *path, const char *elt, int len)
static char * static char *
_XcursorBuildThemeDir(const char *dir, const char *theme) _XcursorBuildThemeDir(const char *dir, const char *theme)
{ {
const char *colon; const char *colon;
const char *tcolon; const char *tcolon;
char *full; char *full;
char *home; char *home;
int dirlen; int dirlen;
int homelen; int homelen;
int themelen; int themelen;
int len; int len;
if (!dir || !theme) if (!dir || !theme)
return NULL; return NULL;
@ -728,7 +728,7 @@ _XcursorBuildThemeDir(const char *dir, const char *theme)
static char * static char *
_XcursorBuildFullname(const char *dir, const char *subdir, const char *file) _XcursorBuildFullname(const char *dir, const char *subdir, const char *file)
{ {
char *full; char *full;
if (!dir || !subdir || !file) if (!dir || !subdir || !file)
return NULL; return NULL;
@ -746,7 +746,7 @@ _XcursorBuildFullname(const char *dir, const char *subdir, const char *file)
static const char * static const char *
_XcursorNextPath(const char *path) _XcursorNextPath(const char *path)
{ {
char *colon = strchr(path, ':'); char *colon = strchr(path, ':');
if (!colon) if (!colon)
return NULL; return NULL;
@ -759,9 +759,9 @@ _XcursorNextPath(const char *path)
static char * static char *
_XcursorThemeInherits(const char *full) _XcursorThemeInherits(const char *full)
{ {
char line[8192]; char line[8192];
char *result = NULL; char *result = NULL;
FILE *f; FILE *f;
if (!full) if (!full)
return NULL; return NULL;