Renaming cleanup, no pgindent yet.

src/interfaces/ecpg/lib/ecpglib.c

@@ -863,12 +863,12 @@ ECPGtrans(int lineno, const char * transaction)
 	if ((res = PQexec(actual_connection->connection, transaction)) == NULL)
 	{
 		register_error(ECPG_TRANS, "Error in transaction processing line %d.", lineno);
-		return (FALSE);
+		return FALSE;
 	}
 	PQclear(res);
 	if (strcmp(transaction, "commit") == 0 || strcmp(transaction, "rollback") == 0)
 		committed = 1;
-	return (TRUE);
+	return TRUE;
 }
 
 bool

src/interfaces/ecpg/preproc/c_keywords.c

@@ -54,12 +54,12 @@ ScanCKeywordLookup(char *text)
 		middle = low + (high - low) / 2;
 		difference = strcmp(middle->name, text);
 		if (difference == 0)
-			return (middle);
+			return middle;
 		else if (difference < 0)
 			low = middle + 1;
 		else
 			high = middle - 1;
 	}
 
-	return (NULL);
+	return NULL;
 }

src/interfaces/ecpg/preproc/ecpg.c

@@ -76,10 +76,10 @@ main(int argc, char *const argv[])
 				for (ip = include_paths; ip != NULL; ip = ip->next)
 					fprintf(stderr, " %s\n", ip->path);
 				fprintf(stderr, "End of search list.\n");
-				return (OK);
+				return OK;
 			default:
 				usage(argv[0]);
-				return (ILLEGAL_OPTION);
+				return ILLEGAL_OPTION;
 		}
 	}
 
@@ -193,5 +193,5 @@ main(int argc, char *const argv[])
 			free(input_filename);
 		}
 	}
-	return (OK);
+	return OK;
 }

src/interfaces/ecpg/preproc/ecpg_keywords.c

@@ -55,12 +55,12 @@ ScanECPGKeywordLookup(char *text)
 		middle = low + (high - low) / 2;
 		difference = strcmp(middle->name, text);
 		if (difference == 0)
-			return (middle);
+			return middle;
 		else if (difference < 0)
 			low = middle + 1;
 		else
 			high = middle - 1;
 	}
 
-	return (NULL);
+	return NULL;
 }

src/interfaces/ecpg/preproc/keywords.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.3 1998/08/25 21:37:06 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.4 1998/09/01 03:28:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -234,12 +234,12 @@ ScanKeywordLookup(char *text)
 		middle = low + (high - low) / 2;
 		difference = strcmp(middle->name, text);
 		if (difference == 0)
-			return (middle);
+			return middle;
 		else if (difference < 0)
 			low = middle + 1;
 		else
 			high = middle - 1;
 	}
 
-	return (NULL);
+	return NULL;
 }

src/interfaces/ecpg/preproc/pgc.l

@@ -206,7 +206,7 @@ cppline		{space}*#.*(\\{space}*\n)*\n*
 					yylval.ival = strtol((char *)literal,&endptr,2);
 					if (*endptr != '\0' || errno == ERANGE)
 						yyerror("ERROR: Bad binary integer input!");
