Clean up minor compiler warnings.

diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c
index 1711eb269ad370183d88a290cedcd671b636ae56..114cd08e259e81941c70efa3ed662ea4f3e4ff12 100644 (file)
--- a/src/backend/utils/adt/pg_locale.c
+++ b/src/backend/utils/adt/pg_locale.c
@@ -2,7 +2,7 @@
 /* -----------------------------------------------------------------------
  * pg_locale.c
  *
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/pg_locale.c,v 1.2 2000/02/08 15:56:55 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/pg_locale.c,v 1.3 2000/03/18 18:57:14 tgl Exp $
  *
  *
  *   Portions Copyright (c) 1999-2000, PostgreSQL, Inc
@@ -109,7 +109,7 @@ PGLC_setlocale( PG_LocaleCategories *lc )
  *------
  */
 struct lconv *
-PGLC_localeconv()
+PGLC_localeconv(void)
 {
        PG_LocaleCategories     lc;
        struct lconv            *lconv;

diff --git a/src/include/utils/pg_locale.h b/src/include/utils/pg_locale.h
index ac940c1b55e9d6784489fd4a308b22043dd0efb8..21e9a6d0f5a23b8e23ad19bbd7bdaeed7d911759 100644 (file)
--- a/src/include/utils/pg_locale.h
+++ b/src/include/utils/pg_locale.h
@@ -2,7 +2,7 @@
 /* -----------------------------------------------------------------------
  * pg_locale.h
  *
- * $Header: /cvsroot/pgsql/src/include/utils/pg_locale.h,v 1.2 2000/02/08 15:57:01 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/include/utils/pg_locale.h,v 1.3 2000/03/18 18:57:15 tgl Exp $
  *
  *
  *   Portions Copyright (c) 1999-2000, PostgreSQL, Inc
@@ -43,7 +43,7 @@ extern PG_LocaleCategories *PGLC_setlocale( PG_LocaleCategories *lc );
  * on current locale catogories setting - in contrast to standard localeconv().
  *------
  */
-extern struct lconv *PGLC_localeconv();
+extern struct lconv *PGLC_localeconv(void);
 
  
 #endif /* USE_LOCALE */

diff --git a/src/interfaces/odbc/convert.c b/src/interfaces/odbc/convert.c
index 4cfe8d4567d7274e27876b5d0ae881e18193e174..cef75b258a4a9c6814059f6006b6ddfef80ac090 100644 (file)
--- a/src/interfaces/odbc/convert.c
+++ b/src/interfaces/odbc/convert.c
@@ -1372,10 +1372,9 @@ int
 convert_lo(StatementClass *stmt, void *value, Int2 fCType, PTR rgbValue, 
                   SDWORD cbValueMax, SDWORD *pcbValue)
 {
-Oid oid;
-int retval, result, left = -1;
-int bind_row = stmt->bind_row;
-BindInfoClass *bindInfo = NULL;
+       Oid oid;
+       int retval, result, left = -1;
+       BindInfoClass *bindInfo = NULL;
 
 
 /*     If using SQLGetData, then current_col will be set */

diff --git a/src/interfaces/odbc/misc.c b/src/interfaces/odbc/misc.c
index 7c0a18f96584c4814ab31a00c1828eac7692988e..2833a3535306f54096ba2ce4cac551f3e05c8103 100644 (file)
--- a/src/interfaces/odbc/misc.c
+++ b/src/interfaces/odbc/misc.c
@@ -13,7 +13,7 @@
  */
 
 #include <stdio.h>
-#include <varargs.h>
+#include <stdarg.h>
 #include <string.h>
 
 #include "psqlodbc.h"
@@ -57,17 +57,14 @@ generate_filename(char* dirname,char* prefix,char* filename)
 #ifdef MY_LOG
 
 void
-mylog(va_alist)
-va_dcl
+mylog(char * fmt, ...)
 {
-char *fmt;
-va_list args;
-char filebuf[80];
+       va_list args;
+       char filebuf[80];
        FILE* LOGFP = globals.mylogFP;
 
        if ( globals.debug) {
-               va_start(args);
-               fmt = va_arg(args, char *);
+               va_start(args, fmt);
 
                if (! LOGFP) {
                        generate_filename(MYLOGDIR,MYLOGFILE,filebuf);
@@ -91,18 +88,15 @@ char filebuf[80];
 
 #ifdef Q_LOG
 
-void qlog(va_alist)
-va_dcl
+void
+qlog(char * fmt, ...)
 {
-char *fmt;
-va_list args;
-char filebuf[80];
-FILE* LOGFP = globals.qlogFP;
+       va_list args;
+       char filebuf[80];
+       FILE* LOGFP = globals.qlogFP;
 
        if ( globals.commlog) {
-               va_start(args);
-               fmt = va_arg(args, char *);
-
+               va_start(args, fmt);
 
                if (! LOGFP) {
                        generate_filename(QLOGDIR,QLOGFILE,filebuf);

diff --git a/src/interfaces/odbc/misc.h b/src/interfaces/odbc/misc.h
index 10cb5114d13a0597e5217d632575e41f03761cef..0cbe92856b1013a39a014b8b484a5418a07c4ff6 100644 (file)
--- a/src/interfaces/odbc/misc.h
+++ b/src/interfaces/odbc/misc.h
@@ -45,7 +45,7 @@
   #else
     #define MYLOGDIR   "c:"
   #endif
-  void mylog();        /* prototype */
+  extern void mylog(char * fmt, ...);
 #else
   #ifndef WIN32
     #define mylog(args...)     /* GNU convention for variable arguments */
@@ -61,7 +61,7 @@
   #else
     #define QLOGDIR            "c:"
   #endif
-  void qlog(); /* prototype */
+  extern void qlog(char * fmt, ...);
 #else
   #ifndef WIN32
     #define qlog(args...)      /* GNU convention for variable arguments */

diff --git a/src/interfaces/odbc/options.c b/src/interfaces/odbc/options.c
index ed34a1ca022d41c6739589c4bde9e5060f86b389..589a9de5702868e82ca5f271b32f540fb425512f 100644 (file)
--- a/src/interfaces/odbc/options.c
+++ b/src/interfaces/odbc/options.c
@@ -474,7 +474,6 @@ RETCODE SQL_API SQLSetStmtOption(
 {
 static char *func="SQLSetStmtOption";
 StatementClass *stmt = (StatementClass *) hstmt;
-char changed = FALSE;
 
        mylog("%s: entering...\n", func);
 

diff --git a/src/interfaces/odbc/pgtypes.c b/src/interfaces/odbc/pgtypes.c
index 3ee5e75c4e5de48ae7e77828a3d5f2c8661529b3..2fedd8f5f90fafadc2025c6274dd56a05569f330 100644 (file)
--- a/src/interfaces/odbc/pgtypes.c
+++ b/src/interfaces/odbc/pgtypes.c
@@ -177,6 +177,7 @@ Int4 pgType;
                break;
 
        default:
+               pgType = 0;     /* ??? */
                break;
        }
 
@@ -310,7 +311,7 @@ char *pgtype_to_name(StatementClass *stmt, Int4 type)
        }    
 }
 
-Int2
+static Int2
 getNumericScale(StatementClass *stmt, Int4 type, int col)
 {
 Int4 atttypmod;
@@ -342,7 +343,7 @@ mylog("getNumericScale: type=%d, col=%d, unknown = %d\n", type,col);
                        PG_NUMERIC_MAX_SCALE);
 }
 
-Int4
+static Int4
 getNumericPrecision(StatementClass *stmt, Int4 type, int col)
 {
 Int4 atttypmod;

diff --git a/src/interfaces/odbc/results.c b/src/interfaces/odbc/results.c
index a6703290f16595f68bbac560167a3d510e3f72c1..fe0816736115d383771b0ede5a7874a74d5ef917 100644 (file)
--- a/src/interfaces/odbc/results.c
+++ b/src/interfaces/odbc/results.c
@@ -608,7 +608,7 @@ QResultClass *res;
 StatementClass *stmt = (StatementClass *) hstmt;
 int num_cols, num_rows;
 Int4 field_type;
-void *value;
+void *value = NULL;
 int result;
 char get_bookmark = FALSE;