From: Michal Krol <michal@vmware.com>
Date: Mon, 9 Nov 2009 23:15:54 +0000 (+0100)
Subject: glsl/apps: Update for glsl/pp interface changes.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b5c8c87eab4cbc4f05cbd98d7647b9b83607f976;p=mesa.git

glsl/apps: Update for glsl/pp interface changes.
---

diff --git a/src/glsl/apps/process.c b/src/glsl/apps/process.c
index e20b68b1a9a..7f392613e09 100644
--- a/src/glsl/apps/process.c
+++ b/src/glsl/apps/process.c
@@ -41,6 +41,8 @@ main(int argc,
    char *inbuf;
    struct sl_pp_purify_options options;
    char *outbuf;
+   char errmsg[100] = "";
+   unsigned int errline = 0;
    struct sl_pp_context *context;
    struct sl_pp_token_info *tokens;
    unsigned int version;
@@ -91,8 +93,8 @@ main(int argc,
 
    memset(&options, 0, sizeof(options));
 
-   if (sl_pp_purify(inbuf, &options, &outbuf)) {
-      fprintf(out, "$PURIFYERROR\n");
+   if (sl_pp_purify(inbuf, &options, &outbuf, errmsg, sizeof(errmsg), &errline)) {
+      fprintf(out, "$PURIFYERROR %s\n", errmsg);
 
       free(inbuf);
       fclose(out);
diff --git a/src/glsl/apps/purify.c b/src/glsl/apps/purify.c
index 53ba2530225..8c01f4fc6a3 100644
--- a/src/glsl/apps/purify.c
+++ b/src/glsl/apps/purify.c
@@ -40,6 +40,8 @@ main(int argc,
    char *inbuf;
    struct sl_pp_purify_options options;
    char *outbuf;
+   char errmsg[100] = "";
+   unsigned int errline = 0;
    FILE *out;
 
    if (argc != 3) {
@@ -84,8 +86,8 @@ main(int argc,
 
    memset(&options, 0, sizeof(options));
 
-   if (sl_pp_purify(inbuf, &options, &outbuf)) {
-      fprintf(out, "$PURIFYERROR\n");
+   if (sl_pp_purify(inbuf, &options, &outbuf, errmsg, sizeof(errmsg), &errline)) {
+      fprintf(out, "$PURIFYERROR %u: %s\n", errline, errmsg);
 
       free(inbuf);
       fclose(out);
diff --git a/src/glsl/apps/tokenise.c b/src/glsl/apps/tokenise.c
index d6b9c4fa045..9dd9631a4ed 100644
--- a/src/glsl/apps/tokenise.c
+++ b/src/glsl/apps/tokenise.c
@@ -41,6 +41,8 @@ main(int argc,
    char *inbuf;
    struct sl_pp_purify_options options;
    char *outbuf;
+   char errmsg[100] = "";
+   unsigned int errline = 0;
    struct sl_pp_context *context;
    struct sl_pp_token_info *tokens;
    FILE *out;
@@ -88,8 +90,8 @@ main(int argc,
 
    memset(&options, 0, sizeof(options));
 
-   if (sl_pp_purify(inbuf, &options, &outbuf)) {
-      fprintf(out, "$PURIFYERROR\n");
+   if (sl_pp_purify(inbuf, &options, &outbuf, errmsg, sizeof(errmsg), &errline)) {
+      fprintf(out, "$PURIFYERROR %s\n", errmsg);
 
       free(inbuf);
       fclose(out);
diff --git a/src/glsl/apps/version.c b/src/glsl/apps/version.c
index 4570f86217e..1127dae5161 100644
--- a/src/glsl/apps/version.c
+++ b/src/glsl/apps/version.c
@@ -41,6 +41,8 @@ main(int argc,
    char *inbuf;
    struct sl_pp_purify_options options;
    char *outbuf;
+   char errmsg[100] = "";
+   unsigned int errline = 0;
    struct sl_pp_context *context;
    struct sl_pp_token_info *tokens;
    unsigned int version;
@@ -89,8 +91,8 @@ main(int argc,
 
    memset(&options, 0, sizeof(options));
 
-   if (sl_pp_purify(inbuf, &options, &outbuf)) {
-      fprintf(out, "$PURIFYERROR\n");
+   if (sl_pp_purify(inbuf, &options, &outbuf, errmsg, sizeof(errmsg), &errline)) {
+      fprintf(out, "$PURIFYERROR %s\n", errmsg);
 
       free(inbuf);
       fclose(out);