diff options
| author | Egbert Eich <eich@suse.de> | 2004-11-01 16:05:27 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-11-01 16:05:27 +0000 |
| commit | 1074992c285835ca9d96d11e8352bbe2cdbc2a28 (patch) | |
| tree | fc021bc96f40e9897ac36fb03cd4a52c45f05515 | |
| parent | 7e588ba9abdcc2078b6c361c81806337b8ff0827 (diff) | |
Fixed sig11 which occured when calling a CloseDisplay() after
XScreenSaverSetAttributes() followed by XScreenSaverUnsetAttributes().
Caused by missing FreeResource() in XScreenSaverUnsetAttributes().
Removing unused DDC sections that caused misinterpretation of DDC data due
to a missing break statement in a switch.
Fixed typo: #if <-> #ifdef.
| -rw-r--r-- | Xext/saver.c | 3 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86Configure.c | 8 | ||||
| -rw-r--r-- | hw/xfree86/os-support/bus/ix86Pci.c | 2 |
3 files changed, 4 insertions, 9 deletions
diff --git a/Xext/saver.c b/Xext/saver.c index 7131bb3fa..bef86052a 100644 --- a/Xext/saver.c +++ b/Xext/saver.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/Xext/saver.c,v 1.2 2004/04/23 18:44:41 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/Xext/saver.c,v 1.3 2004/10/10 17:48:43 herrb Exp $ */ /* * $XConsortium: saver.c,v 1.12 94/04/17 20:59:36 dpw Exp $ * @@ -1185,6 +1185,7 @@ ScreenSaverUnsetAttributes (ClientPtr client) pPriv = GetScreenPrivate (pDraw->pScreen); if (pPriv && pPriv->attr && pPriv->attr->client == client) { + FreeResource (pPriv->attr->resource, AttrType); FreeScreenAttr (pPriv->attr); pPriv->attr = NULL; CheckScreenPrivate (pDraw->pScreen); diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c index be37f53be..ad711ef68 100644 --- a/hw/xfree86/common/xf86Configure.c +++ b/hw/xfree86/common/xf86Configure.c @@ -731,19 +731,13 @@ configureDDCMonitorSection (int screennum) for (i=0;i<4;i++) { switch (ConfiguredMonitor->det_mon[i].type) { - case DT: - case DS_STD_TIMINGS: - case DS_WHITE_P: - break; case DS_NAME: ptr->mon_modelname = xf86confrealloc(ptr->mon_modelname, strlen((char*)(ConfiguredMonitor->det_mon[i].section.name)) + 1); strcpy(ptr->mon_modelname, (char*)(ConfiguredMonitor->det_mon[i].section.name)); - break; - case DS_ASCII_STR: - case DS_SERIAL: + break; case DS_RANGES: ptr->mon_hsync[ptr->mon_n_hsync].lo = ConfiguredMonitor->det_mon[i].section.ranges.min_h; diff --git a/hw/xfree86/os-support/bus/ix86Pci.c b/hw/xfree86/os-support/bus/ix86Pci.c index da1aa7d2f..9437204a9 100644 --- a/hw/xfree86/os-support/bus/ix86Pci.c +++ b/hw/xfree86/os-support/bus/ix86Pci.c @@ -273,7 +273,7 @@ void ix86PciSelectCfgmech(void) switch (xf86Info.pciFlags) { case PCIOsConfig: -#if ARCH_PCI_OS_INIT +#ifdef ARCH_PCI_OS_INIT return; #endif |