[PATCH 16/25] DoShowOptions: preserve constness of options list as we walk it
Alan Coopersmith
alan.coopersmith at oracle.com
Sun Dec 11 10:16:29 PST 2011
Since all we do with the option list is walk down the list printing
the names, there's no need to cast away its constness.
Clears gcc warning:
xf86Configure.c: In function 'DoShowOptions':
xf86Configure.c:781:4: warning: cast discards qualifiers from pointer target type
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
---
hw/xfree86/common/xf86Configure.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c
index 24f367e..994d46f 100644
--- a/hw/xfree86/common/xf86Configure.c
+++ b/hw/xfree86/common/xf86Configure.c
@@ -778,7 +778,8 @@ void DoShowOptions (void) {
free(vlist);
for (i = 0; i < xf86NumDrivers; i++) {
if (xf86DriverList[i]->AvailableOptions) {
- OptionInfoPtr pOption = (OptionInfoPtr)(*xf86DriverList[i]->AvailableOptions)(0,0);
+ const OptionInfoRec *pOption =
+ (*xf86DriverList[i]->AvailableOptions)(0,0);
if (! pOption) {
ErrorF ("(EE) Couldn't read option table for %s driver\n",
xf86DriverList[i]->driverName
@@ -790,7 +791,7 @@ void DoShowOptions (void) {
initData = LoaderSymbol (pSymbol);
if (initData) {
XF86ModuleVersionInfo *vers = initData->vers;
- OptionInfoPtr p;
+ const OptionInfoRec *p;
ErrorF ("Driver[%d]:%s[%s] {\n",
i,xf86DriverList[i]->driverName,vers->vendor
);
--
1.7.3.2
More information about the xorg-devel
mailing list