summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2013-07-18 22:58:10 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2013-07-18 22:58:10 -0700
commit09ab37f816d2fe9482574c825132d9b516b8e0bf (patch)
tree29910403bea3adafae93c25f8f75736b82baaab8
parent1dd71b4eae433896e41f8366f23b8269712b4cf3 (diff)
downloadxorg-app-xinit-09ab37f816d2fe9482574c825132d9b516b8e0bf.tar.gz
Declare processTimeout() as taking a const string arg
Fixes gcc const warnings on every call to it Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--xinit.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/xinit.c b/xinit.c
index 873b4fa..eec4a2b 100644
--- a/xinit.c
+++ b/xinit.c
@@ -107,7 +107,7 @@ volatile int gotSignal = 0;
static void Execute(char **vec);
static Bool waitforserver(void);
-static Bool processTimeout(int timeout, char *string);
+static Bool processTimeout(int timeout, const char *string);
static int startServer(char *server[]);
static int startClient(char *client[]);
static int ignorexio(Display *dpy);
@@ -364,10 +364,10 @@ waitforserver(void)
* return TRUE if we timeout waiting for pid to exit, FALSE otherwise.
*/
static Bool
-processTimeout(int timeout, char *string)
+processTimeout(int timeout, const char *string)
{
int i = 0, pidfound = -1;
- static char *laststring;
+ static const char *laststring;
for (;;) {
if ((pidfound = waitpid(serverpid, &status, WNOHANG)) == serverpid)