-					return (ICONST);
+					return ICONST;
 				}
 <xh>{xhinside}	|
 <xb>{xbinside}	{
@@ -232,7 +232,7 @@ cppline		{space}*#.*(\\{space}*\n)*\n*
 					yylval.ival = strtol((char *)literal,&endptr,16);
 					if (*endptr != '\0' || errno == ERANGE)
 						yyerror("ERROR: Bad hexadecimal integer input");
-					return (ICONST);
+					return ICONST;
 				}
 
 <SQL>{xqstart}		{
@@ -243,7 +243,7 @@ cppline		{space}*#.*(\\{space}*\n)*\n*
 <xq>{xqstop}	{
 					BEGIN(SQL);
 					yylval.str = strdup(scanstr(literal));
-					return (SCONST);
+					return SCONST;
 				}
 <xq>{xqdouble}	|
 <xq>{xqinside}	{
@@ -278,7 +278,7 @@ cppline		{space}*#.*(\\{space}*\n)*\n*
 <xd>{xdstop}	{
 					BEGIN(SQL);
 					yylval.str = strdup(literal);
-					return (CSTRING);
+					return CSTRING;
 				}
 <xd>{xdinside}	{
 					if ((llen+yyleng) > (MAX_PARSE_BUFFER - 1))
@@ -294,7 +294,7 @@ cppline		{space}*#.*(\\{space}*\n)*\n*
 <xdc>{xdstop}	{
 					BEGIN(C);
 					yylval.str = strdup(literal);
-					return (CSTRING);
+					return CSTRING;
 				}
 <xdc>{xdinside}	{
 					if ((llen+yyleng) > (MAX_PARSE_BUFFER - 1))
@@ -306,30 +306,30 @@ cppline		{space}*#.*(\\{space}*\n)*\n*
 <xm>{space}*	{ /* ignore */ }
 <xm>{xmstop}	{
 					BEGIN(SQL);
-					return (yytext[0]);
+					return yytext[0];
 				}
 
 
 <SQL>{typecast}			{ 	return TYPECAST; }
 <SQL>{self}/{space}*-[\.0-9]	{
 					BEGIN(xm);
-					return (yytext[0]);
+					return yytext[0];
 				}
-<SQL>{self}				{ 	return (yytext[0]); }
+<SQL>{self}				{ 	return yytext[0]; }
 <SQL>{operator}/-[\.0-9]	{
 					yylval.str = strdup((char*)yytext);
-					return (Op);
+					return Op;
 				}
 <SQL>{operator}		{
 					if (strcmp((char*)yytext,"!=") == 0)
 						yylval.str = strdup("<>"); /* compatability */
 					else
 						yylval.str = strdup((char*)yytext);
-					return (Op);
+					return Op;
 				}
 <SQL>{param}			{
 					yylval.ival = atoi((char*)&yytext[1]);
-					return (PARAM);
+					return PARAM;
 				}
 <SQL>{identifier}/{space}*-{number}	{
 					int i;
@@ -342,13 +342,13 @@ cppline		{space}*#.*(\\{space}*\n)*\n*
 
 					keyword = ScanKeywordLookup((char*)yytext);
 					if (keyword != NULL) {
-						return (keyword->value);
+						return keyword->value;
 					}
 					else
 					{
 						keyword = ScanECPGKeywordLookup((char*)yytext);
 						if (keyword != NULL) {
-							return (keyword->value);
+							return keyword->value;
 						}
 						else
 						{
@@ -376,7 +376,7 @@ cppline		{space}*#.*(\\{space}*\n)*\n*
 							if (ptr == NULL) 
 							{
 								yylval.str = strdup((char*)yytext);
-								return (IDENT);
+								return IDENT;
 							}
 						}
 					}
@@ -394,9 +394,9 @@ cppline		{space}*#.*(\\{space}*\n)*\n*
 						if (*endptr != '\0' || errno == ERANGE)
 							yyerror("ERROR: Bad integer input");
 						yyerror("WARNING: Integer input is out of range; promoted to float");
-						return (FCONST);
+						return FCONST;
 					}
-					return (ICONST);
+					return ICONST;
 				}
 <SQL>{real}/{space}*-{number} {
 					char* endptr;
@@ -406,7 +406,7 @@ cppline		{space}*#.*(\\{space}*\n)*\n*
 					yylval.dval = strtod(((char *)yytext),&endptr);
 					if (*endptr != '\0' || errno == ERANGE)
 						yyerror("ERROR: Bad float8 input");
-					return (FCONST);
+					return FCONST;
 				}
 <SQL>{integer}		{
 					char* endptr;
@@ -420,9 +420,9 @@ cppline		{space}*#.*(\\{space}*\n)*\n*
 						if (*endptr != '\0' || errno == ERANGE)
 							yyerror("ERROR: Bad integer input");
 						yyerror("WARNING: Integer input is out of range; promoted to float");
-						return (FCONST);
+						return FCONST;
 					}
-					return (ICONST);
+					return ICONST;
 				}
 <SQL>{real}			{
 					char* endptr;
@@ -431,7 +431,7 @@ cppline		{space}*#.*(\\{space}*\n)*\n*
 					yylval.dval = strtod((char *)yytext,&endptr);
 					if (*endptr != '\0' || errno == ERANGE)
 						yyerror("ERROR: Bad float input");
-					return (FCONST);
+					return FCONST;
 				}
 <C>{integer}/{space}*-{number}	{
 					char* endptr;
@@ -446,9 +446,9 @@ cppline		{space}*#.*(\\{space}*\n)*\n*
 						if (*endptr != '\0' || errno == ERANGE)
 							yyerror("ERROR: Bad integer input");
 						yyerror("WARNING: Integer input is out of range; promoted to float");
-						return (FCONST);
+						return FCONST;
 					}
-					return (ICONST);
+					return ICONST;
 				}
 <C>{integer}		{
 					char* endptr;
@@ -462,9 +462,9 @@ cppline		{space}*#.*(\\{space}*\n)*\n*
 						if (*endptr != '\0' || errno == ERANGE)
 							yyerror("ERROR: Bad integer input");
 						yyerror("WARNING: Integer input is out of range; promoted to float");
-						return (FCONST);
+						return FCONST;
 					}
-					return (ICONST);
+					return ICONST;
 				}
 <SQL>:{identifier}(("->"|\.){identifier})*	{
 					yylval.str = strdup((char*)yytext+1);
@@ -480,13 +480,13 @@ cppline		{space}*#.*(\\{space}*\n)*\n*
 
 					keyword = ScanKeywordLookup((char*)yytext);
 					if (keyword != NULL) {
-						return (keyword->value);
+						return keyword->value;
 					}
 					else
 					{
 						keyword = ScanECPGKeywordLookup((char*)yytext);
 						if (keyword != NULL) {
-							return (keyword->value);
+							return keyword->value;
 						}
 						else
 						{
@@ -514,14 +514,14 @@ cppline		{space}*#.*(\\{space}*\n)*\n*
 							if (ptr == NULL) 
 							{
 								yylval.str = strdup((char*)yytext);
-								return (IDENT);
+								return IDENT;
 							}
 						}
 					}
 				}
 <SQL>{space}			{ /* ignore */ }
 <SQL>";"	                { BEGIN C; return SQL_SEMI; }
