Cleanup of source.

src/interfaces/libpq/fe-misc.c

@@ -25,7 +25,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.44 2001/02/10 02:31:30 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.45 2001/02/11 04:56:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */

src/interfaces/odbc/convert.c

@@ -233,6 +233,7 @@ copy_and_convert_field(StatementClass * stmt, Int4 field_type, void *value, Int2
 	*********************************************************************/
 	switch (field_type)
 	{
+
 			/*
 			 * $$$ need to add parsing for date/time/timestamp strings in
 			 * PG_TYPE_CHAR,VARCHAR $$$
@@ -462,6 +463,7 @@ copy_and_convert_field(StatementClass * stmt, Int4 field_type, void *value, Int2
 	}
 	else
 	{
+
 		/*
 		 * for SQL_C_CHAR, it's probably ok to leave currency symbols in.
 		 * But to convert to numeric types, it is necessary to get rid of
@@ -1228,6 +1230,7 @@ convert_escape(char *value)
 	}
 	else if (strcmp(key, "fn") == 0)
 	{
+
 		/*
 		 * Function invocation Separate off the func name, skipping
 		 * trailing whitespace.

src/interfaces/odbc/dlg_specific.c

@@ -49,6 +49,7 @@ extern GLOBAL_VALUES globals;
 void
 SetDlgStuff(HWND hdlg, ConnInfo * ci)
 {
+
 	/*
 	 * If driver attribute NOT present, then set the datasource name and
 	 * description
@@ -773,6 +774,7 @@ getGlobalDefaults(char *section, char *filename, char override)
 	/* Dont allow override of an override! */
 	if (!override)
 	{
+
 		/*
 		 * ConnSettings is stored in the driver section and per datasource
 		 * for override

src/interfaces/odbc/drvconn.c

@@ -215,6 +215,7 @@ dialog:
 
 	if (szConnStrOut)
 	{
+
 		/*
 		 * Return the completed string to the caller. The correct method
 		 * is to only construct the connect string if a dialog was put up,

src/interfaces/odbc/execute.c

@@ -437,6 +437,7 @@ SQLCancel(
 	 */
 	if (stmt->data_at_exec < 0)
 	{
+
 		/*
 		 * MAJOR HACK for Windows to reset the driver manager's cursor
 		 * state: Because of what seems like a bug in the Odbc driver

src/interfaces/odbc/info.c

@@ -1324,6 +1324,7 @@ SQLTables(
 	result = SQLFetch(htbl_stmt);
 	while ((result == SQL_SUCCESS) || (result == SQL_SUCCESS_WITH_INFO))
 	{
+
 		/*
 		 * Determine if this table name is a system table. If treating
 		 * system tables as regular tables, then no need to do this test.

src/interfaces/odbc/isql.h

@@ -204,26 +204,20 @@ extern		"C"
 												 SWORD cbCursorMax,
 												 SWORD FAR * pcbCursor);
 
-	RETCODE SQL_API SQLNumResultCols(HSTMT hstmt,
-												 SWORD FAR * pccol);
+	RETCODE SQL_API SQLNumResultCols(HSTMT hstmt, SWORD FAR * pccol);
 
-	RETCODE SQL_API SQLPrepare(HSTMT hstmt,
-										   UCHAR FAR * szSqlStr,
+	RETCODE SQL_API SQLPrepare(HSTMT hstmt, UCHAR FAR * szSqlStr,
 										   SDWORD cbSqlStr);
 
-	RETCODE SQL_API SQLRowCount(HSTMT hstmt,
-											SDWORD FAR * pcrow);
+	RETCODE SQL_API SQLRowCount(HSTMT hstmt, SDWORD FAR * pcrow);
 
-	RETCODE SQL_API SQLSetCursorName(HSTMT hstmt,
-												 UCHAR FAR * szCursor,
+	RETCODE SQL_API SQLSetCursorName(HSTMT hstmt, UCHAR FAR * szCursor,
 												 SWORD cbCursor);
 
-	RETCODE SQL_API SQLTransact(HENV henv,
-											HDBC hdbc,
+	RETCODE SQL_API SQLTransact(HENV henv, HDBC hdbc,
 											UWORD fType);
 
-	RETCODE SQL_API SQLSetParam(HSTMT hstmt,
-											UWORD ipar,
+	RETCODE SQL_API SQLSetParam(HSTMT hstmt, UWORD ipar,
 											SWORD fCType,
 											SWORD fSqlType,
 											UDWORD cbColDef,

src/interfaces/odbc/options.c

@@ -307,6 +307,7 @@ SQLSetConnectOption(
 
 	switch (fOption)
 	{
+
 			/*
 			 * Statement Options (apply to all stmts on the connection and
 			 * become defaults for new stmts)

src/interfaces/odbc/qresult.c

@@ -384,6 +384,7 @@ QR_next_tuple(QResultClass * self)
 	}
 	else
 	{
+
 		/*
 		 * See if we need to fetch another group of rows. We may be being
 		 * called from send_query(), and if so, don't send another fetch,
@@ -616,6 +617,7 @@ QR_read_tuple(QResultClass * self, char binary)
 		}
 		else
 		{
+
 			/*
 			 * NO, the field is not null. so get at first the length of
 			 * the field (four bytes)

src/interfaces/odbc/resource.h

@@ -1,5 +1,11 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
+//
+{
+	{
+		NO_DEPENDENCIES
+	}
+}
+
+//Microsoft Developer Studio generated include file.
 // Used by psqlodbc.rc
 //
 #define IDS_BADDSN						1
@@ -48,8 +54,9 @@
 #define DRV_KSQO						1055
 #define DS_PG64							1057
 
-// Next default values for new objects
-// 
+//Next default values for new
+	objects
+		//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE		104

src/interfaces/odbc/setup.c

@@ -264,6 +264,7 @@ ConfigDlgProc(HWND hdlg,
 
 			switch (GET_WM_COMMAND_ID(wParam, lParam))
 			{
+
 					/*
 					 * Ensure the OK button is enabled only when a data
 					 * source name

src/interfaces/odbc/socket.c

@@ -91,6 +91,7 @@ SOCK_Destructor(SocketClass * self)
 		free(self->buffer_in);
 
 	if (self->buffer_out)
+		SOCK_put_n_char(self, (char *) &rv, 2);
 	free(self->buffer_out);
 
 	free(self);
@@ -256,7 +257,6 @@ SOCK_put_int(SocketClass * self, int value, short len)
 	{
 		case 2:
 			rv = self->reverse ? value : htons((unsigned short) value);
-			SOCK_put_n_char(self, (char *) &rv, 2);
 			return;
 
 		case 4:

src/interfaces/odbc/statement.c

@@ -681,6 +681,7 @@ SC_fetch(StatementClass * self)
 		if (self->currTuple >= QR_get_num_tuples(res) - 1 ||
 			(self->options.maxRows > 0 && self->currTuple == self->options.maxRows - 1))
 		{
+
 			/*
 			 * if at the end of the tuples, return "no data found" and set
 			 * the cursor past the end of the result set

src/interfaces/odbc/tuplelist.c

@@ -133,6 +133,7 @@ TL_get_fieldval(TupleListClass * self, Int4 tupleno, Int2 fieldno)
 	}
 	else if (start_is_closer)
 	{
+
 		/*
 		 * the shortest way is to start the search from the head of the
 		 * list
@@ -179,6 +180,7 @@ TL_get_fieldval(TupleListClass * self, Int4 tupleno, Int2 fieldno)
 char
 TL_add_tuple(TupleListClass * self, TupleNode * new_field)
 {
+
 	/*
 	 * we append the tuple at the end of the doubly linked list of the
 	 * tuples we have already read in
@@ -197,6 +199,7 @@ TL_add_tuple(TupleListClass * self, TupleNode * new_field)
 	}
 	else
 	{
+
 		/*
 		 * there is already an element in the list, so add the new one at
 		 * the end of the list