Merge pull request #33 from m6w6/fix-19

[m6w6/ext-pq] / src / php_pq_misc.h

diff --git a/src/php_pq_misc.h b/src/php_pq_misc.h
index 26ac0e15c027eae724ad8cce74a505412abf8a4d..bffa9d42d181dce3b8bb089be6134000f779bbfe 100644 (file)
--- a/src/php_pq_misc.h
+++ b/src/php_pq_misc.h
@@ -20,13 +20,13 @@
 
 #define z_is_true zend_is_true
 #define smart_str_s(ss) (ss)->s
-#define smart_str_v(ss) (ss)->s->val
-#define smart_str_l(ss) (ss)->s->len
+#define smart_str_v(ss) (smart_str_s(ss)?(ss)->s->val:NULL)
+#define smart_str_l(ss) (smart_str_s(ss)?(ss)->s->len:0)
 
 /* clear result object associated with a result handle */
-extern void php_pq_clear_res(PGresult *r);
+extern void php_pqres_clear(PGresult *r);
 /* clear any asynchronous results */
-extern void php_pq_clear_conn(PGconn *conn);
+extern void php_pqconn_clear(PGconn *conn);
 /* safe wrappers to clear any asynchronous wrappers before querying synchronously */
 extern PGresult *php_pq_exec(PGconn *conn, const char *query);
 extern PGresult *php_pq_exec_params(PGconn *conn, const char *command, int nParams, const Oid *paramTypes, const char *const * paramValues, const int *paramLengths, const int *paramFormats, int resultFormat);