From 889d33809abdfb5924c0bf34b9c15ecba894333a Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Thu, 22 Mar 2001 06:16:21 +0000 Subject: [PATCH] Remove dashes in comments that don't need them, rewrap with pgindent. --- dlg_specific.c | 4 +- drvconn.c | 2 +- multibyte.c | 4 +- pgtypes.c | 150 ++++++++++++++++++++++++++----------------------- psqlodbc.c | 2 +- results.c | 2 +- setup.c | 10 ++-- 7 files changed, 93 insertions(+), 81 deletions(-) diff --git a/dlg_specific.c b/dlg_specific.c index a0d7154..2a933ee 100644 --- a/dlg_specific.c +++ b/dlg_specific.c @@ -87,7 +87,7 @@ GetDlgStuff(HWND hdlg, ConnInfo *ci) -int CALLBACK +int CALLBACK driver_optionsProc(HWND hdlg, WORD wMsg, WPARAM wParam, @@ -235,7 +235,7 @@ driver_optionsProc(HWND hdlg, return FALSE; } -int CALLBACK +int CALLBACK ds_optionsProc(HWND hdlg, WORD wMsg, WPARAM wParam, diff --git a/drvconn.c b/drvconn.c index 1f55601..da3b713 100644 --- a/drvconn.c +++ b/drvconn.c @@ -270,7 +270,7 @@ dconn_DoDialog(HWND hwnd, ConnInfo *ci) } -BOOL FAR PASCAL +BOOL FAR PASCAL dconn_FDriverConnectProc( HWND hdlg, UINT wMsg, diff --git a/multibyte.c b/multibyte.c index 19acb5b..efbcee0 100644 --- a/multibyte.c +++ b/multibyte.c @@ -48,7 +48,7 @@ multibyte_strchr(unsigned char *s, unsigned char c) } break; default: - mb_st = 0; + mb_st = 0; } i++; } @@ -117,7 +117,7 @@ multibyte_char_check(unsigned char s) } break; default: - multibyte_status = 0; + multibyte_status = 0; } #ifdef _DEBUG qlog("multibyte_client_encoding = %d s = 0x%02X multibyte_stat = %d\n", multibyte_client_encoding, s, multibyte_status); diff --git a/pgtypes.c b/pgtypes.c index a70d989..b35197c 100644 --- a/pgtypes.c +++ b/pgtypes.c @@ -200,11 +200,12 @@ pgtype_to_sqltype(StatementClass *stmt, Int4 type) { switch (type) { - case PG_TYPE_CHAR: - case PG_TYPE_CHAR2: - case PG_TYPE_CHAR4: - case PG_TYPE_CHAR8: - case PG_TYPE_NAME:return SQL_CHAR; + case PG_TYPE_CHAR: + case PG_TYPE_CHAR2: + case PG_TYPE_CHAR4: + case PG_TYPE_CHAR8: + case PG_TYPE_NAME: + return SQL_CHAR; case PG_TYPE_BPCHAR: return SQL_CHAR; @@ -272,7 +273,8 @@ pgtype_to_ctype(StatementClass *stmt, Int4 type) { switch (type) { - case PG_TYPE_INT8:return SQL_C_CHAR; + case PG_TYPE_INT8: + return SQL_C_CHAR; case PG_TYPE_NUMERIC: return SQL_C_CHAR; case PG_TYPE_INT2: @@ -536,7 +538,8 @@ pgtype_precision(StatementClass *stmt, Int4 type, int col, int handle_unknown_si switch (type) { - case PG_TYPE_CHAR:return 1; + case PG_TYPE_CHAR: + return 1; case PG_TYPE_CHAR2: return 2; case PG_TYPE_CHAR4: @@ -601,7 +604,8 @@ pgtype_display_size(StatementClass *stmt, Int4 type, int col, int handle_unknown switch (type) { - case PG_TYPE_INT2:return 6; + case PG_TYPE_INT2: + return 6; case PG_TYPE_OID: case PG_TYPE_XID: @@ -641,7 +645,8 @@ pgtype_length(StatementClass *stmt, Int4 type, int col, int handle_unknown_size_ switch (type) { - case PG_TYPE_INT2:return 2; + case PG_TYPE_INT2: + return 2; case PG_TYPE_OID: case PG_TYPE_XID: @@ -683,23 +688,24 @@ pgtype_scale(StatementClass *stmt, Int4 type, int col) switch (type) { - case PG_TYPE_INT2: - case PG_TYPE_OID: - case PG_TYPE_XID: - case PG_TYPE_INT4: - case PG_TYPE_INT8: - case PG_TYPE_FLOAT4: - case PG_TYPE_FLOAT8: - case PG_TYPE_MONEY: - case PG_TYPE_BOOL: + case PG_TYPE_INT2: + case PG_TYPE_OID: + case PG_TYPE_XID: + case PG_TYPE_INT4: + case PG_TYPE_INT8: + case PG_TYPE_FLOAT4: + case PG_TYPE_FLOAT8: + case PG_TYPE_MONEY: + case PG_TYPE_BOOL: /* * Number of digits to the right of the decimal point in * "yyyy-mm=dd hh:mm:ss[.f...]" */ - case PG_TYPE_ABSTIME: - case PG_TYPE_DATETIME: - case PG_TYPE_TIMESTAMP:return 0; + case PG_TYPE_ABSTIME: + case PG_TYPE_DATETIME: + case PG_TYPE_TIMESTAMP: + return 0; case PG_TYPE_NUMERIC: return getNumericScale(stmt, type, col); @@ -715,14 +721,15 @@ pgtype_radix(StatementClass *stmt, Int4 type) { switch (type) { - case PG_TYPE_INT2: - case PG_TYPE_OID: - case PG_TYPE_INT4: - case PG_TYPE_INT8: - case PG_TYPE_NUMERIC: - case PG_TYPE_FLOAT4: - case PG_TYPE_MONEY: - case PG_TYPE_FLOAT8:return 10; + case PG_TYPE_INT2: + case PG_TYPE_OID: + case PG_TYPE_INT4: + case PG_TYPE_INT8: + case PG_TYPE_NUMERIC: + case PG_TYPE_FLOAT4: + case PG_TYPE_MONEY: + case PG_TYPE_FLOAT8: + return 10; default: return -1; @@ -741,22 +748,23 @@ pgtype_auto_increment(StatementClass *stmt, Int4 type) switch (type) { - case PG_TYPE_INT2: - case PG_TYPE_OID: - case PG_TYPE_XID: - case PG_TYPE_INT4: - case PG_TYPE_FLOAT4: - case PG_TYPE_MONEY: - case PG_TYPE_BOOL: - case PG_TYPE_FLOAT8: - case PG_TYPE_INT8: - case PG_TYPE_NUMERIC: + case PG_TYPE_INT2: + case PG_TYPE_OID: + case PG_TYPE_XID: + case PG_TYPE_INT4: + case PG_TYPE_FLOAT4: + case PG_TYPE_MONEY: + case PG_TYPE_BOOL: + case PG_TYPE_FLOAT8: + case PG_TYPE_INT8: + case PG_TYPE_NUMERIC: - case PG_TYPE_DATE: - case PG_TYPE_TIME: - case PG_TYPE_ABSTIME: - case PG_TYPE_DATETIME: - case PG_TYPE_TIMESTAMP:return FALSE; + case PG_TYPE_DATE: + case PG_TYPE_TIME: + case PG_TYPE_ABSTIME: + case PG_TYPE_DATETIME: + case PG_TYPE_TIMESTAMP: + return FALSE; default: return -1; @@ -768,16 +776,17 @@ pgtype_case_sensitive(StatementClass *stmt, Int4 type) { switch (type) { - case PG_TYPE_CHAR: + case PG_TYPE_CHAR: - case PG_TYPE_CHAR2: - case PG_TYPE_CHAR4: - case PG_TYPE_CHAR8: + case PG_TYPE_CHAR2: + case PG_TYPE_CHAR4: + case PG_TYPE_CHAR8: - case PG_TYPE_VARCHAR: - case PG_TYPE_BPCHAR: - case PG_TYPE_TEXT: - case PG_TYPE_NAME:return TRUE; + case PG_TYPE_VARCHAR: + case PG_TYPE_BPCHAR: + case PG_TYPE_TEXT: + case PG_TYPE_NAME: + return TRUE; default: return FALSE; @@ -789,7 +798,8 @@ pgtype_money(StatementClass *stmt, Int4 type) { switch (type) { - case PG_TYPE_MONEY:return TRUE; + case PG_TYPE_MONEY: + return TRUE; default: return FALSE; } @@ -800,15 +810,16 @@ pgtype_searchable(StatementClass *stmt, Int4 type) { switch (type) { - case PG_TYPE_CHAR: - case PG_TYPE_CHAR2: - case PG_TYPE_CHAR4: - case PG_TYPE_CHAR8: + case PG_TYPE_CHAR: + case PG_TYPE_CHAR2: + case PG_TYPE_CHAR4: + case PG_TYPE_CHAR8: - case PG_TYPE_VARCHAR: - case PG_TYPE_BPCHAR: - case PG_TYPE_TEXT: - case PG_TYPE_NAME:return SQL_SEARCHABLE; + case PG_TYPE_VARCHAR: + case PG_TYPE_BPCHAR: + case PG_TYPE_TEXT: + case PG_TYPE_NAME: + return SQL_SEARCHABLE; default: return SQL_ALL_EXCEPT_LIKE; @@ -820,8 +831,9 @@ pgtype_unsigned(StatementClass *stmt, Int4 type) { switch (type) { - case PG_TYPE_OID: - case PG_TYPE_XID:return TRUE; + case PG_TYPE_OID: + case PG_TYPE_XID: + return TRUE; case PG_TYPE_INT2: case PG_TYPE_INT4: @@ -899,12 +911,12 @@ sqltype_to_default_ctype(Int2 sqltype) /* (Appendix D) */ switch (sqltype) { - case SQL_CHAR: - case SQL_VARCHAR: - case SQL_LONGVARCHAR: - case SQL_DECIMAL: - case SQL_NUMERIC: - case SQL_BIGINT: + case SQL_CHAR: + case SQL_VARCHAR: + case SQL_LONGVARCHAR: + case SQL_DECIMAL: + case SQL_NUMERIC: + case SQL_BIGINT: return SQL_C_CHAR; case SQL_BIT: diff --git a/psqlodbc.c b/psqlodbc.c index 95ef452..455967f 100644 --- a/psqlodbc.c +++ b/psqlodbc.c @@ -39,7 +39,7 @@ RETCODE SQL_API SQLDummyOrdinal(void); HINSTANCE NEAR s_hModule; /* Saved module handle. */ /* This is where the Driver Manager attaches to this Driver */ -BOOL WINAPI +BOOL WINAPI DllMain(HANDLE hInst, ULONG ul_reason_for_call, LPVOID lpReserved) { WORD wVersionRequested; diff --git a/results.c b/results.c index 781982e..e5cc92c 100644 --- a/results.c +++ b/results.c @@ -423,7 +423,7 @@ SQLColAttributes( icol--; unknown_sizes = globals.unknown_sizes; /* atoi(ci->unknown_sizes); - * */ + * */ if (unknown_sizes == UNKNOWNS_AS_DONTKNOW) /* not appropriate for * SQLColAttributes() */ unknown_sizes = UNKNOWNS_AS_MAX; diff --git a/setup.c b/setup.c index d4950da..1679ad0 100644 --- a/setup.c +++ b/setup.c @@ -74,7 +74,7 @@ BOOL INTFUNC SetDSNAttributes(HWND hwnd, LPSETUPDLG lpsetupdlg); Output : TRUE success, FALSE otherwise --------------------------------------------------------------------------*/ -BOOL CALLBACK +BOOL CALLBACK ConfigDSN(HWND hwnd, WORD fRequest, LPCSTR lpszDriver, @@ -154,7 +154,7 @@ ConfigDSN(HWND hwnd, Input : hdlg -- Dialog window handle Output : None --------------------------------------------------------------------------*/ -void INTFUNC +void INTFUNC CenterDialog(HWND hdlg) { HWND hwndFrame; @@ -209,7 +209,7 @@ CenterDialog(HWND hdlg) --------------------------------------------------------------------------*/ -int CALLBACK +int CALLBACK ConfigDlgProc(HWND hdlg, WORD wMsg, WPARAM wParam, @@ -345,7 +345,7 @@ ConfigDlgProc(HWND hdlg, Input : lpszAttributes - Pointer to attribute string Output : None (global aAttr normally updated) --------------------------------------------------------------------------*/ -void INTFUNC +void INTFUNC ParseAttributes(LPCSTR lpszAttributes, LPSETUPDLG lpsetupdlg) { LPCSTR lpsz; @@ -399,7 +399,7 @@ ParseAttributes(LPCSTR lpszAttributes, LPSETUPDLG lpsetupdlg) Output : TRUE if successful, FALSE otherwise --------------------------------------------------------------------------*/ -BOOL INTFUNC +BOOL INTFUNC SetDSNAttributes(HWND hwndParent, LPSETUPDLG lpsetupdlg) { LPCSTR lpszDSN; /* Pointer to data source name */ -- 2.39.5