diff options
Diffstat (limited to 'src/interfaces/odbc/misc.h')
| -rw-r--r-- | src/interfaces/odbc/misc.h | 80 |
1 files changed, 39 insertions, 41 deletions
diff --git a/src/interfaces/odbc/misc.h b/src/interfaces/odbc/misc.h index f47bf880174..ebe56ea9d80 100644 --- a/src/interfaces/odbc/misc.h +++ b/src/interfaces/odbc/misc.h @@ -1,9 +1,9 @@ -/* File: misc.h +/* File: misc.h * - * Description: See "misc.c" + * Description: See "misc.c" * - * Comments: See "notice.txt" for copyright and license information. + * Comments: See "notice.txt" for copyright and license information. * */ @@ -39,37 +39,35 @@ #ifdef MY_LOG -#define MYLOGFILE "mylog_" -#ifndef WIN32 -#define MYLOGDIR "/tmp" -#else -#define MYLOGDIR "c:" -#endif -extern void mylog(char *fmt,...); - + #define MYLOGFILE "mylog_" + #ifndef WIN32 + #define MYLOGDIR "/tmp" + #else + #define MYLOGDIR "c:" + #endif + extern void mylog(char * fmt, ...); #else -#ifndef WIN32 -#define mylog(args...) /* GNU convention for variable arguments */ -#else -#define mylog /* mylog */ -#endif + #ifndef WIN32 + #define mylog(args...) /* GNU convention for variable arguments */ + #else + #define mylog /* mylog */ + #endif #endif #ifdef Q_LOG -#define QLOGFILE "psqlodbc_" -#ifndef WIN32 -#define QLOGDIR "/tmp" -#else -#define QLOGDIR "c:" -#endif -extern void qlog(char *fmt,...); - + #define QLOGFILE "psqlodbc_" + #ifndef WIN32 + #define QLOGDIR "/tmp" + #else + #define QLOGDIR "c:" + #endif + extern void qlog(char * fmt, ...); #else -#ifndef WIN32 -#define qlog(args...) /* GNU convention for variable arguments */ -#else -#define qlog /* qlog */ -#endif + #ifndef WIN32 + #define qlog(args...) /* GNU convention for variable arguments */ + #else + #define qlog /* qlog */ + #endif #endif #ifndef WIN32 @@ -79,21 +77,21 @@ extern void qlog(char *fmt,...); #endif #ifdef WIN32 -#define PG_BINARY O_BINARY -#define PG_BINARY_R "rb" -#define PG_BINARY_W "wb" +#define PG_BINARY O_BINARY +#define PG_BINARY_R "rb" +#define PG_BINARY_W "wb" #else -#define PG_BINARY 0 -#define PG_BINARY_R "r" -#define PG_BINARY_W "w" +#define PG_BINARY 0 +#define PG_BINARY_R "r" +#define PG_BINARY_W "w" #endif -void remove_newlines(char *string); -char *strncpy_null(char *dst, const char *src, int len); -char *trim(char *string); -char *make_string(char *s, int len, char *buf); -char *my_strcat(char *buf, char *fmt, char *s, int len); +void remove_newlines(char *string); +char *strncpy_null(char *dst, const char *src, int len); +char *trim(char *string); +char *make_string(char *s, int len, char *buf); +char *my_strcat(char *buf, char *fmt, char *s, int len); /* defines for return value of my_strcpy */ #define STRCPY_SUCCESS 1 @@ -101,6 +99,6 @@ char *my_strcat(char *buf, char *fmt, char *s, int len); #define STRCPY_TRUNCATED -1 #define STRCPY_NULL -2 -int my_strcpy(char *dst, int dst_len, char *src, int src_len); +int my_strcpy(char *dst, int dst_len, char *src, int src_len); #endif |