Commit30f35ef

Thomas G. Lockhart

committed

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

Include definition for _IN_ADDR_T if INADDR_NONE is not defined.

1 parentf47bd80 commit30f35efCopy full SHA for 30f35ef

File tree

+11

-3

lines changed

+11

-3

lines changed

Lines changed: 1 addition & 1 deletion

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

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,8 @@ QR_fetch_tuples(QResultClass self, ConnectionClass conn, char *cursor)`
`186`	`186`	`if (conn!=NULL) {`
`187`	`187`	`self->conn=conn;`
`188`	`188`
`189`		`-mylog("QR_fetch_tuples: cursor = '%s', self->cursor=%u\n",cursor,self->cursor);`
	`189`	`+mylog("QR_fetch_tuples: cursor = '%s', self->cursor=%u\n",`
	`190`	`+(cursor==NULL)?"":cursor,self->cursor);`
`190`	`191`
`191`	`192`	`if (self->cursor)`
`192`	`193`	`free(self->cursor);`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -855,7 +855,7 @@ mylog("SQLFetch: stmt = %u, stmt->result= %u\n", stmt, stmt->result);`
`855`	`855`	`value=QR_get_value_backend_row(res,stmt->currTuple,lf);`
`856`	`856`	`}`
`857`	`857`
`858`		`-mylog("value = '%s'\n",value);`
	`858`	`+mylog("value = '%s'\n",(value==NULL)?"<NULL>":value);`
`859`	`859`
`860`	`860`	`retval=copy_and_convert_field_bindinfo(stmt,type,value,lf);`
`861`	`861`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,13 @@`
`23`	`23`	`#include<arpa/inet.h>`
`24`	`24`	`#defineclosesocket(xxx) close(xxx)`
`25`	`25`	`#defineSOCKETFD int`
	`26`	`+#ifndefINADDR_NONE`
	`27`	`+#ifndef_IN_ADDR_T`
	`28`	`+#define_IN_ADDR_T`
	`29`	`+typedefunsignedintin_addr_t;`
	`30`	`+#endif`
	`31`	`+#defineINADDR_NONE ((in_addr_t)-1)`
	`32`	`+#endif`
`26`	`33`	`#else`
`27`	`34`	`#include<winsock.h>`
`28`	`35`	`#defineSOCKETFD SOCKET`

Comments

(0)