Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 26dc501

Browse files
bmomjianbmomjian
committed
More cleanup.
1 parent 82b1fd1 commit 26dc501

38 files changed

+775
-553
lines changed

‎src/interfaces/odbc/bind.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ SQLBindParameter(
4646
SWORD ibScale,
4747
PTR rgbValue,
4848
SDWORD cbValueMax,
49-
SDWORD FAR * pcbValue)
49+
SDWORD FAR *pcbValue)
5050
{
5151
StatementClass *stmt = (StatementClass *) hstmt;
5252
static char *func = "SQLBindParameter";
@@ -163,7 +163,7 @@ SQLBindCol(
163163
SWORD fCType,
164164
PTR rgbValue,
165165
SDWORD cbValueMax,
166-
SDWORD FAR * pcbValue)
166+
SDWORD FAR *pcbValue)
167167
{
168168
StatementClass *stmt = (StatementClass *) hstmt;
169169
static char *func = "SQLBindCol";
@@ -271,10 +271,10 @@ RETCODE SQL_API
271271
SQLDescribeParam(
272272
HSTMT hstmt,
273273
UWORD ipar,
274-
SWORD FAR * pfSqlType,
275-
UDWORD FAR * pcbColDef,
276-
SWORD FAR * pibScale,
277-
SWORD FAR * pfNullable)
274+
SWORD FAR *pfSqlType,
275+
UDWORD FAR *pcbColDef,
276+
SWORD FAR *pibScale,
277+
SWORD FAR *pfNullable)
278278
{
279279
StatementClass *stmt = (StatementClass *) hstmt;
280280
static char *func = "SQLDescribeParam";
@@ -325,7 +325,7 @@ RETCODE SQL_API
325325
SQLParamOptions(
326326
HSTMT hstmt,
327327
UDWORD crow,
328-
UDWORD FAR * pirow)
328+
UDWORD FAR *pirow)
329329
{
330330
static char *func = "SQLParamOptions";
331331

@@ -347,7 +347,7 @@ SQLParamOptions(
347347
RETCODE SQL_API
348348
SQLNumParams(
349349
HSTMT hstmt,
350-
SWORD FAR * pcpar)
350+
SWORD FAR *pcpar)
351351
{
352352
StatementClass *stmt = (StatementClass *) hstmt;
353353
char in_quote = FALSE;
@@ -421,7 +421,7 @@ create_empty_bindings(int num_columns)
421421
}
422422

423423
void
424-
extend_bindings(StatementClass * stmt, int num_columns)
424+
extend_bindings(StatementClass *stmt, int num_columns)
425425
{
426426
static char *func = "extend_bindings";
427427
BindInfoClass *new_bindings;

‎src/interfaces/odbc/bind.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,6 @@ struct ParameterInfoClass_
4949
};
5050

5151
BindInfoClass *create_empty_bindings(int num_columns);
52-
void extend_bindings(StatementClass * stmt, int num_columns);
52+
void extend_bindings(StatementClass *stmt, int num_columns);
5353

5454
#endif

‎src/interfaces/odbc/columninfo.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ CI_Constructor()
3838
}
3939

