frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up warnings in DIX 

As usual, mostly const char changes. However, filter_device_events had
a potentially uninitialized value, 'raw', which I added a bunch of
checks for. I suspect most of those are 'can't happen', but it's hard
to see that inside the function.

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Keith Packard 2013-11-15 21:57:05 +09:00
parent d6da9f23cc
commit d89b42bda4
16 changed files with 64 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Xext/xvmc.c
View File

@ -800,8 +800,8 @@ XvMCFindXvImage(XvPortPtr pPort, CARD32 id)
} }
int int
xf86XvMCRegisterDRInfo(ScreenPtr pScreen, char *name, xf86XvMCRegisterDRInfo(ScreenPtr pScreen, const char *name,
char *busID, int major, int minor, int patchLevel) const char *busID, int major, int minor, int patchLevel)
{ {
XvMCScreenPtr pScreenPriv = XVMC_GET_PRIVATE(pScreen); XvMCScreenPtr pScreenPriv = XVMC_GET_PRIVATE(pScreen);

4
Xext/xvmcext.h
View File

@ -91,8 +91,8 @@ extern _X_EXPORT int XvMCScreenInit(ScreenPtr pScreen,
extern _X_EXPORT XvImagePtr XvMCFindXvImage(XvPortPtr pPort, CARD32 id); extern _X_EXPORT XvImagePtr XvMCFindXvImage(XvPortPtr pPort, CARD32 id);
extern _X_EXPORT int xf86XvMCRegisterDRInfo(ScreenPtr pScreen, char *name, extern _X_EXPORT int xf86XvMCRegisterDRInfo(ScreenPtr pScreen, const char *name,
char *busID, int major, int minor, const char *busID, int major, int minor,
int patchLevel); int patchLevel);
#endif /* _XVMC_H */ #endif /* _XVMC_H */

4
dix/dispatch.c
View File

@ -470,7 +470,7 @@ Dispatch(void)
} }
static int VendorRelease = VENDOR_RELEASE; static int VendorRelease = VENDOR_RELEASE;
static char *VendorString = VENDOR_NAME; static const char *VendorString = VENDOR_NAME;
void void
SetVendorRelease(int release) SetVendorRelease(int release)
@ -479,7 +479,7 @@ SetVendorRelease(int release)
} }
void void
SetVendorString(char *string) SetVendorString(const char *string)
{ {
VendorString = string; VendorString = string;
} }

31
dix/dixfonts.c
View File

