andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xfree86/common: Warning fixes. Mostly const string handling.

Browse Source 
Also removes DPMS functiosn from Xext/dpmsproc.h

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 16:56:15 +09:00
parent 27b44949a3
commit e1e01d2e33
24 changed files with 88 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xfree86/common/vidmodeproc.h
View File

@ -34,7 +34,7 @@ typedef enum {
} VidModeSelectMonitor;
typedef union {
pointer ptr;
const void *ptr;
int i;
float f;
} vidMonitorValue;

7
hw/xfree86/common/xf86.h
View File

@ -204,8 +204,7 @@ extern _X_EXPORT Bool xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set,
int flags);
#ifdef DPMSExtension
extern _X_EXPORT int DPMSSet(ClientPtr client, int level);
extern _X_EXPORT Bool DPMSSupported(void);
#include "dpmsproc.h"
#endif
/* xf86DGA.c */
@ -339,7 +338,7 @@ xf86LoadDrvSubModule(DriverPtr drv, const char *name);
extern _X_EXPORT pointer
xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name);
extern _X_EXPORT pointer
xf86LoadOneModule(char *name, pointer optlist);
xf86LoadOneModule(const char *name, pointer optlist);
extern _X_EXPORT void
xf86UnloadSubModule(pointer mod);
extern _X_EXPORT Bool
@ -350,7 +349,7 @@ extern _X_EXPORT void
xf86SetSilkenMouse(ScreenPtr pScreen);
extern _X_EXPORT pointer
xf86FindXvOptions(ScrnInfoPtr pScrn, int adapt_index, const char *port_name,
char **adaptor_name, pointer *adaptor_options);
const char **adaptor_name, pointer *adaptor_options);
extern _X_EXPORT void
xf86GetOS(const char **name, int *major, int *minor, int *teeny);
extern _X_EXPORT ScrnInfoPtr

4
hw/xfree86/common/xf86AutoConfig.c
View File