4040
void
41-
CI_Destructor(ColumnInfoClass * self)
41+
CI_Destructor(ColumnInfoClass *self)
4242
{
4343
CI_free_memory(self);
4444

@@ -50,7 +50,7 @@ CI_Destructor(ColumnInfoClass * self)
5050
If self is null, then just read, don't store.
5151
*/
5252
char
53-
CI_read_fields(ColumnInfoClass * self, ConnectionClass * conn)
53+
CI_read_fields(ColumnInfoClass *self, ConnectionClass *conn)
5454
{
5555
Int2 lf;
5656
int new_num_fields;
@@ -105,7 +105,7 @@ CI_read_fields(ColumnInfoClass * self, ConnectionClass * conn)
105105

106106

107107
void
108-
CI_free_memory(ColumnInfoClass * self)
108+
CI_free_memory(ColumnInfoClass *self)
109109
{
110110
register Int2 lf;
111111
int num_fields = self->num_fields;
@@ -126,7 +126,7 @@ CI_free_memory(ColumnInfoClass * self)
126126
}
127127

128128
void
129-
CI_set_num_fields(ColumnInfoClass * self, int new_num_fields)
129+
CI_set_num_fields(ColumnInfoClass *self, int new_num_fields)
130130
{
131131
CI_free_memory(self); /* always safe to call */
132132

@@ -140,7 +140,7 @@ CI_set_num_fields(ColumnInfoClass * self, int new_num_fields)
140140
}
141141

142142
void
143-
CI_set_field_info(ColumnInfoClass * self, int field_num, char *new_name,
143+
CI_set_field_info(ColumnInfoClass *self, int field_num, char *new_name,
144144
Oid new_adtid, Int2 new_adtsize, Int4 new_atttypmod)
145145
{
146146
/* check bounds */

‎src/interfaces/odbc/columninfo.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ struct ColumnInfoClass_
3030
#define CI_get_atttypmod(self, col) (self->atttypmod[col])
3131

3232
ColumnInfoClass *CI_Constructor(void);
33-
void CI_Destructor(ColumnInfoClass * self);
34-
void CI_free_memory(ColumnInfoClass * self);
35-
char CI_read_fields(ColumnInfoClass * self, ConnectionClass * conn);
33+
void CI_Destructor(ColumnInfoClass *self);
34+
void CI_free_memory(ColumnInfoClass *self);
35+
char CI_read_fields(ColumnInfoClass *self, ConnectionClass *conn);
3636

3737
/* functions for setting up the fields from within the program, */
3838
/* without reading from a socket */
39-
void CI_set_num_fields(ColumnInfoClass * self, int new_num_fields);
40-
void CI_set_field_info(ColumnInfoClass * self, int field_num, char *new_name,
39+
void CI_set_num_fields(ColumnInfoClass *self, int new_num_fields);
40+
void CI_set_field_info(ColumnInfoClass *self, int field_num, char *new_name,
4141
Oid new_adtid, Int2 new_adtsize, Int4 atttypmod);
4242

4343

‎src/interfaces/odbc/connection.c

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ extern GLOBAL_VALUES globals;
3737
RETCODE SQL_API
3838
SQLAllocConnect(
3939
HENV henv,
40-
HDBC FAR * phdbc)
40+
HDBC FAR *phdbc)
4141
{
4242
EnvironmentClass *env = (EnvironmentClass *) henv;
4343
ConnectionClass *conn;
@@ -78,11 +78,11 @@ SQLAllocConnect(
7878
RETCODE SQL_API
7979
SQLConnect(
8080
HDBC hdbc,
81-
UCHAR FAR * szDSN,
81+
UCHAR FAR *szDSN,
8282
SWORD cbDSN,
83-
UCHAR FAR * szUID,
83+
UCHAR FAR *szUID,
8484
SWORD cbUID,
85-
UCHAR FAR * szAuthStr,
85+
UCHAR FAR *szAuthStr,
8686
SWORD cbAuthStr)
8787
{
8888
ConnectionClass *conn = (ConnectionClass *) hdbc;
@@ -135,11 +135,11 @@ SQLConnect(
135135
RETCODE SQL_API
136136
SQLBrowseConnect(
137137
HDBC hdbc,
138-
UCHAR FAR * szConnStrIn,
138+
UCHAR FAR *szConnStrIn,
139139
SWORD cbConnStrIn,
140-
UCHAR FAR * szConnStrOut,
140+
UCHAR FAR *szConnStrOut,
141141
SWORD cbConnStrOutMax,
142-
SWORD FAR * pcbConnStrOut)
142+
SWORD FAR *pcbConnStrOut)
143143
{
144144
static char *func = "SQLBrowseConnect";
145145

@@ -285,7 +285,7 @@ CC_Constructor()
285285

286286

287287
char
288-
CC_Destructor(ConnectionClass * self)
288+
CC_Destructor(ConnectionClass *self)
289289
{
290290
mylog("enter CC_Destructor, self=%u\n", self);
291291

@@ -329,7 +329,7 @@ CC_Destructor(ConnectionClass * self)
329329

330330
/* Return how many cursors are opened on this connection */
331331
int
332-
CC_cursor_count(ConnectionClass * self)
332+
CC_cursor_count(ConnectionClass *self)
333333
{
334334
StatementClass *stmt;
335335
int i,
@@ -350,7 +350,7 @@ CC_cursor_count(ConnectionClass * self)
350350
}
351351

352352
void
353-
CC_clear_error(ConnectionClass * self)
353+
CC_clear_error(ConnectionClass *self)
354354
{
355355
self->errornumber = 0;
356356
self->errormsg = NULL;
@@ -360,7 +360,7 @@ CC_clear_error(ConnectionClass * self)
360360
/* Used to cancel a transaction */
361361
/* We are almost always in the middle of a transaction. */
362362
char
363-
CC_abort(ConnectionClass * self)
363+
CC_abort(ConnectionClass *self)
364364
{
365365
QResultClass *res;
366366

@@ -384,7 +384,7 @@ CC_abort(ConnectionClass * self)
384384

385385
/* This is called by SQLDisconnect also */
386386
char
387-
CC_cleanup(ConnectionClass * self)
387+
CC_cleanup(ConnectionClass *self)
388388
{
389389
int i;
390390
StatementClass *stmt;
@@ -437,7 +437,7 @@ CC_cleanup(ConnectionClass * self)
437437
}
438438

439439
int
440-
CC_set_translation(ConnectionClass * self)
440+
CC_set_translation(ConnectionClass *self)
441441
{
442442

443443
#ifdef WIN32
@@ -480,7 +480,7 @@ CC_set_translation(ConnectionClass * self)
480480
}
481481

482482
char
483-
CC_connect(ConnectionClass * self, char do_password)
483+
CC_connect(ConnectionClass *self, char do_password)
484484
{
485485
StartupPacket sp;
486486
QResultClass *res;
@@ -733,7 +733,7 @@ CC_connect(ConnectionClass * self, char do_password)
733733
}
734734

735735
char
736-
CC_add_statement(ConnectionClass * self, StatementClass * stmt)
736+
CC_add_statement(ConnectionClass *self, StatementClass *stmt)
737737
{
738738
int i;
739739

@@ -765,7 +765,7 @@ CC_add_statement(ConnectionClass * self, StatementClass * stmt)
765765
}
766766

767767
char
768-
CC_remove_statement(ConnectionClass * self, StatementClass * stmt)
768+
CC_remove_statement(ConnectionClass *self, StatementClass *stmt)
769769
{
770770
int i;
771771

@@ -785,7 +785,7 @@ CC_remove_statement(ConnectionClass * self, StatementClass * stmt)
785785
error message with its socket error message.
786786
*/
787787
char *
788-
CC_create_errormsg(ConnectionClass * self)
788+
CC_create_errormsg(ConnectionClass *self)
789789
{
790790
SocketClass *sock = self->sock;
791791
int pos;
@@ -812,7 +812,7 @@ CC_create_errormsg(ConnectionClass * self)
812812

813813

814814
char
815-
CC_get_error(ConnectionClass * self, int *number, char **message)
815+
CC_get_error(ConnectionClass *self, int *number, char **message)
816816
{
817817
int rv;
818818

@@ -849,7 +849,7 @@ CC_get_error(ConnectionClass * self, int *number, char **message)
849849
'declare cursor C3326857 for ...' and 'fetch 100 in C3326857' statements.
850850
*/
851851
QResultClass *
852-
CC_send_query(ConnectionClass * self, char *query, QueryInfo * qi)
852+
CC_send_query(ConnectionClass *self, char *query, QueryInfo *qi)
853853
{
854854
QResultClass *result_in,
855855
*res = NULL;
@@ -1142,7 +1142,7 @@ CC_send_query(ConnectionClass * self, char *query, QueryInfo * qi)
11421142
}
11431143

11441144
int
1145-
CC_send_function(ConnectionClass * self, int fnid, void *result_buf, int *actual_result_len, int result_is_int, LO_ARG * args, int nargs)
1145+
CC_send_function(ConnectionClass *self, int fnid, void *result_buf, int *actual_result_len, int result_is_int, LO_ARG *args, int nargs)
11461146
{
11471147
char id,
11481148
c,
@@ -1289,7 +1289,7 @@ CC_send_function(ConnectionClass * self, int fnid, void *result_buf, int *actual
12891289

12901290

12911291
char
1292-
CC_send_settings(ConnectionClass * self)
1292+
CC_send_settings(ConnectionClass *self)
12931293
{
12941294
/* char ini_query[MAX_MESSAGE_LEN]; */
12951295
ConnInfo *ci = &(self->connInfo);
@@ -1393,7 +1393,7 @@ CC_send_settings(ConnectionClass * self)
13931393
will go away and the define 'PG_TYPE_LO' will be updated.
13941394
*/
13951395
void
1396-
CC_lookup_lo(ConnectionClass * self)
1396+
CC_lookup_lo(ConnectionClass *self)
13971397
{
13981398
HSTMT hstmt;
13991399
StatementClass *stmt;
@@ -1442,7 +1442,7 @@ CC_lookup_lo(ConnectionClass * self)
14421442
h-inoue 01-2-2001
14431443
*/
14441444
void
1445-
CC_initialize_pg_version(ConnectionClass * self)
1445+
CC_initialize_pg_version(ConnectionClass *self)
14461446
{
14471447
strcpy(self->pg_version, self->connInfo.protocol);
14481448
self->pg_version_number = (float) 6.4;
@@ -1455,7 +1455,7 @@ CC_initialize_pg_version(ConnectionClass * self)
14551455
DJP - 25-1-2001
14561456
*/
14571457
void
1458-
CC_lookup_pg_version(ConnectionClass * self)
1458+
CC_lookup_pg_version(ConnectionClass *self)
14591459
{
14601460
HSTMT hstmt;
14611461
StatementClass *stmt;
@@ -1517,7 +1517,7 @@ CC_lookup_pg_version(ConnectionClass * self)
15171517
}
15181518

15191519
void
1520-
CC_log_error(char *func, char *desc, ConnectionClass * self)
1520+
CC_log_error(char *func, char *desc, ConnectionClass *self)
15211521
{
15221522
#ifdef PRN_NULLCHECK
15231523
#define nullcheck(a) (a ? a : "(NULL)")

0 commit comments

Comments
 (0)