@ -128,7 +128,7 @@ dixGetGlyphs(FontPtr font, unsigned long count, unsigned char *chars,
* adding RT_FONT prevents conflict with default cursor font * adding RT_FONT prevents conflict with default cursor font
*/ */
Bool Bool
SetDefaultFont(char *defaultfontname) SetDefaultFont(const char *defaultfontname)
{ {
int err; int err;
FontPtr pf; FontPtr pf;
@ -224,7 +224,7 @@ FreeFPE(FontPathElementPtr fpe)
fpe->refcount--; fpe->refcount--;
if (fpe->refcount == 0) { if (fpe->refcount == 0) {
(*fpe_functions[fpe->type].free_fpe) (fpe); (*fpe_functions[fpe->type].free_fpe) (fpe);
free(fpe->name); free((void *) fpe->name);
free(fpe); free(fpe);
} }
} }
@ -288,7 +288,7 @@ doOpenFont(ClientPtr client, OFclosurePtr c)
if (err == FontNameAlias && alias) { if (err == FontNameAlias && alias) {
newlen = strlen(alias); newlen = strlen(alias);
newname = (char *) realloc(c->fontname, newlen); newname = (char *) realloc((char *) c->fontname, newlen);
if (!newname) { if (!newname) {
err = AllocError; err = AllocError;
break; break;
@ -368,14 +368,14 @@ doOpenFont(ClientPtr client, OFclosurePtr c)
FreeFPE(c->fpe_list[i]); FreeFPE(c->fpe_list[i]);
} }
free(c->fpe_list); free(c->fpe_list);
free(c->fontname); free((void *) c->fontname);
free(c); free(c);
return TRUE; return TRUE;
} }
int int
OpenFont(ClientPtr client, XID fid, Mask flags, unsigned lenfname, OpenFont(ClientPtr client, XID fid, Mask flags, unsigned lenfname,
char *pfontname) const char *pfontname)
{ {
OFclosurePtr c; OFclosurePtr c;
int i; int i;
@ -426,7 +426,7 @@ OpenFont(ClientPtr client, XID fid, Mask flags, unsigned lenfname,
*/ */
c->fpe_list = malloc(sizeof(FontPathElementPtr) * num_fpes); c->fpe_list = malloc(sizeof(FontPathElementPtr) * num_fpes);
if (!c->fpe_list) { if (!c->fpe_list) {
free(c->fontname); free((void *) c->fontname);
free(c); free(c);
return BadAlloc; return BadAlloc;
} }
@ -1537,7 +1537,7 @@ ImageText(ClientPtr client, DrawablePtr pDraw, GC * pGC, int nChars,
/* does the necessary magic to figure out the fpe type */ /* does the necessary magic to figure out the fpe type */
static int static int
DetermineFPEType(char *pathname) DetermineFPEType(const char *pathname)
{ {
int i; int i;
@ -1633,21 +1633,23 @@ SetFontPathElements(int npaths, unsigned char *paths, int *bad, Bool persist)
} }
/* if error or can't do it, act like it's a new one */ /* if error or can't do it, act like it's a new one */
if (!fpe) { if (!fpe) {
char *name;
fpe = malloc(sizeof(FontPathElementRec)); fpe = malloc(sizeof(FontPathElementRec));
if (!fpe) { if (!fpe) {
err = BadAlloc; err = BadAlloc;
goto bail; goto bail;
} }
fpe->name = malloc(len + 1); name = malloc(len + 1);
if (!fpe->name) { if (!name) {
free(fpe); free(fpe);
err = BadAlloc; err = BadAlloc;
goto bail; goto bail;
} }
fpe->refcount = 1; fpe->refcount = 1;
strncpy(fpe->name, (char *) cp, (int) len); strncpy(name, (char *) cp, (int) len);
fpe->name[len] = '\0'; name[len] = '\0';
fpe->name = name;
fpe->name_length = len; fpe->name_length = len;
fpe->type = DetermineFPEType(fpe->name); fpe->type = DetermineFPEType(fpe->name);
if (fpe->type == -1) if (fpe->type == -1)
@ -1660,7 +1662,7 @@ SetFontPathElements(int npaths, unsigned char *paths, int *bad, Bool persist)
("[dix] Could not init font path element %s, removing from list!\n", ("[dix] Could not init font path element %s, removing from list!\n",
fpe->name); fpe->name);
} }
free(fpe->name); free((void *) fpe->name);
free(fpe); free(fpe);
} }
} }
@ -1712,9 +1714,10 @@ SetFontPath(ClientPtr client, int npaths, unsigned char *paths)
} }
int int
SetDefaultFontPath(char *path) SetDefaultFontPath(const char *path)
{ {
char *temp_path, *start, *end; const char *start, *end;
char *temp_path;
unsigned char *cp, *pp, *nump, *newpath; unsigned char *cp, *pp, *nump, *newpath;
int num = 1, len, err, size = 0, bad; int num = 1, len, err, size = 0, bad;

5
dix/events.c
View File

@ -2671,6 +2671,9 @@ DeliverOneEvent(InternalEvent *event, DeviceIntPtr dev, enum InputLevel level,
case CORE: case CORE:
rc = EventToCore(event, &xE, &count); rc = EventToCore(event, &xE, &count);
break; break;
default:
rc = BadImplementation;
break;
} }
if (rc == Success) { if (rc == Success) {
@ -3828,6 +3831,8 @@ MatchForType(const GrabPtr grab, GrabPtr tmp, enum InputLevel level,
match = CORE_MATCH; match = CORE_MATCH;
ignore_device = TRUE; ignore_device = TRUE;
break; break;
default:
return NO_MATCH;
} }
tmp->grabtype = grabtype; tmp->grabtype = grabtype;

12
dix/extension.c
View File

@ -96,7 +96,7 @@ AddExtension(const char *name, int NumEvents, int NumErrors,
} }
ext->name = strdup(name); ext->name = strdup(name);
ext->num_aliases = 0; ext->num_aliases = 0;
ext->aliases = (char **) NULL; ext->aliases = (const char **) NULL;
if (!ext->name) { if (!ext->name) {
dixFreePrivates(ext->devPrivates, PRIVATE_EXTENSION); dixFreePrivates(ext->devPrivates, PRIVATE_EXTENSION);
free(ext); free(ext);
@ -106,7 +106,7 @@ AddExtension(const char *name, int NumEvents, int NumErrors,
newexts = (ExtensionEntry **) realloc(extensions, newexts = (ExtensionEntry **) realloc(extensions,
(i + 1) * sizeof(ExtensionEntry *)); (i + 1) * sizeof(ExtensionEntry *));
if (!newexts) { if (!newexts) {
free(ext->name); free((void *) ext->name);
dixFreePrivates(ext->devPrivates, PRIVATE_EXTENSION); dixFreePrivates(ext->devPrivates, PRIVATE_EXTENSION);
free(ext); free(ext);
return ((ExtensionEntry *) NULL); return ((ExtensionEntry *) NULL);
@ -147,11 +147,11 @@ Bool
AddExtensionAlias(const char *alias, ExtensionEntry * ext) AddExtensionAlias(const char *alias, ExtensionEntry * ext)
{ {
char *name; char *name;
char **aliases; const char **aliases;
if (!ext) if (!ext)
return FALSE; return FALSE;
aliases = (char **) realloc(ext->aliases, aliases = realloc(ext->aliases,
(ext->num_aliases + 1) * sizeof(char *)); (ext->num_aliases + 1) * sizeof(char *));
if (!aliases) if (!aliases)
return FALSE; return FALSE;
@ -229,9 +229,9 @@ CloseDownExtensions(void)
if (extensions[i]->CloseDown) if (extensions[i]->CloseDown)
extensions[i]->CloseDown(extensions[i]); extensions[i]->CloseDown(extensions[i]);
NumExtensions = i; NumExtensions = i;
free(extensions[i]->name); free((void *) extensions[i]->name);
for (j = extensions[i]->num_aliases; --j >= 0;) for (j = extensions[i]->num_aliases; --j >= 0;)
free(extensions[i]->aliases[j]); free((void *) extensions[i]->aliases[j]);
free(extensions[i]->aliases); free(extensions[i]->aliases);
dixFreePrivates(extensions[i]->devPrivates, PRIVATE_EXTENSION); dixFreePrivates(extensions[i]->devPrivates, PRIVATE_EXTENSION);
free(extensions[i]); free(extensions[i]);

9
dix/getevents.c
View File

@ -1382,10 +1382,10 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
{ {
int num_events = 1; int num_events = 1;
DeviceEvent *event; DeviceEvent *event;
RawDeviceEvent *raw; RawDeviceEvent *raw = NULL;
double screenx = 0.0, screeny = 0.0; /* desktop coordinate system */ double screenx = 0.0, screeny = 0.0; /* desktop coordinate system */
double devx = 0.0, devy = 0.0; /* desktop-wide in device coords */ double devx = 0.0, devy = 0.0; /* desktop-wide in device coords */
int sx, sy; /* for POINTER_SCREEN */ int sx = 0, sy = 0; /* for POINTER_SCREEN */
ValuatorMask mask; ValuatorMask mask;
ScreenPtr scr; ScreenPtr scr;
int num_barrier_events = 0; int num_barrier_events = 0;
@ -1437,7 +1437,7 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
transformAbsolute(pDev, &mask); transformAbsolute(pDev, &mask);
clipAbsolute(pDev, &mask); clipAbsolute(pDev, &mask);
if ((flags & POINTER_NORAW) == 0) if ((flags & POINTER_NORAW) == 0 && raw)
set_raw_valuators(raw, &mask, raw->valuators.data); set_raw_valuators(raw, &mask, raw->valuators.data);
} }
else { else {
@ -1445,7 +1445,7 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
if (flags & POINTER_ACCELERATE) if (flags & POINTER_ACCELERATE)
accelPointer(pDev, &mask, ms); accelPointer(pDev, &mask, ms);
if ((flags & POINTER_NORAW) == 0) if ((flags & POINTER_NORAW) == 0 && raw)
set_raw_valuators(raw, &mask, raw->valuators.data); set_raw_valuators(raw, &mask, raw->valuators.data);
moveRelative(pDev, flags, &mask); moveRelative(pDev, flags, &mask);
@ -1512,6 +1512,7 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
event_set_root_coordinates(event, screenx - scr->x, screeny - scr->y); event_set_root_coordinates(event, screenx - scr->x, screeny - scr->y);
if (flags & POINTER_EMULATED) { if (flags & POINTER_EMULATED) {
if (raw)
raw->flags = XIPointerEmulated; raw->flags = XIPointerEmulated;
event->flags = XIPointerEmulated; event->flags = XIPointerEmulated;
} }

8
dix/globals.c
View File

@ -112,9 +112,9 @@ int defaultScreenSaverAllowExposures = DEFAULT_SCREEN_SAVER_EXPOSURES;
Bool screenSaverSuspended = FALSE; Bool screenSaverSuspended = FALSE;
#endif #endif
char *defaultFontPath = COMPILEDDEFAULTFONTPATH; const char *defaultFontPath = COMPILEDDEFAULTFONTPATH;
char *defaultTextFont = COMPILEDDEFAULTFONT; const char *defaultTextFont = COMPILEDDEFAULTFONT;
char *defaultCursorFont = COMPILEDCURSORFONT; const char *defaultCursorFont = COMPILEDCURSORFONT;
FontPtr defaultFont; /* not declared in dix.h to avoid including font.h in FontPtr defaultFont; /* not declared in dix.h to avoid including font.h in
every compilation of dix code */ every compilation of dix code */
CursorPtr rootCursor; CursorPtr rootCursor;
@ -126,7 +126,7 @@ TimeStamp currentTime;
int defaultColorVisualClass = -1; int defaultColorVisualClass = -1;
int monitorResolution = 0; int monitorResolution = 0;
char *display; const char *display;
int displayfd; int displayfd;
char *ConnectionInfo; char *ConnectionInfo;

6
dix/window.c
View File

@ -227,7 +227,7 @@ log_window_info(WindowPtr pWin, int depth)
win_name = get_window_name(pWin); win_name = get_window_name(pWin);
ErrorF("win 0x%.8x (%s), [%d, %d] to [%d, %d]", ErrorF("win 0x%.8x (%s), [%d, %d] to [%d, %d]",
pWin->drawable.id, (unsigned) pWin->drawable.id,
win_name ? win_name : "no name", win_name ? win_name : "no name",
pWin->drawable.x, pWin->drawable.y, pWin->drawable.x, pWin->drawable.y,
pWin->drawable.x + pWin->drawable.width, pWin->drawable.x + pWin->drawable.width,
@ -240,7 +240,7 @@ log_window_info(WindowPtr pWin, int depth)
ErrorF(" (%s compositing: pixmap %x)", ErrorF(" (%s compositing: pixmap %x)",
(pWin->redirectDraw == RedirectDrawAutomatic) ? (pWin->redirectDraw == RedirectDrawAutomatic) ?
"automatic" : "manual", "automatic" : "manual",
pScreen->GetWindowPixmap(pWin)->drawable.id); (unsigned) pScreen->GetWindowPixmap(pWin)->drawable.id);
#endif #endif
switch (pWin->visibility) { switch (pWin->visibility) {
@ -283,7 +283,7 @@ PrintWindowTree(void)
for (scrnum = 0; scrnum < screenInfo.numScreens; scrnum++) { for (scrnum = 0; scrnum < screenInfo.numScreens; scrnum++) {
pScreen = screenInfo.screens[scrnum]; pScreen = screenInfo.screens[scrnum];
ErrorF("[dix] Dumping windows for screen %d (pixmap %x):\n", scrnum, ErrorF("[dix] Dumping windows for screen %d (pixmap %x):\n", scrnum,
pScreen->GetScreenPixmap(pScreen)->drawable.id); (unsigned) pScreen->GetScreenPixmap(pScreen)->drawable.id);
pWin = pScreen->root; pWin = pScreen->root;
depth = 1; depth = 1;
while (pWin) { while (pWin) {

2
include/closestr.h
View File

@ -47,7 +47,7 @@ typedef struct _OFclosure {
Mask flags; Mask flags;
/* XXX -- get these from request buffer instead? */ /* XXX -- get these from request buffer instead? */
char *origFontName; const char *origFontName;
int origFontNameLen; int origFontNameLen;
XID fontid; XID fontid;
char *fontname; char *fontname;

5
include/dix.h
View File

@ -289,7 +289,10 @@ extern _X_EXPORT void
SetVendorRelease(int release); SetVendorRelease(int release);
extern _X_EXPORT void extern _X_EXPORT void
SetVendorString(char *string); SetVendorString(const char *string);
int
dix_main(int argc, char *argv[], char *envp[]);
/* events.c */ /* events.c */

6
include/dixfont.h
View File

@ -34,7 +34,7 @@ SOFTWARE.
typedef struct _DIXFontProp *DIXFontPropPtr; typedef struct _DIXFontProp *DIXFontPropPtr;
extern _X_EXPORT Bool SetDefaultFont(char * /*defaultfontname */ ); extern _X_EXPORT Bool SetDefaultFont(const char * /*defaultfontname */ );
extern _X_EXPORT void QueueFontWakeup(FontPathElementPtr /*fpe */ ); extern _X_EXPORT void QueueFontWakeup(FontPathElementPtr /*fpe */ );
@ -48,7 +48,7 @@ extern _X_EXPORT int OpenFont(ClientPtr /*client */ ,
XID /*fid */ , XID /*fid */ ,
Mask /*flags */ , Mask /*flags */ ,
unsigned /*lenfname */ , unsigned /*lenfname */ ,
char * /*pfontname */ ); const char * /*pfontname */ );
extern _X_EXPORT int CloseFont(pointer /*pfont */ , extern _X_EXPORT int CloseFont(pointer /*pfont */ ,
XID /*fid */ ); XID /*fid */ );
@ -99,7 +99,7 @@ extern _X_EXPORT int SetFontPath(ClientPtr /*client */ ,
int /*npaths */ , int /*npaths */ ,
unsigned char * /*paths */ ); unsigned char * /*paths */ );
extern _X_EXPORT int SetDefaultFontPath(char * /*path */ ); extern _X_EXPORT int SetDefaultFontPath(const char * /*path */ );
extern _X_EXPORT int GetFontPath(ClientPtr client, extern _X_EXPORT int GetFontPath(ClientPtr client,
int *count, int *count,

4
include/extnsionst.h
View File

@ -58,14 +58,14 @@ typedef struct _ExtensionEntry {
int index; int index;
void (*CloseDown) ( /* called at server shutdown */ void (*CloseDown) ( /* called at server shutdown */
struct _ExtensionEntry * /* extension */ ); struct _ExtensionEntry * /* extension */ );
char *name; /* extension name */ const char *name; /* extension name */
int base; /* base request number */ int base; /* base request number */
int eventBase; int eventBase;
int eventLast; int eventLast;
int errorBase; int errorBase;
int errorLast; int errorLast;
int num_aliases; int num_aliases;
char **aliases; const char **aliases;
pointer extPrivate; pointer extPrivate;
unsigned short (*MinorOpcode) ( /* called for errors */ unsigned short (*MinorOpcode) ( /* called for errors */
ClientPtr /* client */ ); ClientPtr /* client */ );

4
include/gcstruct.h
View File

@ -276,8 +276,8 @@ typedef struct _GC {
pointer clientClip; pointer clientClip;
unsigned long stateChanges; /* masked with GC_<kind> */ unsigned long stateChanges; /* masked with GC_<kind> */
unsigned long serialNumber; unsigned long serialNumber;
GCFuncs *funcs; const GCFuncs *funcs;
GCOps *ops; const GCOps *ops;
PrivateRec *devPrivates; PrivateRec *devPrivates;
/* /*
* The following were moved here from private storage to allow device- * The following were moved here from private storage to allow device-

2
include/globals.h
View File

@ -18,7 +18,7 @@ extern _X_EXPORT CARD32 ScreenSaverInterval;
extern _X_EXPORT Bool screenSaverSuspended; extern _X_EXPORT Bool screenSaverSuspended;
#endif #endif
extern _X_EXPORT char *defaultFontPath; extern _X_EXPORT const char *defaultFontPath;
extern _X_EXPORT int monitorResolution; extern _X_EXPORT int monitorResolution;
extern _X_EXPORT int defaultColorVisualClass; extern _X_EXPORT int defaultColorVisualClass;

6
include/opaque.h
View File

@ -33,8 +33,8 @@ from The Open Group.
#include "globals.h" #include "globals.h"
extern _X_EXPORT char *defaultTextFont; extern _X_EXPORT const char *defaultTextFont;
extern _X_EXPORT char *defaultCursorFont; extern _X_EXPORT const char *defaultCursorFont;
extern _X_EXPORT int MaxClients; extern _X_EXPORT int MaxClients;
extern _X_EXPORT volatile char isItTimeToYield; extern _X_EXPORT volatile char isItTimeToYield;
extern _X_EXPORT volatile char dispatchException; extern _X_EXPORT volatile char dispatchException;
@ -49,7 +49,7 @@ extern _X_EXPORT int ScreenSaverBlanking;
extern _X_EXPORT int ScreenSaverAllowExposures; extern _X_EXPORT int ScreenSaverAllowExposures;
extern _X_EXPORT int defaultScreenSaverBlanking; extern _X_EXPORT int defaultScreenSaverBlanking;
extern _X_EXPORT int defaultScreenSaverAllowExposures; extern _X_EXPORT int defaultScreenSaverAllowExposures;
extern _X_EXPORT char *display; extern _X_EXPORT const char *display;
extern _X_EXPORT int displayfd; extern _X_EXPORT int displayfd;
extern _X_EXPORT int defaultBackingStore; extern _X_EXPORT int defaultBackingStore;