@ -300,6 +300,7 @@ copyScreen(confScreenPtr oscreen, GDevPtr odev, int i, char *driver)
{
confScreenPtr nscreen;
GDevPtr cptr = NULL;
char *identifier;
nscreen = malloc(sizeof(confScreenRec));
if (!nscreen)
@ -313,13 +314,14 @@ copyScreen(confScreenPtr oscreen, GDevPtr odev, int i, char *driver)
}
memcpy(cptr, odev, sizeof(GDevRec));
if (asprintf(&cptr->identifier, "Autoconfigured Video Device %s", driver)
if (asprintf(&identifier, "Autoconfigured Video Device %s", driver)
== -1) {
free(cptr);
free(nscreen);
return FALSE;
}
cptr->driver = driver;
cptr->identifier = identifier;
xf86ConfigLayout.screens[i].screen = nscreen;

32
hw/xfree86/common/xf86Config.c
View File

@ -236,11 +236,11 @@ xf86ValidateFontPath(char *path)
* use the datastructure that the parser provides and pick out the parts
* that we need at this point
*/
char **
const char **
xf86ModulelistFromConfig(pointer **optlist)
{
int count = 0, i = 0;
char **modulearray;
const char **modulearray;
const char *ignore[] = { "GLcore", "speedo", "bitmap", "drm",
"freetype", "type1",
@ -374,12 +374,12 @@ xf86ModulelistFromConfig(pointer **optlist)
return modulearray;
}
char **
const char **
xf86DriverlistFromConfig(void)
{
int count = 0;
int j;
char **modulearray;
const char **modulearray;
screenLayoutPtr slp;
/*
@ -446,11 +446,11 @@ xf86DriverlistFromConfig(void)
return modulearray;
}
char **
const char **
xf86InputDriverlistFromConfig(void)
{
int count = 0;
char **modulearray;
const char **modulearray;
InputInfoPtr *idp;
/*
@ -505,11 +505,11 @@ xf86InputDriverlistFromConfig(void)
}
static void
fixup_video_driver_list(char **drivers)
fixup_video_driver_list(const char **drivers)
{
static const char *fallback[4] = { "fbdev", "vesa", "wsfb", NULL };
char **end, **drv;
char *x;
const char **end, **drv;
const char *x;
int i;
/* walk to the end of the list */
@ -533,10 +533,10 @@ fixup_video_driver_list(char **drivers)
}
}
static char **
static const char **
GenerateDriverlist(const char *dirname)
{
char **ret;
const char **ret;
const char *subdirs[] = { dirname, NULL };
static const char *patlist[] = { "(.*)_drv\\.so", NULL };
ret = LoaderListDirs(subdirs, patlist);
@ -548,10 +548,10 @@ GenerateDriverlist(const char *dirname)
return ret;
}
char **
const char **
xf86DriverlistFromCompile(void)
{
static char **driverlist = NULL;
static const char **driverlist = NULL;
if (!driverlist)
driverlist = GenerateDriverlist("drivers");
@ -589,7 +589,7 @@ configFiles(XF86ConfFilesPtr fileconf)
/* FontPath */
must_copy = TRUE;
temp_path = defaultFontPath ? defaultFontPath : "";
temp_path = defaultFontPath ? defaultFontPath : (char *) "";
if (xf86fpFlag)
pathFrom = X_CMDLINE;
else if (fileconf && fileconf->file_fontpath) {
@ -606,7 +606,7 @@ configFiles(XF86ConfFilesPtr fileconf)
}
else
pathFrom = X_DEFAULT;
temp_path = defaultFontPath ? defaultFontPath : "";
temp_path = defaultFontPath ? defaultFontPath : (char *) "";
/* xf86ValidateFontPath modifies its argument, but returns a copy of it. */
temp_path = must_copy ? xnfstrdup(defaultFontPath) : defaultFontPath;
@ -2349,7 +2349,7 @@ checkInput(serverLayoutPtr layout, Bool implicit_layout)
ConfigStatus
xf86HandleConfigFile(Bool autoconfig)
{
char *scanptr;
const char *scanptr;
Bool singlecard = 0;
Bool implicit_layout = FALSE;

8
hw/xfree86/common/xf86Config.h
View File

@ -59,10 +59,10 @@ typedef struct _ModuleDefault {
/*
* prototypes
*/
char **xf86ModulelistFromConfig(pointer **);
char **xf86DriverlistFromConfig(void);
char **xf86DriverlistFromCompile(void);
char **xf86InputDriverlistFromConfig(void);
const char **xf86ModulelistFromConfig(pointer **);
const char **xf86DriverlistFromConfig(void);
const char **xf86DriverlistFromCompile(void);
const char **xf86InputDriverlistFromConfig(void);
Bool xf86BuiltinInputDriver(const char *);
ConfigStatus xf86HandleConfigFile(Bool);

38
hw/xfree86/common/xf86Configure.c
View File

@ -195,11 +195,15 @@ configureScreenSection(int screennum)
{
int i;
int depths[] = { 1, 4, 8, 15, 16, 24 /*, 32 */ };
char *tmp;
parsePrologue(XF86ConfScreenPtr, XF86ConfScreenRec)
XNFasprintf(&ptr->scrn_identifier, "Screen%d", screennum);
XNFasprintf(&ptr->scrn_monitor_str, "Monitor%d", screennum);
XNFasprintf(&ptr->scrn_device_str, "Card%d", screennum);
XNFasprintf(&tmp, "Screen%d", screennum);
ptr->scrn_identifier = tmp;
XNFasprintf(&tmp, "Monitor%d", screennum);
ptr->scrn_monitor_str = tmp;
XNFasprintf(&tmp, "Card%d", screennum);
ptr->scrn_device_str = tmp;
for (i = 0; i < sizeof(depths) / sizeof(depths[0]); i++) {
XF86ConfDisplayPtr display;
@ -248,12 +252,14 @@ configureDeviceSection(int screennum)
{
OptionInfoPtr p;
int i = 0;
char *identifier;
parsePrologue(XF86ConfDevicePtr, XF86ConfDeviceRec)
/* Move device info to parser structure */
if (asprintf(&ptr->dev_identifier, "Card%d", screennum) == -1)
ptr->dev_identifier = NULL;
if (asprintf(&identifier, "Card%d", screennum) == -1)
identifier = NULL;
ptr->dev_identifier = identifier;
ptr->dev_chipset = DevToConfig[screennum].GDev.chipset;
ptr->dev_busid = DevToConfig[screennum].GDev.busID;
ptr->dev_driver = DevToConfig[screennum].GDev.driver;
@ -355,20 +361,24 @@ configureLayoutSection(void)
for (scrnum = 0; scrnum < nDevToConfig; scrnum++) {
XF86ConfAdjacencyPtr aptr;
char *tmp;
aptr = malloc(sizeof(XF86ConfAdjacencyRec));
aptr->list.next = NULL;
aptr->adj_x = 0;
aptr->adj_y = 0;
aptr->adj_scrnum = scrnum;
XNFasprintf(&aptr->adj_screen_str, "Screen%d", scrnum);
XNFasprintf(&tmp, "Screen%d", scrnum);
aptr->adj_screen_str = tmp;
if (scrnum == 0) {
aptr->adj_where = CONF_ADJ_ABSOLUTE;
aptr->adj_refscreen = NULL;
}
else {
char *tmp;
aptr->adj_where = CONF_ADJ_RIGHTOF;
XNFasprintf(&aptr->adj_refscreen, "Screen%d", scrnum - 1);
XNFasprintf(&tmp, "Screen%d", scrnum - 1);
aptr->adj_refscreen = tmp;
}
ptr->lay_adjacency_lst =
(XF86ConfAdjacencyPtr) xf86addListItem((glp) ptr->lay_adjacency_lst,
@ -389,7 +399,7 @@ configureFlagsSection(void)
static XF86ConfModulePtr
configureModuleSection(void)
{
char **elist, **el;
const char **elist, **el;
/* Find the list of extension & font modules. */
const char *esubdirs[] = {
@ -432,9 +442,11 @@ configureFilesSection(void)
static XF86ConfMonitorPtr
configureMonitorSection(int screennum)
{
char *tmp;
parsePrologue(XF86ConfMonitorPtr, XF86ConfMonitorRec)
XNFasprintf(&ptr->mon_identifier, "Monitor%d", screennum);
XNFasprintf(&tmp, "Monitor%d", screennum);
ptr->mon_identifier = tmp;
ptr->mon_vendor = strdup("Monitor Vendor");
ptr->mon_modelname = strdup("Monitor Model");
@ -474,10 +486,12 @@ configureDDCMonitorSection(int screennum)
#define displaySizeMaxLen 80
char displaySize_string[displaySizeMaxLen];
int displaySizeLen;
char *tmp;
parsePrologue(XF86ConfMonitorPtr, XF86ConfMonitorRec)
XNFasprintf(&ptr->mon_identifier, "Monitor%d", screennum);
XNFasprintf(&tmp, "Monitor%d", screennum);
ptr->mon_identifier = tmp;
ptr->mon_vendor = strdup(ConfiguredMonitor->vendor.name);
XNFasprintf(&ptr->mon_modelname, "%x", ConfiguredMonitor->vendor.prod_id);
@ -530,7 +544,7 @@ DoConfigure(void)
char filename[PATH_MAX];
const char *addslash = "";
XF86ConfigPtr xf86config = NULL;
char **vlist, **vl;
const char **vlist, **vl;
int *dev2screen;
vlist = xf86DriverlistFromCompile();
@ -768,7 +782,7 @@ void
DoShowOptions(void)
{
int i = 0;
char **vlist = 0;
const char **vlist = NULL;
char *pSymbol = 0;
XF86ModuleData *initData = 0;

1
hw/xfree86/common/xf86Extensions.c
View File

@ -89,7 +89,6 @@ load_extension_config(void)
{
XF86ConfModulePtr mod_con = xf86configptr->conf_modules;
XF86LoadPtr modp;
int i;
/* Only the best. */
if (!mod_con)

10
hw/xfree86/common/xf86Helper.c
View File

@ -1068,9 +1068,7 @@ void
xf86EnableDisableFBAccess(ScrnInfoPtr pScrnInfo, Bool enable)
{
ScreenPtr pScreen = pScrnInfo->pScreen;
PixmapPtr pspix;
pspix = (*pScreen->GetScreenPixmap) (pScreen);
if (enable) {
/*
* Restore all of the clip lists on the screen
@ -1566,7 +1564,7 @@ xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name)
* xf86LoadOneModule loads a single module.
*/
pointer
xf86LoadOneModule(char *name, pointer opt)
xf86LoadOneModule(const char *name, pointer opt)
{
int errmaj, errmin;
char *Name;
@ -1698,8 +1696,8 @@ xf86SetSilkenMouse(ScreenPtr pScreen)
/* Wrote this function for the PM2 Xv driver, preliminary. */
pointer
xf86FindXvOptions(ScrnInfoPtr pScrn, int adaptor_index, char *port_name,
char **adaptor_name, pointer *adaptor_options)
xf86FindXvOptions(ScrnInfoPtr pScrn, int adaptor_index, const char *port_name,
const char **adaptor_name, pointer *adaptor_options)
{
confXvAdaptorPtr adaptor;
int i;
@ -1817,7 +1815,7 @@ xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type,
pNewProp->next = NULL;
}
else {
free(pNewProp->name);
free((void *) pNewProp->name);
existing = TRUE;
}

3
hw/xfree86/common/xf86InPriv.h
View File

@ -37,7 +37,4 @@
extern InputDriverPtr *xf86InputDriverList;
extern int xf86NumInputDrivers;
/* xf86Helper.c */
InputDriverPtr xf86LookupInputDriver(const char *name);
#endif /* _xf86InPriv_h */

8
hw/xfree86/common/xf86Init.c
View File

@ -395,7 +395,7 @@ void
InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
{
int i, j, k, scr_index;
char **modulelist;
const char **modulelist;
pointer *optionlist;
Pix24Flags screenpix24, pix24;
MessageType pix24From = X_DEFAULT;
@ -623,7 +623,9 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
for (i = 0; i < xf86NumScreens; i++) {
if (xf86Screens[i]->name == NULL) {
XNFasprintf(&xf86Screens[i]->name, "screen%d", i);
char *tmp;
XNFasprintf(&tmp, "screen%d", i);
xf86Screens[i]->name = tmp;
xf86MsgVerb(X_WARNING, 0,
"Screen driver %d has no name set, using `%s'.\n",
i, xf86Screens[i]->name);
@ -1536,7 +1538,7 @@ ddxUseMsg(void)
* xf86LoadModules iterates over a list that is being passed in.
*/
Bool
xf86LoadModules(char **list, pointer *optlist)
xf86LoadModules(const char **list, pointer *optlist)
{
int errmaj, errmin;
pointer opt;

2
hw/xfree86/common/xf86Mode.c
View File

@ -1998,7 +1998,7 @@ xf86DeleteMode(DisplayModePtr * modeList, DisplayModePtr mode)
mode->next->prev = mode->prev;
}
free(mode->name);
free((void *) mode->name);
free(mode);
}

2
hw/xfree86/common/xf86Module.h
View File

@ -176,7 +176,7 @@ extern _X_EXPORT pointer LoadSubModule(pointer, const char *, const char **,
extern _X_EXPORT void UnloadSubModule(pointer);
extern _X_EXPORT void UnloadModule(pointer);
extern _X_EXPORT pointer LoaderSymbol(const char *);
extern _X_EXPORT char **LoaderListDirs(const char **, const char **);
extern _X_EXPORT const char **LoaderListDirs(const char **, const char **);
extern _X_EXPORT void LoaderFreeDirList(char **);
extern _X_EXPORT void LoaderErrorMsg(const char *, const char *, int, int);
extern _X_EXPORT void LoaderGetOS(const char **name, int *major, int *minor,

2
hw/xfree86/common/xf86Opt.h
View File

@ -123,7 +123,7 @@ extern _X_EXPORT OptionInfoPtr xf86TokenToOptinfo(const OptionInfoRec * table,
extern _X_EXPORT const char *xf86TokenToOptName(const OptionInfoRec * table,
int token);
extern _X_EXPORT Bool xf86IsOptionSet(const OptionInfoRec * table, int token);
extern _X_EXPORT char *xf86GetOptValString(const OptionInfoRec * table,
extern _X_EXPORT const char *xf86GetOptValString(const OptionInfoRec * table,
int token);
extern _X_EXPORT Bool xf86GetOptValInteger(const OptionInfoRec * table,
int token, int *value);

5
hw/xfree86/common/xf86Option.c
View File

@ -478,7 +478,8 @@ static Bool
ParseOptionValue(int scrnIndex, XF86OptionPtr options, OptionInfoPtr p,
Bool markUsed)
{
char *s, *end;
const char *s;
char *end;
Bool wasUsed = FALSE;
if ((s = xf86findOptionValue(options, p->name)) != NULL) {
@ -755,7 +756,7 @@ xf86IsOptionSet(const OptionInfoRec * table, int token)
return p && p->found;
}
char *
const char *
xf86GetOptValString(const OptionInfoRec * table, int token)
{
OptionInfoPtr p;

2
hw/xfree86/common/xf86Priv.h
View File

@ -156,7 +156,7 @@ xf86CloseLog(enum ExitCode error);
/* xf86Init.c */
extern _X_EXPORT Bool
xf86LoadModules(char **list, pointer *optlist);
xf86LoadModules(const char **list, pointer *optlist);
extern _X_EXPORT int
xf86SetVerbosity(int verb);
extern _X_EXPORT int

10
hw/xfree86/common/xf86Xinput.c
View File

@ -107,7 +107,7 @@ static int
* Eval config and modify DeviceVelocityRec accordingly
*/
static void
ProcessVelocityConfiguration(DeviceIntPtr pDev, char *devname, pointer list,
ProcessVelocityConfiguration(DeviceIntPtr pDev, const char *devname, pointer list,
DeviceVelocityPtr s)
{
int tempi;
@ -661,7 +661,7 @@ MergeInputClasses(const InputInfoPtr idev, const InputAttributes * attrs)
/* Collect class options and driver settings */
classopts = xf86optionListDup(cl->option_lst);
if (cl->driver) {
free(idev->driver);
free((void *) idev->driver);
idev->driver = xstrdup(cl->driver);
if (!idev->driver) {
xf86Msg(X_ERROR, "Failed to allocate memory while merging "
@ -773,8 +773,8 @@ xf86DeleteInput(InputInfoPtr pInp, int flags)
/* Else the entry wasn't in the xf86InputDevs list (ignore this). */
}
free(pInp->driver);
free(pInp->name);
free((void *) pInp->driver);
free((void *) pInp->name);
xf86optionListFree(pInp->options);
free(pInp);
}
@ -1067,7 +1067,7 @@ xf86CheckMotionEvent4DGA(DeviceIntPtr device, int is_absolute,
#if XFreeXDGA
ScreenPtr scr = NULL;
int idx, i;
int idx = 0, i;
/* The evdev driver may not always send all axes across. */
if (valuator_mask_isset(mask, 0) || valuator_mask_isset(mask, 1)) {

6
hw/xfree86/common/xf86pciBus.c
View File

@ -575,7 +575,7 @@ xf86PciProbeDev(DriverPtr drvp)
}
void
xf86PciIsolateDevice(char *argument)
xf86PciIsolateDevice(const char *argument)
{
int bus, device, func;
@ -1484,6 +1484,7 @@ xf86PciConfigureNewDev(void *busData, struct pci_device *pVideo,
GDevRec * GDev, int *chipset)
{
char busnum[8];
char *tmp;
pVideo = (struct pci_device *) busData;
@ -1493,8 +1494,9 @@ xf86PciConfigureNewDev(void *busData, struct pci_device *pVideo,
snprintf(busnum, sizeof(busnum), "%d@%d",
pVideo->bus & 0x00ff, pVideo->bus >> 8);
XNFasprintf(&GDev->busID, "PCI:%s:%d:%d",
XNFasprintf(&tmp, "PCI:%s:%d:%d",
busnum, pVideo->dev, pVideo->func);
GDev->busID = tmp;
GDev->chipID = pVideo->device_id;
GDev->chipRev = pVideo->revision;

2
hw/xfree86/common/xf86pciBus.h
View File

@ -36,7 +36,7 @@
void xf86PciProbe(void);
Bool xf86PciAddMatchingDev(DriverPtr drvp);
Bool xf86PciProbeDev(DriverPtr drvp);
void xf86PciIsolateDevice(char *argument);
void xf86PciIsolateDevice(const char *argument);
int xf86PciMatchDriver(char *matches[], int nmatches);
Bool xf86PciConfigure(void *busData, struct pci_device *pDev);
void xf86PciConfigureNewDev(void *busData, struct pci_device *pVideo,

2
hw/xfree86/common/xf86platformBus.c
View File

@ -400,7 +400,7 @@ xf86platformAddDevice(int index)
DriverPtr drvp = NULL;
int entity;
screenLayoutPtr layout;
static char *hotplug_driver_name = "modesetting";
static const char *hotplug_driver_name = "modesetting";
/* force load the driver for now */
xf86LoadOneModule(hotplug_driver_name, NULL);

2
hw/xfree86/common/xf86str.h
View File

@ -424,7 +424,7 @@ typedef struct {
rgb blackColour;
rgb whiteColour;
int defaultVisual;
char **modes;
const char **modes;
pointer options;
} DispRec, *DispPtr;

6
hw/xfree86/loader/loadmod.c
View File

@ -482,7 +482,7 @@ FindModule(const char *module, const char *dirname, const char **subdirlist,
return name;
}
char **
const char **
LoaderListDirs(const char **subdirlist, const char **patternlist)
{
char buf[PATH_MAX + 1];
@ -490,7 +490,7 @@ LoaderListDirs(const char **subdirlist, const char **patternlist)
char **elem;
const char **subdirs;
const char **s;
PatternPtr patterns;
PatternPtr patterns = NULL;
PatternPtr p;
DIR *d;
struct dirent *dp;
@ -571,7 +571,7 @@ LoaderListDirs(const char **subdirlist, const char **patternlist)
FreePatterns(patterns);
FreeSubdirs(subdirs);
FreePathList(pathlist);
return ret;
return (const char **) ret;
}
void

2
hw/xfree86/parser/Module.c
View File

@ -218,7 +218,7 @@ xf86printModuleSection(FILE * cf, XF86ConfModulePtr ptr)
}
XF86LoadPtr
xf86addNewLoadDirective(XF86LoadPtr head, char *name, int type,
xf86addNewLoadDirective(XF86LoadPtr head, const char *name, int type,
XF86OptionPtr opts)
{
XF86LoadPtr new;

2
hw/xfree86/parser/configProcs.h
View File

@ -67,7 +67,7 @@ int xf86validateLayout(XF86ConfigPtr p);
XF86ConfModulePtr xf86parseModuleSection(void);
void xf86printModuleSection(FILE * cf, XF86ConfModulePtr ptr);
extern _X_EXPORT XF86LoadPtr xf86addNewLoadDirective(XF86LoadPtr head,
char *name, int type,
const char *name, int type,
XF86OptionPtr opts);
void xf86freeModules(XF86ConfModulePtr ptr);

4
hw/xfree86/parser/xf86Parser.h
View File

@ -180,7 +180,7 @@ typedef struct {
GenericListRec list;
const char *mon_identifier;
const char *mon_vendor;
const char *mon_modelname;
char *mon_modelname;
int mon_width; /* in mm */
int mon_height; /* in mm */
XF86ConfModeLinePtr mon_modeline_lst;
@ -304,7 +304,7 @@ typedef struct {
typedef struct {
GenericListRec list;
const char *identifier;
char *identifier;
const char *driver;
struct xorg_list match_product;
struct xorg_list match_vendor;