[Silgraphite-cvs] silgraphite/src/GrCompiler/GdlPp cpp1.c,1.1,1.2 cpp2.c,1.1,1.2 cpp3.c,1.1,1.2 cpp4.c,1.1,1.2 cpp5.c,1.2,1.3 cpp6.c,1.1,1.2 memory.c,1.1,1.2 usecpp.c,1.1,1.2

[<sil...@li...>]

Update of /cvsroot/silgraphite/silgraphite/src/GrCompiler/GdlPp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3406

Modified Files:
	cpp1.c cpp2.c cpp3.c cpp4.c cpp5.c cpp6.c memory.c usecpp.c 
Log Message:
gcc prefers some extra brackets - remove warnings

Index: cpp1.c
===================================================================
RCS file: /cvsroot/silgraphite/silgraphite/src/GrCompiler/GdlPp/cpp1.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cpp1.c	21 Apr 2003 21:24:18 -0000	1.1
+++ cpp1.c	25 Oct 2004 19:08:41 -0000	1.2
@@ -15,6 +15,9 @@
  *
  * ----------------------------------------------------------------------------
  * $Log$
+ * Revision 1.2  2004/10/25 19:08:41  danglassey
+ * gcc prefers some extra brackets - remove warnings
+ *
  * Revision 1.1  2003/04/21 21:24:18  wardak
  * Add files for the GDL pre-processor (gdlpp.exe).
  *
@@ -471,7 +474,7 @@
 	    Putstring(global, global->spacebuf); /* Output all whitespaces */
 	  }
 	}
-	if(ret=macroid(global, &c))   /* Grab the token       */
+	if((ret=macroid(global, &c)))   /* Grab the token       */
 	  return(ret);
       } while (type[c] == LET && catenate(global, &ret) && !ret);
       if(ret)

Index: cpp2.c
===================================================================
RCS file: /cvsroot/silgraphite/silgraphite/src/GrCompiler/GdlPp/cpp2.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cpp2.c	21 Apr 2003 21:24:18 -0000	1.1
+++ cpp2.c	25 Oct 2004 19:08:41 -0000	1.2
@@ -15,6 +15,9 @@
  *
  * ----------------------------------------------------------------------------
  * $Log$
+ * Revision 1.2  2004/10/25 19:08:41  danglassey
+ * gcc prefers some extra brackets - remove warnings
+ *
  * Revision 1.1  2003/04/21 21:24:18  wardak
  * Add files for the GDL pre-processor (gdlpp.exe).
  *
