From f91dd7880f28e881c62102c22f496afb547950c7 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sat, 18 Mar 2000 18:57:16 +0000
Subject: [PATCH] Clean up minor compiler warnings.
---
src/backend/utils/adt/pg_locale.c | 4 ++--
src/include/utils/pg_locale.h | 4 ++--
src/interfaces/odbc/convert.c | 7 +++----
src/interfaces/odbc/misc.c | 28 +++++++++++-----------------
src/interfaces/odbc/misc.h | 4 ++--
src/interfaces/odbc/options.c | 1 -
src/interfaces/odbc/pgtypes.c | 5 +++--
src/interfaces/odbc/results.c | 2 +-
8 files changed, 24 insertions(+), 31 deletions(-)
diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c
index 1711eb269ad..114cd08e259 100644
--- 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 ac940c1b55e..21e9a6d0f5a 100644
--- 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 4cfe8d4567d..cef75b258a4 100644
--- 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 7c0a18f9658..2833a353530 100644
--- 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 10cb5114d13..0cbe92856b1 100644
--- 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 ed34a1ca022..589a9de5702 100644
--- 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 3ee5e75c4e5..2fedd8f5f90 100644
--- 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 a6703290f16..fe081673611 100644
--- 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;
--
GitLab