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

Fix gcc -Wwrite-strings warnings in xf86Modes code 

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
This commit is contained in:
Alan Coopersmith 2011-11-07 20:24:08 -08:00
parent 09e4b78f79
commit 632d205b30
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/xfree86/modes/xf86Crtc.c
View File

@ -481,7 +481,7 @@ static void
xf86OutputSetMonitor (xf86OutputPtr output) xf86OutputSetMonitor (xf86OutputPtr output)
{ {
char *option_name; char *option_name;
char *monitor; const char *monitor;
if (!output->name) if (!output->name)
return; return;
@ -561,7 +561,7 @@ xf86OutputIgnored (xf86OutputPtr output)
return xf86ReturnOptValBool (output->options, OPTION_IGNORE, FALSE); return xf86ReturnOptValBool (output->options, OPTION_IGNORE, FALSE);
} }
static char *direction[4] = { static const char *direction[4] = {
"normal", "normal",
"left", "left",
"inverted", "inverted",
@ -3063,13 +3063,13 @@ xf86OutputGetEDID (xf86OutputPtr output, I2CBusPtr pDDCBus)
return mon; return mon;
} }
static char *_xf86ConnectorNames[] = { static const char *_xf86ConnectorNames[] = {
"None", "VGA", "DVI-I", "DVI-D", "None", "VGA", "DVI-I", "DVI-D",
"DVI-A", "Composite", "S-Video", "DVI-A", "Composite", "S-Video",
"Component", "LFP", "Proprietary", "Component", "LFP", "Proprietary",
"HDMI", "DisplayPort", "HDMI", "DisplayPort",
}; };
char * const char *
xf86ConnectorGetName(xf86ConnectorType connector) xf86ConnectorGetName(xf86ConnectorType connector)
{ {
return _xf86ConnectorNames[connector]; return _xf86ConnectorNames[connector];

2
hw/xfree86/modes/xf86Crtc.h
View File

@ -900,7 +900,7 @@ xf86CrtcSetScreenSubpixelOrder (ScreenPtr pScreen);
/* /*
* Get a standard string name for a connector type * Get a standard string name for a connector type
*/ */
extern _X_EXPORT char * extern _X_EXPORT const char *
xf86ConnectorGetName(xf86ConnectorType connector); xf86ConnectorGetName(xf86ConnectorType connector);
/* /*

2
hw/xfree86/modes/xf86EdidModes.c
View File

@ -230,7 +230,7 @@ static Bool quirk_dvi_single_link(int scrnIndex, xf86MonPtr DDC)
typedef struct { typedef struct {
Bool (*detect) (int scrnIndex, xf86MonPtr DDC); Bool (*detect) (int scrnIndex, xf86MonPtr DDC);
ddc_quirk_t quirk; ddc_quirk_t quirk;
char *description; const char *description;
} ddc_quirk_map_t; } ddc_quirk_map_t;
static const ddc_quirk_map_t ddc_quirks[] = { static const ddc_quirk_map_t ddc_quirks[] = {

4
hw/xfree86/modes/xf86Modes.c
View File

@ -272,7 +272,7 @@ xf86ModesEqual(const DisplayModeRec *pMode1, const DisplayModeRec *pMode2)
} }
static void static void
add(char **p, char *new) add(char **p, const char *new)
{ {
*p = xnfrealloc(*p, strlen(*p) + strlen(new) + 2); *p = xnfrealloc(*p, strlen(*p) + strlen(new) + 2);
strcat(*p, " "); strcat(*p, " ");
@ -599,7 +599,7 @@ xf86PruneInvalidModes(ScrnInfoPtr pScrn, DisplayModePtr *modeList,
if (mode->status != MODE_OK) { if (mode->status != MODE_OK) {
if (verbose) { if (verbose) {
char *type = ""; const char *type = "";
if (mode->type & M_T_BUILTIN) if (mode->type & M_T_BUILTIN)
type = "built-in "; type = "built-in ";
else if (mode->type & M_T_DEFAULT) else if (mode->type & M_T_DEFAULT)