From: Andrey Hristov <andrey@php.net>
Date: Tue, 31 May 2011 10:35:07 +0000 (+0000)
Subject: fix macros
X-Git-Tag: php-5.3.7RC1~62
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2ac61225f09156732431274d3d3752b535cd5f2;p=php

fix macros
---

diff --git a/ext/mysqlnd/mysqlnd_priv.h b/ext/mysqlnd/mysqlnd_priv.h
index b1a948b89a..05035ede6a 100644
--- a/ext/mysqlnd/mysqlnd_priv.h
+++ b/ext/mysqlnd/mysqlnd_priv.h
@@ -113,7 +113,7 @@
 		if ((message)) { \
 			(buf) = mnd_pestrndup((message), (len), (persistent)); \
 		} else { \
-			buf = NULL; \
+			(buf) = NULL; \
 		} \
 		(buf_len) = (len); \
 	}
@@ -130,22 +130,22 @@
 
 #define SET_EMPTY_ERROR(error_info) \
 	{ \
-		error_info.error_no = 0; \
-		error_info.error[0] = '\0'; \
-		strlcpy(error_info.sqlstate, "00000", sizeof(error_info.sqlstate)); \
+		(error_info).error_no = 0; \
+		(error_info).error[0] = '\0'; \
+		strlcpy((error_info).sqlstate, "00000", sizeof((error_info).sqlstate)); \
 	}
 
 #define SET_CLIENT_ERROR(error_info, a, b, c) \
 	{ \
-		error_info.error_no = (a); \
-		strlcpy(error_info.sqlstate, (b), sizeof(error_info.sqlstate)); \
-		strlcpy(error_info.error, (c), sizeof(error_info.error)); \
+		(error_info).error_no = (a); \
+		strlcpy((error_info).sqlstate, (b), sizeof((error_info).sqlstate)); \
+		strlcpy((error_info).error, (c), sizeof((error_info).error)); \
 	}
 
-#define SET_OOM_ERROR(error_info) SET_CLIENT_ERROR(error_info, CR_OUT_OF_MEMORY, UNKNOWN_SQLSTATE, mysqlnd_out_of_memory)
+#define SET_OOM_ERROR(error_info) SET_CLIENT_ERROR((error_info), CR_OUT_OF_MEMORY, UNKNOWN_SQLSTATE, mysqlnd_out_of_memory)
 
 
-#define SET_STMT_ERROR(stmt, a, b, c)	SET_CLIENT_ERROR(stmt->error_info, a, b, c)
+#define SET_STMT_ERROR(stmt, a, b, c)	SET_CLIENT_ERROR((stmt)->error_info, a, b, c)
 
 
 #ifdef ZTS
@@ -153,7 +153,7 @@
 #define CONN_SET_STATE(c, s)	(c)->m->set_state((c), (s) TSRMLS_CC)
 #else
 #define CONN_GET_STATE(c)		((c)->state)
-#define CONN_SET_STATE(c, s)	((c)->state = s)
+#define CONN_SET_STATE(c, s)	((c)->state = (s))
 #endif