database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-22 23:02:54 +03:00
Code

Test for and handle NULL arguments to mylog() print statements.

Browse Source 
Include definition for _IN_ADDR_T if INADDR_NONE is not defined.
This commit is contained in:
Thomas G. Lockhart 1998-11-04 16:24:32 +00:00
parent f47bd801e3
commit 30f35ef9c4
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/interfaces/odbc/convert.c
View File

@ -120,7 +120,7 @@ struct tm *tim;
st.d = tim->tm_mday;
st.y = tim->tm_year + 1900;
mylog("copy_and_convert: field_type = %d, fctype = %d, value = '%s', cbValueMax=%d\n", field_type, fCType, value, cbValueMax);
mylog("copy_and_convert: field_type = %d, fctype = %d, value = '%s', cbValueMax=%d\n", field_type, fCType, (value==NULL)?"<NULL>":value, cbValueMax);
if ( ! value) {
/* handle a null just by returning SQL_NULL_DATA in pcbValue, */

3
src/interfaces/odbc/qresult.c
View File

@ -186,7 +186,8 @@ QR_fetch_tuples(QResultClass *self, ConnectionClass *conn, char *cursor)
if (conn != NULL) {
self->conn = conn;
mylog("QR_fetch_tuples: cursor = '%s', self->cursor=%u\n", cursor, self->cursor);
mylog("QR_fetch_tuples: cursor = '%s', self->cursor=%u\n",
(cursor==NULL)?"":cursor, self->cursor);
if (self->cursor)
free(self->cursor);

2
src/interfaces/odbc/results.c
View File

@ -855,7 +855,7 @@ mylog("SQLFetch: stmt = %u, stmt->result= %u\n", stmt, stmt->result);
value = QR_get_value_backend_row(res, stmt->currTuple, lf);
}
mylog("value = '%s'\n", value);
mylog("value = '%s'\n", (value==NULL)?"<NULL>":value);
retval = copy_and_convert_field_bindinfo(stmt, type, value, lf);

7
src/interfaces/odbc/socket.h
View File

@ -23,6 +23,13 @@
#include <arpa/inet.h>
#define closesocket(xxx) close(xxx)
#define SOCKETFD int
#ifndef INADDR_NONE
#ifndef _IN_ADDR_T
#define _IN_ADDR_T
typedef unsigned int in_addr_t;
#endif
#define INADDR_NONE ((in_addr_t)-1)
#endif
#else
#include <winsock.h>
#define SOCKETFD SOCKET