Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9c891ac

Browse files
committed
Include file alignment fixes.
1 parentcc818a8 commit9c891ac

File tree

12 files changed

+537
-536
lines changed

12 files changed

+537
-536
lines changed

‎src/interfaces/odbc/columninfo.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ charCI_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-
voidCI_set_num_fields(ColumnInfoClass*self,intnew_num_fields);
39+
voidCI_set_num_fields(ColumnInfoClass*self,intnew_num_fields);
4040
voidCI_set_field_info(ColumnInfoClass*self,intfield_num,char*new_name,
41-
Oidnew_adtid,Int2new_adtsize,Int4atttypmod);
41+
Oidnew_adtid,Int2new_adtsize,Int4atttypmod);
4242

4343

4444
#endif

‎src/interfaces/odbc/connection.h

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,11 @@ typedef enum
9393
#defineAUTH_REQ_CRYPT4
9494

9595
/*Startup Packet sizes */
96-
#defineSM_DATABASE64
97-
#defineSM_USER32
98-
#defineSM_OPTIONS64
99-
#defineSM_UNUSED64
100-
#defineSM_TTY64
96+
#defineSM_DATABASE64
97+
#defineSM_USER32
98+
#defineSM_OPTIONS64
99+
#defineSM_UNUSED64
100+
#defineSM_TTY64
101101

102102
/*Old 6.2 protocol defines */
103103
#defineNO_AUTHENTICATION7
@@ -200,26 +200,26 @@ struct col_info
200200
#endif
201201

202202
typedefBOOL (FARWINAPI*DataSourceToDriverProc) (UDWORD,
203-
SWORD,
204-
PTR,
205-
SDWORD,
206-
PTR,
207-
SDWORD,
208-
SDWORDFAR*,
209-
UCHARFAR*,
210-
SWORD,
211-
SWORDFAR*);
203+
SWORD,
204+
PTR,
205+
SDWORD,
206+
PTR,
207+
SDWORD,
208+
SDWORDFAR*,
209+
UCHARFAR*,
210+
SWORD,
211+
SWORDFAR*);
212212

213213
typedefBOOL (FARWINAPI*DriverToDataSourceProc) (UDWORD,
214-
SWORD,
215-
PTR,
216-
SDWORD,
217-
PTR,
218-
SDWORD,
219-
SDWORDFAR*,
220-
UCHARFAR*,
221-
SWORD,
222-
SWORDFAR*);
214+
SWORD,
215+
PTR,
216+
SDWORD,
217+
PTR,
218+
SDWORD,
219+
SDWORDFAR*,
220+
UCHARFAR*,
221+
SWORD,
222+
SWORDFAR*);
223223

224224
/*******The Connection handle************/
225225
structConnectionClass_
@@ -255,12 +255,12 @@ struct ConnectionClass_
255255

256256

257257
/* Accessor functions */
258-
#defineCC_get_socket(x)(x->sock)
259-
#defineCC_get_database(x)(x->connInfo.database)
260-
#defineCC_get_server(x)(x->connInfo.server)
261-
#defineCC_get_DSN(x)(x->connInfo.dsn)
262-
#defineCC_get_username(x)(x->connInfo.username)
263-
#defineCC_is_onlyread(x)(x->connInfo.onlyread[0] == '1')
258+
#defineCC_get_socket(x)(x->sock)
259+
#defineCC_get_database(x)(x->connInfo.database)
260+
#defineCC_get_server(x)(x->connInfo.server)
261+
#defineCC_get_DSN(x)(x->connInfo.dsn)
262+
#defineCC_get_username(x)(x->connInfo.username)
263+
#defineCC_is_onlyread(x)(x->connInfo.onlyread[0] == '1')
264264

265265

266266
/*for CC_DSN_info */

‎src/interfaces/odbc/dlg_specific.h

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -31,46 +31,47 @@
3131

3232
/* INI File Stuff */
3333
#ifndefWIN32
34-
#defineODBC_INI".odbc.ini"
34+
#defineODBC_INI".odbc.ini"
3535
#ifdefODBCINSTDIR
36-
#defineODBCINST_INIODBCINSTDIR "/odbcinst.ini"
36+
#defineODBCINST_INIODBCINSTDIR "/odbcinst.ini"
3737
#else
38-
#defineODBCINST_INI"/etc/odbcinst.ini"
38+
#defineODBCINST_INI"/etc/odbcinst.ini"
3939
#warning "location of odbcinst.ini file defaulted to /etc"
4040
#endif
4141
#else/* WIN32 */
42-
#defineODBC_INI"ODBC.INI"/* ODBC initialization file */
43-
#defineODBCINST_INI"ODBCINST.INI"/* ODBC Installation file */
42+
#defineODBC_INI"ODBC.INI"/* ODBC initialization file */
43+
#defineODBCINST_INI"ODBCINST.INI"/* ODBC Installation file */
4444
#endif/* WIN32 */
4545

4646

