Warning cleanups for ecpg tests. Avoid doing pointer arithmetic on void *,

Neil Conway · Neil Conway · commit 4802bb57a6d5 · 2005-06-30T07:08:59.000Z
remove old-style function declarations, and mark a function "static".
There are some remaining warnings, but this fixes most of them, anyway.
diff --git a/src/interfaces/ecpg/test/dt_test.pgc b/src/interfaces/ecpg/test/dt_test.pgc
@@ -6,7 +6,7 @@
 #include <pgtypes_interval.h>
 
 int
-main()
+main(void)
 {
 	exec sql begin declare section;
 		date date1;
diff --git a/src/interfaces/ecpg/test/dyntest.pgc b/src/interfaces/ecpg/test/dyntest.pgc
@@ -2,7 +2,7 @@
  *
  * Copyright (c) 2000, Christof Petig <christof.petig@wtal.de>
  *
- * $PostgreSQL: pgsql/src/interfaces/ecpg/test/dyntest.pgc,v 1.10 2003/11/29 19:52:09 pgsql Exp $
+ * $PostgreSQL: pgsql/src/interfaces/ecpg/test/dyntest.pgc,v 1.11 2005/06/30 07:08:59 neilc Exp $
  */
 
 #include <stdio.h>
@@ -12,7 +12,7 @@
 exec sql include sql3types;
 exec sql include sqlca;
 
-static void error()
+static void error(void)
 {  printf("#%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc);
    exit(1);
 }
diff --git a/src/interfaces/ecpg/test/dyntest2.pgc b/src/interfaces/ecpg/test/dyntest2.pgc
@@ -2,7 +2,7 @@
  *
  * Copyright (c) 2000, Christof Petig <christof.petig@wtal.de>
  *
- * $PostgreSQL: pgsql/src/interfaces/ecpg/test/dyntest2.pgc,v 1.5 2003/11/29 19:52:09 pgsql Exp $
+ * $PostgreSQL: pgsql/src/interfaces/ecpg/test/dyntest2.pgc,v 1.6 2005/06/30 07:08:59 neilc Exp $
  */
 
 #include <stdio.h>
@@ -11,7 +11,7 @@
 exec sql include sql3types;
 exec sql include sqlca;
 
-static void error()
+static void error(void)
 {
    printf("\n#%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc);
    exit(1);
diff --git a/src/interfaces/ecpg/test/num_test.pgc b/src/interfaces/ecpg/test/num_test.pgc
@@ -3,7 +3,7 @@
 #include <decimal.h>
 
 int
-main()
+main(void)
 {
 	char *text="error\n";
 	numeric *value1, *value2, *res;
diff --git a/src/interfaces/ecpg/test/perftest.pgc b/src/interfaces/ecpg/test/perftest.pgc
@@ -21,7 +21,7 @@ print_result(long sec, long usec, char *text)
 }
 
 int
-main ()
+main (void)
 {
 exec sql begin declare section;
 	long i;
diff --git a/src/interfaces/ecpg/test/test1.pgc b/src/interfaces/ecpg/test/test1.pgc
@@ -27,7 +27,7 @@ exec sql type intarray is int[AMOUNT];
 typedef int intarray[AMOUNT];
 
 int
-main ()
+main(void)
 {
 exec sql begin declare section;
 exec sql ifdef NAMELEN;
diff --git a/src/interfaces/ecpg/test/test2.pgc b/src/interfaces/ecpg/test/test2.pgc
@@ -16,7 +16,7 @@ exec sql declare cur cursor for
        select name, born, age, married, children from meskes;
 
 int
-main ()
+main (void)
 {
 	exec sql struct birthinfo { long born; short age; };
 exec sql begin declare section;
diff --git a/src/interfaces/ecpg/test/test3.pgc b/src/interfaces/ecpg/test/test3.pgc
@@ -9,7 +9,7 @@ exec sql type str is varchar[10];
 #include <string.h>
 
 int
-main ()
+main (void)
 {
 exec sql begin declare section;
 	typedef struct { long born; short age; } birthinfo;
diff --git a/src/interfaces/ecpg/test/test4.pgc b/src/interfaces/ecpg/test/test4.pgc
@@ -7,7 +7,7 @@ exec sql whenever sqlerror sqlprint;
 exec sql include sqlca;
 
 int
-main ()
+main (void)
 {
 EXEC SQL BEGIN DECLARE SECTION;
 	int i = 1;
diff --git a/src/interfaces/ecpg/test/test5.pgc b/src/interfaces/ecpg/test/test5.pgc
@@ -14,7 +14,7 @@ struct TBempl
    };
 EXEC SQL END DECLARE SECTION;
 
-int main()
+int main(void)
 {
 EXEC SQL BEGIN DECLARE SECTION;
 struct TBempl empl;
diff --git a/src/interfaces/ecpg/test/test_desc.pgc b/src/interfaces/ecpg/test/test_desc.pgc
@@ -1,7 +1,7 @@
 EXEC SQL WHENEVER SQLERROR SQLPRINT;
 
 int
-main()
+main(void)
 {
 	EXEC SQL BEGIN DECLARE SECTION;
 	char *stmt1 = "INSERT INTO test1 VALUES (?, ?)";
diff --git a/src/interfaces/ecpg/test/test_informix.pgc b/src/interfaces/ecpg/test/test_informix.pgc
@@ -1,8 +1,8 @@
 #include "sqltypes.h"
 
-void openit(void);
+static void openit(void);
 
-int main()
+int main(void)
 {
 	$int i = 14; 
 	$decimal j, m, n;
@@ -73,7 +73,7 @@ int main()
 	return 0;
 }
 
-void openit(void)
+static void openit(void)
 {
 	$open c;
 }
diff --git a/src/interfaces/ecpg/test/test_init.pgc b/src/interfaces/ecpg/test/test_init.pgc
@@ -1,6 +1,6 @@
 exec sql include sqlca;
 
-int fa() { return 2; }
+int fa(void) { return 2; }
 int fb(int x) { return x; }
 int fc(const char *x) { return *x; }
 int fd(const char *x,int i) { return (*x)*i; }
@@ -22,7 +22,7 @@ namespace N
 };
 #endif
 
-int main()
+int main(void)
 { struct sa x,*y;
 exec sql begin declare section;
 int a=(int)2;
diff --git a/src/interfaces/ecpg/test/test_thread.pgc b/src/interfaces/ecpg/test/test_thread.pgc
@@ -70,7 +70,7 @@ int main(int argc, char *argv[])
     }
   for( n = 0; n < nthreads; n++ )
     {
-      pthread_create(&threads[n], NULL, test_thread, (void *)n + 1);
+      pthread_create(&threads[n], NULL, test_thread, (void *) (n + 1));
     }
 
   /* wait for thread completion */
diff --git a/src/interfaces/ecpg/test/test_thread_implicit.pgc b/src/interfaces/ecpg/test/test_thread_implicit.pgc
@@ -70,7 +70,7 @@ int main(int argc, char *argv[])
     }
   for( n = 0; n < nthreads; n++ )
     {
-      pthread_create(&threads[n], NULL, test_thread, (void *)n + 1);
+      pthread_create(&threads[n], NULL, test_thread, (void *) (n + 1));
     }
 
   /* wait for thread completion */
diff --git a/src/interfaces/ecpg/test/testdynalloc.pgc b/src/interfaces/ecpg/test/testdynalloc.pgc
@@ -2,7 +2,7 @@
 exec sql include sqlca;
 #include <stdlib.h>
 
-int main()
+int main(void)
 {  
    exec sql begin declare section;
    char **cpp=0;

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`#include <pgtypes_interval.h>`
`7`	`7`
`8`	`8`	`int`
`9`		`-main()`
	`9`	`+main(void)`
`10`	`10`	`{`
`11`	`11`	`exec sql begin declare section;`
`12`	`12`	`date date1;`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`*`
`3`	`3`	`* Copyright (c) 2000, Christof Petig <christof.petig@wtal.de>`
`4`	`4`	`*`
`5`		`- * $PostgreSQL: pgsql/src/interfaces/ecpg/test/dyntest.pgc,v 1.10 2003/11/29 19:52:09 pgsql Exp $`
	`5`	`+ * $PostgreSQL: pgsql/src/interfaces/ecpg/test/dyntest.pgc,v 1.11 2005/06/30 07:08:59 neilc Exp $`
`6`	`6`	`*/`
`7`	`7`
`8`	`8`	`#include <stdio.h>`
`@@ -12,7 +12,7 @@`
`12`	`12`	`exec sql include sql3types;`
`13`	`13`	`exec sql include sqlca;`
`14`	`14`
`15`		`-static void error()`
	`15`	`+static void error(void)`
`16`	`16`	`{ printf("#%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc);`
`17`	`17`	`exit(1);`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`#include <decimal.h>`
`4`	`4`
`5`	`5`	`int`
`6`		`-main()`
	`6`	`+main(void)`
`7`	`7`	`{`
`8`	`8`	`char *text="error\n";`
`9`	`9`	`numeric value1, value2, *res;`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ print_result(long sec, long usec, char *text)`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`int`
`24`		`-main ()`
	`24`	`+main (void)`
`25`	`25`	`{`
`26`	`26`	`exec sql begin declare section;`
`27`	`27`	`long i;`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ exec sql type intarray is int[AMOUNT];`
`27`	`27`	`typedef int intarray[AMOUNT];`
`28`	`28`
`29`	`29`	`int`
`30`		`-main ()`
	`30`	`+main(void)`
`31`	`31`	`{`
`32`	`32`	`exec sql begin declare section;`
`33`	`33`	`exec sql ifdef NAMELEN;`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ exec sql declare cur cursor for`
`16`	`16`	`select name, born, age, married, children from meskes;`
`17`	`17`
`18`	`18`	`int`
`19`		`-main ()`
	`19`	`+main (void)`
`20`	`20`	`{`
`21`	`21`	`exec sql struct birthinfo { long born; short age; };`
`22`	`22`	`exec sql begin declare section;`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ exec sql type str is varchar[10];`
`9`	`9`	`#include <string.h>`
`10`	`10`
`11`	`11`	`int`
`12`		`-main ()`
	`12`	`+main (void)`
`13`	`13`	`{`
`14`	`14`	`exec sql begin declare section;`
`15`	`15`	`typedef struct { long born; short age; } birthinfo;`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ exec sql whenever sqlerror sqlprint;`
`7`	`7`	`exec sql include sqlca;`
`8`	`8`
`9`	`9`	`int`
`10`		`-main ()`
	`10`	`+main (void)`
`11`	`11`	`{`
`12`	`12`	`EXEC SQL BEGIN DECLARE SECTION;`
`13`	`13`	`int i = 1;`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ struct TBempl`
`14`	`14`	`};`
`15`	`15`	`EXEC SQL END DECLARE SECTION;`
`16`	`16`
`17`		`-int main()`
	`17`	`+int main(void)`
`18`	`18`	`{`
`19`	`19`	`EXEC SQL BEGIN DECLARE SECTION;`
`20`	`20`	`struct TBempl empl;`