-<SQL>{other}			{ return (yytext[0]); }
+<SQL>{other}			{ return yytext[0]; }
 <C>{exec}{space}{sql}		{ BEGIN SQL; return SQL_START; }
 <C>{ccomment}			{ /* ignore */ } 
 <C>{cppline}			{
@@ -533,7 +533,7 @@ cppline		{space}*#.*(\\{space}*\n)*\n*
 
 					keyword = ScanCKeywordLookup((char*)yytext);
 					if (keyword != NULL) {
-						return (keyword->value);
+						return keyword->value;
 					}
 					else
 					{
@@ -561,7 +561,7 @@ cppline		{space}*#.*(\\{space}*\n)*\n*
 						if (ptr == NULL) 
 						{
 							yylval.str = strdup((char*)yytext);
-							return (IDENT);
+							return IDENT;
 						}
 					}
 				}
@@ -574,7 +574,7 @@ cppline		{space}*#.*(\\{space}*\n)*\n*
 <C>\[			{ return('['); }
 <C>\]			{ return(']'); }
 <C>\=			{ return('='); }
-<C>{other}			{ return (S_ANYTHING); }
+<C>{other}			{ return S_ANYTHING; }
 <C>{exec}{space}{sql}{space}{define}	{BEGIN(def_ident);}
 <def_ident>{space}	{}
 <def_ident>{identifier}	{

src/interfaces/ecpg/preproc/preproc.y

@@ -171,9 +171,9 @@ find_struct(char * name, char *next)
     if (c == '-')
     {
 	next++;
-	return (find_struct_member(name, next, p->type->u.element->u.members));
+	return find_struct_member(name, next, p->type->u.element->u.members);
     }
-    else return (find_struct_member(name, next, p->type->u.members));
+    else return find_struct_member(name, next, p->type->u.members);
 }
 
 static struct variable *