47-
#defineINI_DSN DBMS_NAME/* Name of default Datasource in
47+
#defineINI_DSNDBMS_NAME/* Name of default Datasource in
4848
* ini file (not used?) */
49-
#defineINI_KDESC"Description"/* Data source description */
50-
#defineINI_SERVER"Servername"/* Name of Server running the
51-
* Postgres service */
52-
#defineINI_PORT"Port"/* Port on which the Postmaster is
53-
* listening */
54-
#defineINI_DATABASE"Database"/* Database Name */
55-
#defineINI_USER"Username"/* Default User Name */
56-
#defineINI_PASSWORD"Password"/* Default Password */
57-
#defineINI_DEBUG"Debug"/* Debug flag */
58-
#defineINI_FETCH"Fetch"/* Fetch Max Count */
59-
#defineINI_SOCKET"Socket"/* Socket buffer size */
60-
#defineINI_READONLY"ReadOnly"/* Database is read only */
61-
#defineINI_COMMLOG"CommLog"/* Communication to backend
49+
#defineINI_KDESC"Description"/* Data source description */
50+
#defineINI_SERVER"Servername"/* Name of Server running
51+
* the Postgres service */
52+
#defineINI_PORT"Port"/* Port on which the Postmaster is
53+
* listening */
54+
#defineINI_DATABASE"Database"/* Database Name */
55+
#defineINI_USER"Username"/* Default User Name */
56+
#defineINI_PASSWORD"Password"/* Default Password */
57+
#defineINI_DEBUG"Debug"/* Debug flag */
58+
#defineINI_FETCH"Fetch"/* Fetch Max Count */
59+
#defineINI_SOCKET"Socket"/* Socket buffer size */
60+
#defineINI_READONLY"ReadOnly"/* Database is read only */
61+
#defineINI_COMMLOG"CommLog"/* Communication to backend
6262
* logging */
63-
#defineINI_PROTOCOL"Protocol"/* What protocol (6.2) */
64-
#defineINI_OPTIMIZER"Optimizer"/* Use backend genetic optimizer */
65-
#defineINI_KSQO"Ksqo"/* Keyset query optimization */
66-
#defineINI_CONNSETTINGS"ConnSettings"/* Anything to send to
63+
#defineINI_PROTOCOL"Protocol"/* What protocol (6.2) */
64+
#defineINI_OPTIMIZER"Optimizer"/* Use backend genetic optimizer */
65+
#defineINI_KSQO"Ksqo"/* Keyset query optimization */
66+
#defineINI_CONNSETTINGS"ConnSettings"/* Anything to send to
6767
* backend on successful
6868
* connection */
69-
#defineINI_UNIQUEINDEX "UniqueIndex"/* Recognize unique indexes */
70-
#defineINI_UNKNOWNSIZES "UnknownSizes"/* How to handle unknown
69+
#defineINI_UNIQUEINDEX"UniqueIndex"/* Recognize unique
70+
* indexes */
71+
#defineINI_UNKNOWNSIZES"UnknownSizes"/* How to handle unknown
7172
* result set sizes */
7273

73-
#defineINI_CANCELASFREESTMT"CancelAsFreeStmt"
74+
#defineINI_CANCELASFREESTMT"CancelAsFreeStmt"
7475

7576
#defineINI_USEDECLAREFETCH "UseDeclareFetch"/* Use Declare/Fetch
7677
* cursors */
@@ -90,9 +91,9 @@
9091
#defineINI_PARSE"Parse"
9192
#defineINI_EXTRASYSTABLEPREFIXES"ExtraSysTablePrefixes"
9293

93-
#defineINI_TRANSLATIONNAME"TranslationName"
94-
#defineINI_TRANSLATIONDLL"TranslationDLL"
95-
#defineINI_TRANSLATIONOPTION"TranslationOption"
94+
#defineINI_TRANSLATIONNAME"TranslationName"
95+
#defineINI_TRANSLATIONDLL"TranslationDLL"
96+
#defineINI_TRANSLATIONOPTION"TranslationOption"
9697

9798

9899
/*Connection Defaults */

‎src/interfaces/odbc/gpps.h

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,22 @@ extern"C"
1717
{
1818
#endif
1919

20-
DWORDGetPrivateProfileString(char*theSection,/* section name */
21-
char*theKey,/* search key name */
22-
char*theDefault,/* default value if not
23-
* found */
24-
char*theReturnBuffer,/* return valuse stored
25-
* here */
26-
size_ttheBufferLength,/* byte length of return
27-
* buffer */
28-
char*theIniFileName);/* pathname of ini file
29-
* to search */
30-
31-
DWORDWritePrivateProfileString(char*theSection,/* section name */
32-
char*theKey,/* write key name */
33-
char*theBuffer,/* input buffer */
34-
char*theIniFileName);/* pathname of ini file
35-
* to write */
20+
DWORDGetPrivateProfileString(char*theSection,/* section name */
21+
char*theKey,/* search key name */
22+
char*theDefault,/* default value if not
23+
* found */
24+
char*theReturnBuffer,/* return valuse stored
25+
* here */
26+
size_ttheBufferLength,/* byte length of return
27+
* buffer */
28+
char*theIniFileName);/* pathname of ini file
29+
* to search */
30+
31+
DWORDWritePrivateProfileString(char*theSection,/* section name */
32+
char*theKey,/* write key name */
33+
char*theBuffer,/* input buffer */
34+
char*theIniFileName);/* pathname of ini file
35+
* to write */
3636

3737
#ifdef__cplusplus
3838
}

‎src/interfaces/odbc/iodbc.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ typedef int BOOL;
5757

5858
#endif/* WIN32 */
5959

60-
#defineSYSERR(-1)
60+
#defineSYSERR(-1)
6161

6262
#ifndefNULL
63-
#defineNULL((void FAR*)0UL)
63+
#defineNULL((void FAR*)0UL)
6464
#endif
6565

6666
#endif

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp