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

Fix gcc -Wwrite-strings warnings in various extensions 

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-04 23:21:34 -07:00
parent 232f1ddf3d
commit 05f589d464
16 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Xext/security.c
View File

@ -62,7 +62,7 @@ typedef struct {
} SecurityStateRec; } SecurityStateRec;
/* Extensions that untrusted clients shouldn't have access to */ /* Extensions that untrusted clients shouldn't have access to */
static char *SecurityTrustedExtensions[] = { static const char *SecurityTrustedExtensions[] = {
"XC-MISC", "XC-MISC",
"BIG-REQUESTS", "BIG-REQUESTS",
"XpExtension", "XpExtension",
@ -98,7 +98,7 @@ static const Mask SecurityClientMask = DixGetAttrAccess;
*/ */
static void static void
SecurityAudit(char *format, ...) SecurityAudit(const char *format, ...)
{ {
va_list args; va_list args;

4
Xext/sync.c
View File

@ -971,7 +971,7 @@ static int FreeCounter(void *, XID);
pointer pointer
SyncCreateSystemCounter( SyncCreateSystemCounter(
char *name, const char *name,
CARD64 initial, CARD64 initial,
CARD64 resolution, CARD64 resolution,
SyncCounterType counterType, SyncCounterType counterType,
@ -1308,7 +1308,7 @@ ProcSyncListSystemCounters(ClientPtr client)
for (i = len = 0; i < SyncNumSystemCounters; i++) for (i = len = 0; i < SyncNumSystemCounters; i++)
{ {
char *name = SysCounterList[i]->pSysCounterInfo->name; const char *name = SysCounterList[i]->pSysCounterInfo->name;
/* pad to 4 byte boundary */ /* pad to 4 byte boundary */
len += pad_to_int32(sz_xSyncSystemCounter + strlen(name)); len += pad_to_int32(sz_xSyncSystemCounter + strlen(name));
} }

4
Xext/syncsrv.h
View File

@ -66,7 +66,7 @@ typedef enum {
} SyncCounterType; } SyncCounterType;
typedef struct _SysCounterInfo { typedef struct _SysCounterInfo {
char *name; const char *name;
CARD64 resolution; CARD64 resolution;
CARD64 bracket_greater; CARD64 bracket_greater;
CARD64 bracket_less; CARD64 bracket_less;
@ -118,7 +118,7 @@ typedef union {
} SyncAwaitUnion; } SyncAwaitUnion;
extern pointer SyncCreateSystemCounter( extern pointer SyncCreateSystemCounter(
char * /* name */, const char */* name */,
CARD64 /* inital_value */, CARD64 /* inital_value */,
CARD64 /* resolution */, CARD64 /* resolution */,
SyncCounterType /* change characterization */, SyncCounterType /* change characterization */,

2
Xext/xtest.c
View File

@ -603,7 +603,7 @@ DeviceSetXTestProperty(DeviceIntPtr dev, Atom property,
* This only creates the pair, Activate/Enable Device * This only creates the pair, Activate/Enable Device
* still need to be called. * still need to be called.
*/ */
int AllocXTestDevice (ClientPtr client, char* name, int AllocXTestDevice (ClientPtr client, const char* name,
DeviceIntPtr* ptr, DeviceIntPtr* keybd, DeviceIntPtr* ptr, DeviceIntPtr* keybd,
DeviceIntPtr master_ptr, DeviceIntPtr master_keybd) DeviceIntPtr master_ptr, DeviceIntPtr master_keybd)
{ {

4
Xi/extinit.c
View File

@ -162,7 +162,7 @@ Mask ExtExclusiveMasks[EMASKSIZE];
static struct dev_type static struct dev_type
{ {
Atom type; Atom type;
char *name; const char *name;
} dev_type[] = { } dev_type[] = {
{ {
0, XI_KEYBOARD}, { 0, XI_KEYBOARD}, {
@ -1127,7 +1127,7 @@ IResetProc(ExtensionEntry * unused)
*/ */
void void
AssignTypeAndName(DeviceIntPtr dev, Atom type, char *name) AssignTypeAndName(DeviceIntPtr dev, Atom type, const char *name)
{ {
dev->xinput_type = type; dev->xinput_type = type;
dev->name = strdup(name); dev->name = strdup(name);

2
Xi/xiproperty.c
View File

@ -48,7 +48,7 @@
static struct dev_properties static struct dev_properties
{ {
Atom type; Atom type;
char *name; const char *name;
} dev_properties[] = { } dev_properties[] = {
{0, XI_PROP_ENABLED}, {0, XI_PROP_ENABLED},
{0, XI_PROP_XTEST_DEVICE}, {0, XI_PROP_XTEST_DEVICE},

2
dix/devices.c
View File

@ -2554,7 +2554,7 @@ GetMaster(DeviceIntPtr dev, int which)
* the value for master. * the value for master.
*/ */
int int
AllocDevicePair (ClientPtr client, char* name, AllocDevicePair (ClientPtr client, const char* name,
DeviceIntPtr* ptr, DeviceIntPtr* ptr,
DeviceIntPtr* keybd, DeviceIntPtr* keybd,
DeviceProc ptr_proc, DeviceProc ptr_proc,

8
dix/extension.c
View File

@ -71,7 +71,7 @@ static int lastError = FirstExtensionError;
static unsigned int NumExtensions = 0; static unsigned int NumExtensions = 0;
ExtensionEntry * ExtensionEntry *
AddExtension(char *name, int NumEvents, int NumErrors, AddExtension(const char *name, int NumEvents, int NumErrors,
int (*MainProc)(ClientPtr c1), int (*MainProc)(ClientPtr c1),
int (*SwappedMainProc)(ClientPtr c2), int (*SwappedMainProc)(ClientPtr c2),
void (*CloseDownProc)(ExtensionEntry *e), void (*CloseDownProc)(ExtensionEntry *e),
@ -151,7 +151,7 @@ AddExtension(char *name, int NumEvents, int NumErrors,
return ext; return ext;
} }
Bool AddExtensionAlias(char *alias, ExtensionEntry *ext) Bool AddExtensionAlias(const char *alias, ExtensionEntry *ext)
{ {
char *name; char *name;
char **aliases; char **aliases;
@ -172,7 +172,7 @@ Bool AddExtensionAlias(char *alias, ExtensionEntry *ext)
} }
static int static int
FindExtension(char *extname, int len) FindExtension(const char *extname, int len)
{ {
int i, j; int i, j;
@ -201,7 +201,7 @@ CheckExtension(const char *extname)
{ {
int n; int n;
n = FindExtension((char*)extname, strlen(extname)); n = FindExtension(extname, strlen(extname));
if (n != -1) if (n != -1)
return extensions[n]; return extensions[n];
else else

2
doc/Xserver-spec.xml
View File

@ -565,7 +565,7 @@ should be called by InitExtensions.
ExtensionEntry *AddExtension(name, NumEvents,NumErrors, ExtensionEntry *AddExtension(name, NumEvents,NumErrors,
MainProc, SwappedMainProc, CloseDownProc, MinorOpcodeProc) MainProc, SwappedMainProc, CloseDownProc, MinorOpcodeProc)
char *name; /*Null terminate string; case matters*/ const char *name; /*Null terminate string; case matters*/
int NumEvents; int NumEvents;
int NumErrors; int NumErrors;
int (* MainProc)(ClientPtr);/*Called if client matches server order*/ int (* MainProc)(ClientPtr);/*Called if client matches server order*/

4
include/extension.h
View File

@ -54,9 +54,9 @@ extern _X_EXPORT unsigned short StandardMinorOpcode(ClientPtr /*client*/);
extern _X_EXPORT unsigned short MinorOpcodeOfRequest(ClientPtr /*client*/); extern _X_EXPORT unsigned short MinorOpcodeOfRequest(ClientPtr /*client*/);
extern _X_EXPORT Bool EnableDisableExtension(char *name, Bool enable); extern _X_EXPORT Bool EnableDisableExtension(const char *name, Bool enable);
extern _X_EXPORT void EnableDisableExtensionError(char *name, Bool enable); extern _X_EXPORT void EnableDisableExtensionError(const char *name, Bool enable);
extern _X_EXPORT void InitExtensions(int argc, char **argv); extern _X_EXPORT void InitExtensions(int argc, char **argv);

2
include/extinit.h
View File

@ -41,7 +41,7 @@ extern _X_EXPORT void
AssignTypeAndName ( AssignTypeAndName (
DeviceIntPtr /* dev */, DeviceIntPtr /* dev */,
Atom /* type */, Atom /* type */,
char * /* name */ const char * /* name */
); );
#endif /* EXTINIT_H */ #endif /* EXTINIT_H */

4
include/extnsionst.h
View File

@ -92,7 +92,7 @@ extern _X_EXPORT void NotImplemented ( /* FIXME: this may move to another file..
#define GetGCValue(pGC, GCElement) (pGC->GCElement) #define GetGCValue(pGC, GCElement) (pGC->GCElement)
extern _X_EXPORT ExtensionEntry *AddExtension( extern _X_EXPORT ExtensionEntry *AddExtension(
char* /*name*/, const char* /*name*/,
int /*NumEvents*/, int /*NumEvents*/,
int /*NumErrors*/, int /*NumErrors*/,
int (* /*MainProc*/)(ClientPtr /*client*/), int (* /*MainProc*/)(ClientPtr /*client*/),
@ -102,7 +102,7 @@ extern _X_EXPORT ExtensionEntry *AddExtension(
); );
extern _X_EXPORT Bool AddExtensionAlias( extern _X_EXPORT Bool AddExtensionAlias(
char* /*alias*/, const char* /*alias*/,
ExtensionEntry * /*extension*/); ExtensionEntry * /*extension*/);
extern _X_EXPORT ExtensionEntry *CheckExtension(const char *extname); extern _X_EXPORT ExtensionEntry *CheckExtension(const char *extname);

4
include/input.h
View File

@ -505,7 +505,7 @@ extern _X_EXPORT DeviceIntPtr GetPairedDevice(DeviceIntPtr kbd);
extern DeviceIntPtr GetMaster(DeviceIntPtr dev, int type); extern DeviceIntPtr GetMaster(DeviceIntPtr dev, int type);
extern _X_EXPORT int AllocDevicePair(ClientPtr client, extern _X_EXPORT int AllocDevicePair(ClientPtr client,
char* name, const char* name,
DeviceIntPtr* ptr, DeviceIntPtr* ptr,
DeviceIntPtr* keybd, DeviceIntPtr* keybd,
DeviceProc ptr_proc, DeviceProc ptr_proc,
@ -521,7 +521,7 @@ extern _X_EXPORT int generate_modkeymap(ClientPtr client, DeviceIntPtr dev,
extern int change_modmap(ClientPtr client, DeviceIntPtr dev, KeyCode *map, extern int change_modmap(ClientPtr client, DeviceIntPtr dev, KeyCode *map,
int max_keys_per_mod); int max_keys_per_mod);
extern int AllocXTestDevice(ClientPtr client, extern int AllocXTestDevice(ClientPtr client,
char* name, const char* name,
DeviceIntPtr* ptr, DeviceIntPtr* ptr,
DeviceIntPtr* keybd, DeviceIntPtr* keybd,
DeviceIntPtr master_ptr, DeviceIntPtr master_ptr,

6
mi/miinitext.c
View File

@ -268,7 +268,7 @@ extern void GEExtensionInit(INITARGS);
* configurable extensions. * configurable extensions.
*/ */
typedef struct { typedef struct {
char *name; const char *name;
Bool *disablePtr; Bool *disablePtr;
} ExtensionToggle; } ExtensionToggle;
@ -337,7 +337,7 @@ static ExtensionToggle ExtensionToggleList[] =
{ NULL, NULL } { NULL, NULL }
}; };
Bool EnableDisableExtension(char *name, Bool enable) Bool EnableDisableExtension(const char *name, Bool enable)
{ {
ExtensionToggle *ext = &ExtensionToggleList[0]; ExtensionToggle *ext = &ExtensionToggleList[0];
@ -357,7 +357,7 @@ Bool EnableDisableExtension(char *name, Bool enable)
return FALSE; return FALSE;
} }
void EnableDisableExtensionError(char *name, Bool enable) void EnableDisableExtensionError(const char *name, Bool enable)
{ {
ExtensionToggle *ext = &ExtensionToggleList[0]; ExtensionToggle *ext = &ExtensionToggleList[0];
Bool found = FALSE; Bool found = FALSE;

6
render/filter.c
View File

@ -47,7 +47,7 @@ static int nfilterNames;
*/ */
int int
PictureGetFilterId (char *filter, int len, Bool makeit) PictureGetFilterId (const char *filter, int len, Bool makeit)
{ {
int i; int i;
char *name; char *name;
@ -125,7 +125,7 @@ PictureFreeFilterIds (void)
int int
PictureAddFilter (ScreenPtr pScreen, PictureAddFilter (ScreenPtr pScreen,
char *filter, const char *filter,
PictFilterValidateParamsProcPtr ValidateParams, PictFilterValidateParamsProcPtr ValidateParams,
int width, int width,
int height) int height)
@ -160,7 +160,7 @@ PictureAddFilter (ScreenPtr pScreen,
} }
Bool Bool
PictureSetFilterAlias (ScreenPtr pScreen, char *filter, char *alias) PictureSetFilterAlias (ScreenPtr pScreen, const char *filter, const char *alias)
{ {
PictureScreenPtr ps = GetPictureScreen(pScreen); PictureScreenPtr ps = GetPictureScreen(pScreen);
int filter_id = PictureGetFilterId (filter, -1, FALSE); int filter_id = PictureGetFilterId (filter, -1, FALSE);

6
render/picturestr.h
View File

@ -433,20 +433,20 @@ extern _X_EXPORT Bool
PictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats); PictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats);
extern _X_EXPORT int extern _X_EXPORT int
PictureGetFilterId (char *filter, int len, Bool makeit); PictureGetFilterId (const char *filter, int len, Bool makeit);
extern _X_EXPORT char * extern _X_EXPORT char *
PictureGetFilterName (int id); PictureGetFilterName (int id);
extern _X_EXPORT int extern _X_EXPORT int
PictureAddFilter (ScreenPtr pScreen, PictureAddFilter (ScreenPtr pScreen,
char *filter, const char *filter,
PictFilterValidateParamsProcPtr ValidateParams, PictFilterValidateParamsProcPtr ValidateParams,
int width, int width,
int height); int height);
extern _X_EXPORT Bool extern _X_EXPORT Bool
PictureSetFilterAlias (ScreenPtr pScreen, char *filter, char *alias); PictureSetFilterAlias (ScreenPtr pScreen, const char *filter, const char *alias);
extern _X_EXPORT Bool extern _X_EXPORT Bool
PictureSetDefaultFilters (ScreenPtr pScreen); PictureSetDefaultFilters (ScreenPtr pScreen);