@@ -333,7 +333,7 @@ make1_str(const char *str)
         char * res_str = (char *)mm_alloc(strlen(str) + 1);
 
 	strcpy(res_str, str);
-	return (res_str);
+	return res_str;
 }
 
 static char *

src/interfaces/ecpg/preproc/type.c

@@ -17,7 +17,7 @@ mm_alloc(size_t size)
 		exit(OUT_OF_MEMORY);
 	}
 
-	return (ptr);
+	return ptr;
 }
 
 /* duplicate memberlist */

src/interfaces/libpgtcl/pgtclCmds.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclCmds.c,v 1.29 1998/08/17 03:50:22 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclCmds.c,v 1.30 1998/09/01 03:28:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -149,7 +149,7 @@ tcl_value(char *value)
 	char	   *p;
 
 	if (!value)
-		return ((char *) NULL);
+		return (char *) NULL;
 
 #ifdef TCL_ARRAYS_DEBUG
 	printf("pq_value  = '%s'\n", value);
@@ -218,7 +218,7 @@ tcl_value(char *value)
 #ifdef TCL_ARRAYS_DEBUG
 	printf("tcl_value = '%s'\n\n", value);
 #endif
-	return (value);
+	return value;
 }
 
 #endif

src/interfaces/libpq/fe-auth.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.22 1998/08/17 03:50:31 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.23 1998/09/01 03:28:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -149,7 +149,7 @@ pg_krb4_authname(char *PQerrormsg)
 	static char name[SNAME_SZ + 1] = "";
 
 	if (name[0])
-		return (name);
+		return name;
 
 	pg_krb4_init();
 
@@ -160,9 +160,9 @@ pg_krb4_authname(char *PQerrormsg)
 		(void) sprintf(PQerrormsg,
 					   "pg_krb4_authname: krb_get_tf_fullname: %s\n",
 					   krb_err_txt[status]);
-		return ((char *) NULL);
+		return (char *) NULL;
 	}
-	return (name);
+	return name;
 }
 
 /*
@@ -218,9 +218,9 @@ pg_krb4_sendauth(const char *PQerrormsg, int sock,
 		(void) sprintf(PQerrormsg,
 					   "pg_krb4_sendauth: kerberos error: %s\n",
 					   krb_err_txt[status]);
-		return (STATUS_ERROR);
+		return STATUS_ERROR;
 	}
-	return (STATUS_OK);
+	return STATUS_OK;
 }
 
 #endif							/* KRB4 */
@@ -253,7 +253,7 @@ pg_an_to_ln(const char *aname)
 
 	if ((p = strchr(aname, '/')) || (p = strchr(aname, '@')))
 		*p = '\0';
-	return (aname);
+	return aname;
 }
 
 
@@ -276,7 +276,7 @@ pg_krb5_init(void)
 	static krb5_ccache ccache = (krb5_ccache) NULL;
 
 	if (ccache)
