xserver: Branch 'master' - 4 commits
Eamon Walsh
ewalsh at kemper.freedesktop.org
Tue Jun 24 12:10:46 PDT 2008
hw/xfree86/common/xf86Config.c | 8 ++++----
hw/xfree86/loader/dlloader.c | 9 ++++-----
hw/xfree86/ramdac/xf86Cursor.c | 2 +-
3 files changed, 9 insertions(+), 10 deletions(-)
New commits:
commit e9b4f3cd856e2401675452c387b4155246239f91
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Mon Jun 23 16:18:20 2008 -0400
Fix "warning: suggest parentheses around && within ||".
diff --git a/hw/xfree86/ramdac/xf86Cursor.c b/hw/xfree86/ramdac/xf86Cursor.c
index ec9a358..3c98f6e 100644
--- a/hw/xfree86/ramdac/xf86Cursor.c
+++ b/hw/xfree86/ramdac/xf86Cursor.c
@@ -378,7 +378,7 @@ xf86CursorMoveCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
/* only update coordinate state for first sprite, otherwise we get jumps
when removing a sprite. The second sprite is never HW rendered anyway */
if (pDev == inputInfo.pointer ||
- !pDev->isMaster && pDev->u.master == inputInfo.pointer)
+ (!pDev->isMaster && pDev->u.master == inputInfo.pointer))
{
ScreenPriv->x = x;
ScreenPriv->y = y;
commit 8910dde96ec4318c9c44fb9717b6b52fad56cd1d
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Mon Jun 23 14:51:38 2008 -0400
Fix "warning: assignment discards qualifiers from pointer target type".
diff --git a/hw/xfree86/loader/dlloader.c b/hw/xfree86/loader/dlloader.c
index 4caefd0..18dcb76 100644
--- a/hw/xfree86/loader/dlloader.c
+++ b/hw/xfree86/loader/dlloader.c
@@ -87,16 +87,15 @@ DLFindSymbolLocal(pointer module, const char *name)
static const char symPrefix[] = DLSYM_PREFIX;
- if (strlen(symPrefix)) {
+ if (sizeof(symPrefix) > 1) {
n = malloc(strlen(symPrefix) + strlen(name) + 1);
sprintf(n, "%s%s", symPrefix, name);
- } else {
- n = name;
+ name = n;
}
- p = dlsym(module, n);
+ p = dlsym(module, name);
- if (strlen(symPrefix))
+ if (sizeof(symPrefix) > 1)
free(n);
return p;
commit 95d4ede538fbb68049ba3efa0acb0e9712e5cb01
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Fri Jun 20 23:49:32 2008 -0400
Fix "warning: passing argument 1 of `modeIsPresent' from incompatible pointer type".
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 126ae9f..f0ae730 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -2417,14 +2417,14 @@ configInput(IDevPtr inputp, XF86ConfInputPtr conf_input, MessageType from)
}
static Bool
-modeIsPresent(char * modename,MonPtr monitorp)
+modeIsPresent(DisplayModePtr mode, MonPtr monitorp)
{
DisplayModePtr knownmodes = monitorp->Modes;
/* all I can think of is a linear search... */
while(knownmodes != NULL)
{
- if(!strcmp(modename,knownmodes->name) &&
+ if(!strcmp(mode->name, knownmodes->name) &&
!(knownmodes->type & M_T_DEFAULT))
return TRUE;
knownmodes = knownmodes->next;
commit fa1545eeda2a7feebc006840a44d390177634231
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Fri Jun 20 23:47:22 2008 -0400
Fix "warning: passing argument 1 of `xf86addNewLoadDirective' from incompatible pointer type".
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index e52974d..126ae9f 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -305,7 +305,7 @@ xf86ModulelistFromConfig(pointer **optlist)
}
}
if (found == FALSE) {
- XF86ConfModulePtr ptr = xf86configptr->conf_modules;
+ XF86LoadPtr ptr = (XF86LoadPtr)xf86configptr->conf_modules;
ptr = xf86addNewLoadDirective(ptr, ModuleDefaults[i].name, XF86_LOAD_MODULE, ModuleDefaults[i].load_opt);
xf86Msg(X_INFO, "\"%s\" will be loaded by default.\n", ModuleDefaults[i].name);
}
@@ -314,7 +314,7 @@ xf86ModulelistFromConfig(pointer **optlist)
xf86configptr->conf_modules = xnfcalloc(1, sizeof(XF86ConfModuleRec));
for (i=0 ; ModuleDefaults[i].name != NULL ; i++) {
if (ModuleDefaults[i].toLoad == TRUE) {
- XF86ConfModulePtr ptr = xf86configptr->conf_modules;
+ XF86LoadPtr ptr = (XF86LoadPtr)xf86configptr->conf_modules;
ptr = xf86addNewLoadDirective(ptr, ModuleDefaults[i].name, XF86_LOAD_MODULE, ModuleDefaults[i].load_opt);
}
}
More information about the xorg-commit
mailing list