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

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
index 0e509925b1e617be8bf82d065408b67a43f2f1c5..cdd257f7fb70bc58ddad0cd655746e8afdf32713 100644 (file)
--- 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
index 987e248b4ffa5d94f37ce72c9e81a0d7f901222d..00b87d580118959d5bd2f09b7c9de2a550a0fbe0 100644 (file)
--- 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
index c7128648e81120e1557efb9e5336e9d24a5f6ed5..06241c8ae8bd8779eaf51431912201359dbae1a8 100644 (file)
--- 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
index 03de51e0cc753581a7dc8749eb42987628577ae2..f3991ccc8a22f6c21b962b087a6e8c199b90f8c5 100644 (file)
--- 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
index 3bd4982eefc3cf32cf2926a8fdf719a64597999e..0c5b1478aae820e60d4033fa8a8ed21967c697bb 100644 (file)
--- 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
index 753c0abae5d935440cec08593729cb457dd9284b..9f784ac79944bd465c2e370b59ddcefc1dc7d475 100644 (file)
--- 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
index f16eb0921eeddb7102a9de984ad31786de6dd2cf..c5640baea486da603767b5eab498dcf1dc79636a 100644 (file)
--- 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
index 46e9d4904ab0e50be444ce5b89eb88b3478ed930..0d2a76e47b25ecf37fc3e6b88b51e69293e3283c 100644 (file)
--- 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
index 8d58af2817bdb78f6ea4af7d4fbac702365bded7..3e5fae096d55a2251571f520a2310d03dbfb6b91 100644 (file)
--- 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
index 928b3f2a57e28dfb13914e4f7812a925a7a1af4c..18e5b48971f65e7f82b0ccb5189431e00e8400dc 100644 (file)
--- 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
index 7d4854cfdf2ad04e60fa05d397851b8e9559c9f6..6d70a6496c7235c819f7d70777d3d7c1245a2b16 100644 (file)
--- 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
index ce4977fed24194d7e7cbeb40006b2823256cae9d..1c27c6e7a8f89e8dc047772355cf4b703c730b67 100644 (file)
--- 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
index d5c7e749663e368f57672ee270a87cfab51a1f95..29b14b20bd5387f6db41b4b8374eb99456a0ea70 100644 (file)
--- 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
index 46a371a6f897525f754349539a13653c9793491b..bf977cc9374b88488cbc884216475735641e15d2 100644 (file)
--- 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
index 367290d8eab967da729a50d95a3e325ed48b616b..475afaa60052dca6be3f012872aab677539a6e06 100644 (file)
--- 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
index a2f67412b7ff119a7b065f860cc566c873e931bb..a859b5f810aae3d311ee0fc8b5d416a81c8f62fb 100644 (file)
--- 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;