-		return (ccache);
+		return ccache;
 
 	/*
 	 * If the user set PGREALM, then we use a ticket file with a special
@@ -286,7 +286,7 @@ pg_krb5_init(void)
 	{
 		(void) sprintf(PQerrormsg,
 					   "pg_krb5_init: krb5_cc_default_name failed\n");
-		return ((krb5_ccache) NULL);
+		return (krb5_ccache) NULL;
 	}
 	strcpy(tktbuf, defname);
 	if (realm = getenv("PGREALM"))
@@ -301,9 +301,9 @@ pg_krb5_init(void)
 				  "pg_krb5_init: Kerberos error %d in krb5_cc_resolve\n",
 					   code);
 		com_err("pg_krb5_init", code, "in krb5_cc_resolve");
-		return ((krb5_ccache) NULL);
+		return (krb5_ccache) NULL;
 	}
-	return (ccache);
+	return ccache;
 }
 
 /*
@@ -321,7 +321,7 @@ pg_krb5_authname(const char *PQerrormsg)
 	static char *authname = (char *) NULL;
 
 	if (authname)
-		return (authname);
+		return authname;
 
 	ccache = pg_krb5_init();	/* don't free this */
 
@@ -331,7 +331,7 @@ pg_krb5_authname(const char *PQerrormsg)
 		"pg_krb5_authname: Kerberos error %d in krb5_cc_get_principal\n",
 					   code);
 		com_err("pg_krb5_authname", code, "in krb5_cc_get_principal");
-		return ((char *) NULL);
+		return (char *) NULL;
 	}
 	if (code = krb5_unparse_name(principal, &authname))
 	{
@@ -340,10 +340,10 @@ pg_krb5_authname(const char *PQerrormsg)
 					   code);
 		com_err("pg_krb5_authname", code, "in krb5_unparse_name");
 		krb5_free_principal(principal);
-		return ((char *) NULL);
+		return (char *) NULL;
 	}
 	krb5_free_principal(principal);
-	return (pg_an_to_ln(authname));
+	return pg_an_to_ln(authname);
 }
 
 /*
@@ -389,7 +389,7 @@ pg_krb5_sendauth(const char *PQerrormsg, int sock,
 		"pg_krb5_sendauth: Kerberos error %d in krb5_cc_get_principal\n",
 					   code);
 		com_err("pg_krb5_sendauth", code, "in krb5_cc_get_principal");
-		return (STATUS_ERROR);
+		return STATUS_ERROR;
 	}
 
 	/*
@@ -418,7 +418,7 @@ pg_krb5_sendauth(const char *PQerrormsg, int sock,
 					   code);
 		com_err("pg_krb5_sendauth", code, "in krb5_parse_name");
 		krb5_free_principal(client);
-		return (STATUS_ERROR);
+		return STATUS_ERROR;
 	}
 
 	/*
@@ -454,7 +454,7 @@ pg_krb5_sendauth(const char *PQerrormsg, int sock,
 	}
 	krb5_free_principal(client);
 	krb5_free_principal(server);
-	return (code ? STATUS_ERROR : STATUS_OK);
+	return code ? STATUS_ERROR : STATUS_OK;
 }
 
 #endif							/* KRB5 */
