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

Mark arguments to fopen/popen/system wrappers as const char * 

Silencing more gcc -Wwrite-strings warnings

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-03 21:10:51 -07:00
parent 3d0ece5e84
commit cccafabd56
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/os.h
View File

@ -307,10 +307,10 @@ extern _X_EXPORT void OsReleaseSignals (void);
extern _X_EXPORT void OsAbort (void) _X_NORETURN; extern _X_EXPORT void OsAbort (void) _X_NORETURN;
#if !defined(WIN32) #if !defined(WIN32)
extern _X_EXPORT int System(char *); extern _X_EXPORT int System(const char *);
extern _X_EXPORT pointer Popen(char *, char *); extern _X_EXPORT pointer Popen(const char *, const char *);
extern _X_EXPORT int Pclose(pointer); extern _X_EXPORT int Pclose(pointer);
extern _X_EXPORT pointer Fopen(char *, char *); extern _X_EXPORT pointer Fopen(const char *, const char *);
extern _X_EXPORT int Fclose(pointer); extern _X_EXPORT int Fclose(pointer);
#else #else
#define System(a) system(a) #define System(a) system(a)

6
os/utils.c
View File

@ -1252,7 +1252,7 @@ OsAbort (void)
*/ */
int int
System(char *command) System(const char *command)
{ {
int pid, p; int pid, p;
void (*csig)(int); void (*csig)(int);
@ -1302,7 +1302,7 @@ static struct pid {
OsSigHandlerPtr old_alarm = NULL; /* XXX horrible awful hack */ OsSigHandlerPtr old_alarm = NULL; /* XXX horrible awful hack */
pointer pointer
Popen(char *command, char *type) Popen(const char *command, const char *type)
{ {
struct pid *cur; struct pid *cur;
FILE *iop; FILE *iop;
@ -1388,7 +1388,7 @@ Popen(char *command, char *type)
/* fopen that drops privileges */ /* fopen that drops privileges */
pointer pointer
Fopen(char *file, char *type) Fopen(const char *file, const char *type)
{ {
FILE *iop; FILE *iop;
#ifndef HAS_SAVED_IDS_AND_SETEUID #ifndef HAS_SAVED_IDS_AND_SETEUID