@@ -244,7 +247,7 @@
 
             while( c != '\n' && c != EOF_CHAR )
                 {
-                if( ret = save( global, c ) )
+                if( (ret = save( global, c )) )
                     return(ret);
 
                 c = get( global );
@@ -252,7 +255,7 @@
 
             unget( global );
 
-            if( ret = save( global, EOS ) )
+            if( (ret = save( global, EOS )) )
                 return(ret);
 
             /*
@@ -598,7 +601,7 @@
 
     delim = skipws( global );
 
-    if( ret = macroid( global, &delim ) )
+    if( (ret = macroid( global, &delim )) )
         return(ret);
 
     if( delim != '<' && delim != '"' )
@@ -614,7 +617,7 @@
     global->workp = global->work;
 
     while( (c = get(global)) != '\n' && c != EOF_CHAR )
-        if( ret = save( global, c ) )       /* Put it away.                */
+        if( (ret = save( global, c )) )       /* Put it away.                */
             return( ret );
 
     unget( global );                        /* Force nl after include      */

Index: cpp3.c
===================================================================
RCS file: /cvsroot/silgraphite/silgraphite/src/GrCompiler/GdlPp/cpp3.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cpp3.c	21 Apr 2003 21:24:18 -0000	1.1
+++ cpp3.c	25 Oct 2004 19:08:41 -0000	1.2
@@ -15,6 +15,9 @@
  *
  * ----------------------------------------------------------------------------
  * $Log$
+ * Revision 1.2  2004/10/25 19:08:41  danglassey
+ * gcc prefers some extra brackets - remove warnings
+ *
  * Revision 1.1  2003/04/21 21:24:18  wardak
  * Add files for the GDL pre-processor (gdlpp.exe).
  *
@@ -237,7 +240,7 @@
 	char *text=(char *)tags->data;
 
 	sizp = size_table;
-	if (isdatum = (*text != '*')) /* If it's just -S,     */
+	if ( (isdatum = (*text != '*')) ) /* If it's just -S,     */
 	  endtest = T_FPTR;	/* Stop here		*/
 	else {			/* But if it's -S*      */
 	  text++;		/* Step over '*'        */

Index: cpp4.c
===================================================================
RCS file: /cvsroot/silgraphite/silgraphite/src/GrCompiler/GdlPp/cpp4.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cpp4.c	21 Apr 2003 21:24:18 -0000	1.1
+++ cpp4.c	25 Oct 2004 19:08:41 -0000	1.2
@@ -15,6 +15,9 @@
  *
  * ----------------------------------------------------------------------------
  * $Log$
+ * Revision 1.2  2004/10/25 19:08:41  danglassey
+ * gcc prefers some extra brackets - remove warnings
+ *
  * Revision 1.1  2003/04/21 21:24:18  wardak
  * Add files for the GDL pre-processor (gdlpp.exe).
  *
@@ -175,7 +178,7 @@
       }
       while (global->workp > global->work && type[global->workp[-1]] == SPA)
 	--global->workp;		/* Erase leading spaces */
-      if(ret=save(global, TOK_SEP))     /* Stuff a delimiter    */
+      if((ret=save(global, TOK_SEP)))     /* Stuff a delimiter    */
 	return(ret);
       c = skipws(global);               /* Eat whitespace       */
       continue;

Index: cpp5.c
===================================================================
RCS file: /cvsroot/silgraphite/silgraphite/src/GrCompiler/GdlPp/cpp5.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cpp5.c	17 Jul 2003 10:16:34 -0000	1.2
+++ cpp5.c	25 Oct 2004 19:08:41 -0000	1.3
@@ -15,6 +15,9 @@
  *
  * ----------------------------------------------------------------------------
  * $Log$
+ * Revision 1.3  2004/10/25 19:08:41  danglassey
+ * gcc prefers some extra brackets - remove warnings
+ *
  * Revision 1.2  2003/07/17 10:16:34  mhosken
  * Main linux port checkin
  *
@@ -426,7 +429,7 @@
     loop=FALSE;
     do {					/* Collect the token	*/
       c = skipws(global);
-      if(ret=macroid(global, &c))
+      if((ret=macroid(global, &c)))
       return(ret);
       if (c == EOF_CHAR || c == '\n') {
 	unget(global);
@@ -567,7 +570,7 @@
    */
   typecode = 0;
   while ((c = skipws(global))) {
-    if(ret=macroid(global, &c))
+    if((ret=macroid(global, &c)))
       return(ret);
     /* (I) return on fail! */
     if (c  == EOF_CHAR || c == '\n') {

Index: cpp6.c
===================================================================
RCS file: /cvsroot/silgraphite/silgraphite/src/GrCompiler/GdlPp/cpp6.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cpp6.c	21 Apr 2003 21:24:18 -0000	1.1
+++ cpp6.c	25 Oct 2004 19:08:41 -0000	1.2
@@ -15,6 +15,9 @@
  *
  * ----------------------------------------------------------------------------
  * $Log$
+ * Revision 1.2  2004/10/25 19:08:41  danglassey
+ * gcc prefers some extra brackets - remove warnings
+ *
  * Revision 1.1  2003/04/21 21:24:18  wardak
  * Add files for the GDL pre-processor (gdlpp.exe).
  *
@@ -241,7 +244,7 @@
   if (global->infile != NULL && global->infile->fp != NULL)
     global->recursion = 0;
   while (type[*c] == LET && (dp = lookid(global, *c)) != NULL) {
-    if(ret=expand(global, dp))
+    if((ret=expand(global, dp)))
       return(ret);
     *c = get(global);
   }

Index: memory.c
===================================================================
RCS file: /cvsroot/silgraphite/silgraphite/src/GrCompiler/GdlPp/memory.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- memory.c	21 Apr 2003 21:24:18 -0000	1.1
+++ memory.c	25 Oct 2004 19:08:41 -0000	1.2
@@ -15,6 +15,9 @@
  *
  * ----------------------------------------------------------------------------
  * $Log$
+ * Revision 1.2  2004/10/25 19:08:41  danglassey
+ * gcc prefers some extra brackets - remove warnings
+ *
  * Revision 1.1  2003/04/21 21:24:18  wardak
  * Add files for the GDL pre-processor (gdlpp.exe).
  *
@@ -195,5 +198,5 @@
 #elif UNIX
     free((char *)MallocKey);
 #endif
-  } while(MallocKey=prev);
+  } while((MallocKey=prev));
 }

Index: usecpp.c
===================================================================
RCS file: /cvsroot/silgraphite/silgraphite/src/GrCompiler/GdlPp/usecpp.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- usecpp.c	21 Apr 2003 21:24:18 -0000	1.1
+++ usecpp.c	25 Oct 2004 19:08:41 -0000	1.2
@@ -15,6 +15,9 @@
  *
  * ----------------------------------------------------------------------------
  * $Log$
+ * Revision 1.2  2004/10/25 19:08:41  danglassey
+ * gcc prefers some extra brackets - remove warnings
+ *
  * Revision 1.1  2003/04/21 21:24:18  wardak
  * Add files for the GDL pre-processor (gdlpp.exe).
  *
@@ -278,7 +281,7 @@
     Length_U = ftell(PrefsFile_PF);
     fseek(PrefsFile_PF, 0, SEEK_SET);
 
-    if (*string = (char *)malloc(Length_U+1)) {
+    if ((*string = (char *)malloc(Length_U+1))) {
       fread(*string, 1, Length_U, PrefsFile_PF);
       (*string)[Length_U] = '\0';
       
@@ -292,9 +295,9 @@
   }
 
 #ifdef GDLPP
-  if(environ = getenv("GDLPP_PREFS")) {
+  if((environ = getenv("GDLPP_PREFS"))) {
 #else
-  if(environ = getenv("CPP_PREFS")) {
+  if((environ = getenv("CPP_PREFS"))) {
 #endif
     ret= !DoString(tagptr, environ);
     if(ret && *string)