@@ -490,13 +490,13 @@ fe_sendauth(AuthRequest areq, PGconn *conn, const char *hostname,
 			{
 				(void) sprintf(PQerrormsg,
 							"fe_sendauth: krb4 authentication failed\n");
-				return (STATUS_ERROR);
+				return STATUS_ERROR;
 			}
 			break;
 #else
 			(void) sprintf(PQerrormsg,
 					 "fe_sendauth: krb4 authentication not supported\n");
-			return (STATUS_ERROR);
+			return STATUS_ERROR;
 #endif
 
 		case AUTH_REQ_KRB5:
@@ -507,13 +507,13 @@ fe_sendauth(AuthRequest areq, PGconn *conn, const char *hostname,
 			{
 				(void) sprintf(PQerrormsg,
 							"fe_sendauth: krb5 authentication failed\n");
-				return (STATUS_ERROR);
+				return STATUS_ERROR;
 			}
 			break;
 #else
 			(void) sprintf(PQerrormsg,
 					 "fe_sendauth: krb5 authentication not supported\n");
-			return (STATUS_ERROR);
+			return STATUS_ERROR;
 #endif
 
 		case AUTH_REQ_PASSWORD:
@@ -522,13 +522,13 @@ fe_sendauth(AuthRequest areq, PGconn *conn, const char *hostname,
 			{
 				(void) sprintf(PQerrormsg,
 				 "fe_sendauth: no password supplied\n");
-				return (STATUS_ERROR);
+				return STATUS_ERROR;
 			}
 			if (pg_password_sendauth(conn, password, areq) != STATUS_OK)
 			{
 				(void) sprintf(PQerrormsg,
 				 "fe_sendauth: error sending password authentication\n");
-				return (STATUS_ERROR);
+				return STATUS_ERROR;
 			}
 
 			break;
@@ -536,10 +536,10 @@ fe_sendauth(AuthRequest areq, PGconn *conn, const char *hostname,
 		default:
 			(void) sprintf(PQerrormsg,
 			"fe_sendauth: authentication type %u not supported\n", areq);
-			return (STATUS_ERROR);
+			return STATUS_ERROR;
 	}
 
-	return (STATUS_OK);
+	return STATUS_OK;
 }
 
 /*
@@ -576,7 +576,7 @@ fe_getauthsvc(char *PQerrormsg)
 {
 	if (pg_authsvc < 0 || pg_authsvc >= n_authsvcs)
 		fe_setauthsvc(DEFAULT_CLIENT_AUTHSVC, PQerrormsg);
-	return (authsvcs[pg_authsvc].msgtype);
+	return authsvcs[pg_authsvc].msgtype;
 }
 
 /*
@@ -629,5 +629,5 @@ fe_getauthname(char *PQerrormsg)
 
 	if (name && (authn = (char *) malloc(strlen(name) + 1)))
 		strcpy(authn, name);
-	return (authn);
+	return authn;
 }

src/interfaces/libpq/fe-exec.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.63 1998/08/29 02:09:24 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.64 1998/09/01 03:28:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -650,7 +650,7 @@ PQisBusy(PGconn *conn)
 	parseInput(conn);
 
 	/* PQgetResult will return immediately in all states except BUSY. */
-	return (conn->asyncStatus == PGASYNC_BUSY);
+	return conn->asyncStatus == PGASYNC_BUSY;
 }
 
 
@@ -1410,7 +1410,7 @@ PQcmdTuples(PGresult *res)
 		}
 		p++;
 		if (*(res->cmdStatus) != 'I')	/* UPDATE/DELETE */
-			return (p);
+			return p;
 		while (*p != ' ' && *p)
 			p++;				/* INSERT: skip oid */
 		if (*p == 0)
@@ -1421,7 +1421,7 @@ PQcmdTuples(PGresult *res)
 			return "";
 		}
 		p++;
-		return (p);
+		return p;
 	}
 	return "";
 }

src/interfaces/libpq/fe-print.c

@@ -9,7 +9,7 @@
  * didn't really belong there.
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-print.c,v 1.10 1998/08/17 03:50:39 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-print.c,v 1.11 1998/09/01 03:28:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -55,17 +55,17 @@ static struct winsize
 static void
 do_field(PQprintOpt *po, PGresult *res,
 		 const int i, const int j, char *buf, const int fs_len,
-		 char *fields[],
-		 const int nFields, char *fieldNames[],
-		 unsigned char fieldNotNum[], int fieldMax[],
+		 char **fields,
+		 const int nFields, char **fieldNames,
+		 unsigned char *fieldNotNum, int *fieldMax,
 		 const int fieldMaxLen, FILE *fout);
 static char *
 do_header(FILE *fout, PQprintOpt *po, const int nFields,
-		  int fieldMax[], char *fieldNames[], unsigned char fieldNotNum[],
+		  int *fieldMax, char **fieldNames, unsigned char *fieldNotNum,
 		  const int fs_len, PGresult *res);
 static void
