From: Frédéric Dalleau <frederic.dalleau@linux.intel.com>
Date: Thu, 29 Aug 2013 09:32:16 +0000 (+0200)
Subject: VirtGL: Fix compilation warning in opengl_strtok
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~749^2~30
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cedfbdeca3530da567c230cf8811365abdfe41ad;p=sdk%2Femulator%2Fqemu.git

VirtGL: Fix compilation warning in opengl_strtok

This is the first of a long series to fix compilation warning of VirtGL.
opengl_exec and serverstub first.

Conflicts:

	tizen/src/hw/opengl_exec.c

Change-Id: I6aee1309337b27392fc4733cccb7190ac4045ef4
---

diff --git a/tizen/src/hw/opengl_exec.c b/tizen/src/hw/opengl_exec.c
index 3551b0b8f5..33e22d0408 100644
--- a/tizen/src/hw/opengl_exec.c
+++ b/tizen/src/hw/opengl_exec.c
@@ -1297,9 +1297,9 @@ void vmgl_context_switch(ProcessStruct *p, int switch_gl_context)
     }
 }
 
-static const char *opengl_strtok(const char *s, int *n, char **saveptr, char *prevbuf)
+static const char *opengl_strtok(const char *s, int *n, char const **saveptr, char *prevbuf)
 {
-	char *start;
+	const char *start;
 	char *ret;
 	char *p;
 	int retlen;
@@ -1353,7 +1353,7 @@ static const char *opengl_strtok(const char *s, int *n, char **saveptr, char *pr
 
 	if (retlen == 0) {
 		*p = 0;
-		return NULL;
+		return ret;
 	}
 
 	while (retlen > 0) {
@@ -1381,7 +1381,7 @@ static const char *opengl_strtok(const char *s, int *n, char **saveptr, char *pr
 
 static char *do_eglShaderPatch(const char *source, int length, int *patched_len)
 {
-	char *saveptr = NULL;
+	const char *saveptr = NULL;
 	char *sp;
 	char *p = NULL;