[GRASS-SVN] r67560 - in grass/branches/releasebranch_7_0: include/defs lib/db/sqlp raster/r.mapcalc

[svn_grass at osgeo.org]

Author: neteler
Date: 2016-01-11 15:04:48 -0800 (Mon, 11 Jan 2016)
New Revision: 67560

Modified:
   grass/branches/releasebranch_7_0/include/defs/sqlp.h
   grass/branches/releasebranch_7_0/lib/db/sqlp/sqlp.l
   grass/branches/releasebranch_7_0/raster/r.mapcalc/mapcalc.l
   grass/branches/releasebranch_7_0/raster/r.mapcalc/mapcalc.y
Log:
Fix compiler warnings (trunk, r67518 + r67559)

Modified: grass/branches/releasebranch_7_0/include/defs/sqlp.h
===================================================================
--- grass/branches/releasebranch_7_0/include/defs/sqlp.h	2016-01-11 20:33:42 UTC (rev 67559)
+++ grass/branches/releasebranch_7_0/include/defs/sqlp.h	2016-01-11 23:04:48 UTC (rev 67560)
@@ -2,7 +2,7 @@
 #define GRASS_SQLPDEFS_H
 
 int my_yyinput(char *buf, int max_size);
-void yyerror(char *s);
+void yyerror(const char *s);
 int yyparse();
 int yywrap();
 

Modified: grass/branches/releasebranch_7_0/lib/db/sqlp/sqlp.l
===================================================================
--- grass/branches/releasebranch_7_0/lib/db/sqlp/sqlp.l	2016-01-11 20:33:42 UTC (rev 67559)
+++ grass/branches/releasebranch_7_0/lib/db/sqlp/sqlp.l	2016-01-11 23:04:48 UTC (rev 67560)
@@ -256,7 +256,7 @@
  * message and deposits it in a usefull place.
  *
  **********************************************************************/
-void yyerror( char *s )
+void yyerror( const char *s )
 {
 	snprintf( sqlpStmt->errmsg, 500, "%s processing '%s'", s, yytext );
 

Modified: grass/branches/releasebranch_7_0/raster/r.mapcalc/mapcalc.l
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.mapcalc/mapcalc.l	2016-01-11 20:33:42 UTC (rev 67559)
+++ grass/branches/releasebranch_7_0/raster/r.mapcalc/mapcalc.l	2016-01-11 23:04:48 UTC (rev 67560)
@@ -215,7 +215,7 @@
 
 
 .		{
-			fprintf(stderr, "syntax error: '%*s'\n", yyleng, yytext);
+			fprintf(stderr, "syntax error: '%*s'\n", (int) yyleng, yytext);
 			yyterminate();
 		}
 %%

Modified: grass/branches/releasebranch_7_0/raster/r.mapcalc/mapcalc.y
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.mapcalc/mapcalc.y	2016-01-11 20:33:42 UTC (rev 67559)
+++ grass/branches/releasebranch_7_0/raster/r.mapcalc/mapcalc.y	2016-01-11 23:04:48 UTC (rev 67560)
@@ -75,7 +75,7 @@
 extern int yylex(void);
 
 int yyparse(void);
-void yyerror(char *s);
+void yyerror(const char *s);
 
 %}
 
@@ -237,7 +237,7 @@
 	syntax_error_occurred = 1;
 }
 
-void yyerror(char *s)
+void yyerror(const char *s)
 {
 	fprintf(stderr, "%s\n", s);
 	syntax_error_occurred = 0;