-output_row(FILE *fout, PQprintOpt *po, const int nFields, char *fields[],
-		   unsigned char fieldNotNum[], int fieldMax[], char *border,
+output_row(FILE *fout, PQprintOpt *po, const int nFields, char **fields,
+		   unsigned char *fieldNotNum, int *fieldMax, char *border,
 		   const int row_index);
 static void fill(int length, int max, char filler, FILE *fp);
 
@@ -521,9 +521,9 @@ int PQmblen(unsigned char *s)
 static void
 do_field(PQprintOpt *po, PGresult *res,
 		 const int i, const int j, char *buf, const int fs_len,
-		 char *fields[],
-		 const int nFields, char *fieldNames[],
-		 unsigned char fieldNotNum[], int fieldMax[],
+		 char **fields,
+		 const int nFields, char **fieldNames,
+		 unsigned char *fieldNotNum, int *fieldMax,
 		 const int fieldMaxLen, FILE *fout)
 {
 
@@ -626,8 +626,8 @@ do_field(PQprintOpt *po, PGresult *res,
 
 
 static char *
-do_header(FILE *fout, PQprintOpt *po, const int nFields, int fieldMax[],
-		  char *fieldNames[], unsigned char fieldNotNum[],
+do_header(FILE *fout, PQprintOpt *po, const int nFields, int *fieldMax,
+		  char **fieldNames, unsigned char *fieldNotNum,
 		  const int fs_len, PGresult *res)
 {
 
@@ -714,8 +714,8 @@ do_header(FILE *fout, PQprintOpt *po, const int nFields, int fieldMax[],
 
 
 static void
-output_row(FILE *fout, PQprintOpt *po, const int nFields, char *fields[],
-		   unsigned char fieldNotNum[], int fieldMax[], char *border,
+output_row(FILE *fout, PQprintOpt *po, const int nFields, char **fields,
+		   unsigned char *fieldNotNum, int *fieldMax, char *border,
 		   const int row_index)
 {
 

src/interfaces/libpq/libpqdll.c

@@ -2,5 +2,5 @@
 #include <windows.h>
 BOOL WINAPI DllMain( HINSTANCE hinstDLL,                      DWORD fdwReason,
                      LPVOID lpReserved ){
-	return (TRUE);
+	return TRUE;
 }

src/interfaces/libpq/pqsignal.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/pqsignal.c,v 1.7 1998/08/17 03:50:43 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/pqsignal.c,v 1.8 1998/09/01 03:28:56 momjian Exp $
  *
  * NOTES
  *		This shouldn't be in libpq, but the monitor and some other
@@ -36,7 +36,7 @@ pqsignal(int signo, pqsigfunc func)
 	if (signo != SIGALRM)
 		act.sa_flags |= SA_RESTART;
 	if (sigaction(signo, &act, &oact) < 0)
-		return (SIG_ERR);
-	return (oact.sa_handler);
+		return SIG_ERR;
+	return oact.sa_handler;
 #endif							/* !USE_POSIX_SIGNALS */
 }

src/interfaces/odbc/columninfo.c

@@ -80,7 +80,7 @@ char new_field_name[MAX_MESSAGE_LEN+1];
 			CI_set_field_info(self, lf, new_field_name, new_adtid, new_adtsize);
 	}
 
-	return (SOCK_get_errcode(sock) == 0);
+	return SOCK_get_errcode(sock) == 0;
 }
 
 

src/interfaces/odbc/execute.c

@@ -283,7 +283,7 @@ RETCODE SQL_API SQLTransact(
         UWORD   fType)
 {
 char *func = "SQLTransact";
-extern ConnectionClass *conns[];
+extern ConnectionClass **conns;
 ConnectionClass *conn;
 QResultClass *res;
 char ok, *stmt_string;