Mesa (glsl-pp-rework-2): glsl/apps: Include missing header, properly escape format strings.

Michał Król michal at kemper.freedesktop.org
Thu Sep 24 08:58:10 UTC 2009


Module: Mesa
Branch: glsl-pp-rework-2
Commit: e8e3fe15e1b0f75c43e197f8875a7fae1468f584
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e8e3fe15e1b0f75c43e197f8875a7fae1468f584

Author: Michal Krol <michal at vmware.com>
Date:   Thu Sep 24 10:55:37 2009 +0200

glsl/apps: Include missing header, properly escape format strings.

---

 src/glsl/apps/process.c  |    5 +++--
 src/glsl/apps/purify.c   |    1 +
 src/glsl/apps/tokenise.c |    5 +++--
 src/glsl/apps/version.c  |    1 +
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/glsl/apps/process.c b/src/glsl/apps/process.c
index 28b415c..e20b68b 100644
--- a/src/glsl/apps/process.c
+++ b/src/glsl/apps/process.c
@@ -27,6 +27,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <assert.h>
 #include "../pp/sl_pp_public.h"
 
@@ -235,11 +236,11 @@ main(int argc,
          break;
 
       case SL_PP_MODASSIGN:
-         fprintf(out, "%= ");
+         fprintf(out, "%%= ");
          break;
 
       case SL_PP_MODULO:
-         fprintf(out, "% ");
+         fprintf(out, "%% ");
          break;
 
       case SL_PP_LSHIFTASSIGN:
diff --git a/src/glsl/apps/purify.c b/src/glsl/apps/purify.c
index 435bdbe..53ba253 100644
--- a/src/glsl/apps/purify.c
+++ b/src/glsl/apps/purify.c
@@ -27,6 +27,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include "../pp/sl_pp_public.h"
 
 
diff --git a/src/glsl/apps/tokenise.c b/src/glsl/apps/tokenise.c
index 9f95424..d6b9c4f 100644
--- a/src/glsl/apps/tokenise.c
+++ b/src/glsl/apps/tokenise.c
@@ -27,6 +27,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <assert.h>
 #include "../pp/sl_pp_public.h"
 
@@ -219,11 +220,11 @@ main(int argc,
          break;
 
       case SL_PP_MODASSIGN:
-         fprintf(out, "%= ");
+         fprintf(out, "%%= ");
          break;
 
       case SL_PP_MODULO:
-         fprintf(out, "% ");
+         fprintf(out, "%% ");
          break;
 
       case SL_PP_LSHIFTASSIGN:
diff --git a/src/glsl/apps/version.c b/src/glsl/apps/version.c
index f259431..4570f86 100644
--- a/src/glsl/apps/version.c
+++ b/src/glsl/apps/version.c
@@ -27,6 +27,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <assert.h>
 #include "../pp/sl_pp_public.h"
 




More information about the mesa-commit mailing list