summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Zend/zend_API.h36
-rw-r--r--Zend/zend_types.h8
-rw-r--r--ext/dom/node.c2
-rw-r--r--ext/dom/xpath.c2
-rw-r--r--ext/exif/exif.c2
-rw-r--r--ext/gd/gd.c2
-rw-r--r--ext/mysqli/mysqli_api.c2
-rw-r--r--ext/odbc/php_odbc.c2
-rw-r--r--ext/reflection/php_reflection.c2
-rw-r--r--ext/simplexml/simplexml.c2
-rw-r--r--ext/soap/soap.c2
-rw-r--r--ext/standard/array.c2
-rw-r--r--ext/standard/hrtime.c2
-rw-r--r--ext/zip/php_zip.c2
14 files changed, 34 insertions, 34 deletions
diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index d88fa5a856..fcc7313084 100644
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -627,24 +627,24 @@ END_EXTERN_C()
#define RETVAL_FALSE ZVAL_FALSE(return_value)
#define RETVAL_TRUE ZVAL_TRUE(return_value)
-#define RETURN_BOOL(b) { RETVAL_BOOL(b); return; }
-#define RETURN_NULL() { RETVAL_NULL(); return;}
-#define RETURN_LONG(l) { RETVAL_LONG(l); return; }
-#define RETURN_DOUBLE(d) { RETVAL_DOUBLE(d); return; }
-#define RETURN_STR(s) { RETVAL_STR(s); return; }
-#define RETURN_INTERNED_STR(s) { RETVAL_INTERNED_STR(s); return; }
-#define RETURN_NEW_STR(s) { RETVAL_NEW_STR(s); return; }
-#define RETURN_STR_COPY(s) { RETVAL_STR_COPY(s); return; }
-#define RETURN_STRING(s) { RETVAL_STRING(s); return; }
-#define RETURN_STRINGL(s, l) { RETVAL_STRINGL(s, l); return; }
-#define RETURN_EMPTY_STRING() { RETVAL_EMPTY_STRING(); return; }
-#define RETURN_RES(r) { RETVAL_RES(r); return; }
-#define RETURN_ARR(r) { RETVAL_ARR(r); return; }
-#define RETURN_EMPTY_ARRAY() { RETVAL_EMPTY_ARRAY(); return; }
-#define RETURN_OBJ(r) { RETVAL_OBJ(r); return; }
-#define RETURN_ZVAL(zv, copy, dtor) { RETVAL_ZVAL(zv, copy, dtor); return; }
-#define RETURN_FALSE { RETVAL_FALSE; return; }
-#define RETURN_TRUE { RETVAL_TRUE; return; }
+#define RETURN_BOOL(b) do { RETVAL_BOOL(b); return; } while (0)
+#define RETURN_NULL() do { RETVAL_NULL(); return;} while (0)
+#define RETURN_LONG(l) do { RETVAL_LONG(l); return; } while (0)
+#define RETURN_DOUBLE(d) do { RETVAL_DOUBLE(d); return; } while (0)
+#define RETURN_STR(s) do { RETVAL_STR(s); return; } while (0)
+#define RETURN_INTERNED_STR(s) do { RETVAL_INTERNED_STR(s); return; } while (0)
+#define RETURN_NEW_STR(s) do { RETVAL_NEW_STR(s); return; } while (0)
+#define RETURN_STR_COPY(s) do { RETVAL_STR_COPY(s); return; } while (0)
+#define RETURN_STRING(s) do { RETVAL_STRING(s); return; } while (0)
+#define RETURN_STRINGL(s, l) do { RETVAL_STRINGL(s, l); return; } while (0)
+#define RETURN_EMPTY_STRING() do { RETVAL_EMPTY_STRING(); return; } while (0)
+#define RETURN_RES(r) do { RETVAL_RES(r); return; } while (0)
+#define RETURN_ARR(r) do { RETVAL_ARR(r); return; } while (0)
+#define RETURN_EMPTY_ARRAY() do { RETVAL_EMPTY_ARRAY(); return; } while (0)
+#define RETURN_OBJ(r) do { RETVAL_OBJ(r); return; } while (0)
+#define RETURN_ZVAL(zv, copy, dtor) do { RETVAL_ZVAL(zv, copy, dtor); return; } while (0)
+#define RETURN_FALSE do { RETVAL_FALSE; return; } while (0)
+#define RETURN_TRUE do { RETVAL_TRUE; return; } while (0)
#define HASH_OF(p) (Z_TYPE_P(p)==IS_ARRAY ? Z_ARRVAL_P(p) : ((Z_TYPE_P(p)==IS_OBJECT ? Z_OBJ_HT_P(p)->get_properties(Z_OBJ_P(p)) : NULL)))
#define ZVAL_IS_NULL(z) (Z_TYPE_P(z) == IS_NULL)
diff --git a/Zend/zend_types.h b/Zend/zend_types.h
index 6ba488d88b..a4e657513a 100644
--- a/Zend/zend_types.h
+++ b/Zend/zend_types.h
@@ -770,17 +770,17 @@ static zend_always_inline uint32_t zval_gc_info(uint32_t gc_type_info) {
(b) ? IS_TRUE : IS_FALSE; \
} while (0)
-#define ZVAL_LONG(z, l) { \
+#define ZVAL_LONG(z, l) do { \
zval *__z = (z); \
Z_LVAL_P(__z) = l; \
Z_TYPE_INFO_P(__z) = IS_LONG; \
- }
+ } while (0)
-#define ZVAL_DOUBLE(z, d) { \
+#define ZVAL_DOUBLE(z, d) do { \
zval *__z = (z); \
Z_DVAL_P(__z) = d; \
Z_TYPE_INFO_P(__z) = IS_DOUBLE; \
- }
+ } while (0)
#define ZVAL_STR(z, s) do { \
zval *__z = (z); \
diff --git a/ext/dom/node.c b/ext/dom/node.c
index 609d1a6116..51153b7a33 100644
--- a/ext/dom/node.c
+++ b/ext/dom/node.c
@@ -1228,7 +1228,7 @@ PHP_FUNCTION(dom_node_remove_child)
}
php_dom_throw_error(NOT_FOUND_ERR, stricterror);
- RETURN_FALSE
+ RETURN_FALSE;
}
/* }}} end dom_node_remove_child */
diff --git a/ext/dom/xpath.c b/ext/dom/xpath.c
index 69fdcb947f..063d18f01c 100644
--- a/ext/dom/xpath.c
+++ b/ext/dom/xpath.c
@@ -329,7 +329,7 @@ PHP_FUNCTION(dom_xpath_register_ns)
}
if (xmlXPathRegisterNs(ctxp, prefix, ns_uri) != 0) {
- RETURN_FALSE
+ RETURN_FALSE;
}
RETURN_TRUE;
}
diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index 28899ff736..6aff3dab4e 100644
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -2681,7 +2681,7 @@ PHP_FUNCTION(exif_tagname)
RETURN_FALSE;
}
- RETURN_STRING(szTemp)
+ RETURN_STRING(szTemp);
}
/* }}} */
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 69d7e426ec..c678b4b099 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -4244,7 +4244,7 @@ static void php_image_filter_scatter(INTERNAL_FUNCTION_PARAMETERS)
efree(colors);
} else {
- RETURN_BOOL(gdImageScatter(im, (int) scatter_sub, (int) scatter_plus))
+ RETURN_BOOL(gdImageScatter(im, (int) scatter_sub, (int) scatter_plus));
}
}
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index 12326df379..af98e7e9b3 100644
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -816,7 +816,7 @@ PHP_FUNCTION(mysqli_dump_debug_info)
}
MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
- RETURN_BOOL(!mysql_dump_debug_info(mysql->mysql))
+ RETURN_BOOL(!mysql_dump_debug_info(mysql->mysql));
}
/* }}} */
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 6bd24781b4..8b6c56a122 100644
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -2878,7 +2878,7 @@ PHP_FUNCTION(odbc_field_type)
}
PHP_ODBC_SQLCOLATTRIBUTE(result->stmt, (SQLUSMALLINT)pv_num, SQL_COLUMN_TYPE_NAME, tmp, 31, &tmplen, NULL);
- RETURN_STRING(tmp)
+ RETURN_STRING(tmp);
}
/* }}} */
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index eebea38bc8..ee5f5d82b8 100644
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -5507,7 +5507,7 @@ ZEND_METHOD(reflection_property, isInitialized)
if (ref->prop.flags & ZEND_ACC_STATIC) {
member_p = zend_read_static_property_ex(intern->ce, ref->unmangled_name, 1);
if (member_p) {
- RETURN_BOOL(!Z_ISUNDEF_P(member_p))
+ RETURN_BOOL(!Z_ISUNDEF_P(member_p));
}
RETURN_FALSE;
} else {
diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index bb8dfb3766..8279770b7f 100644
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -1413,7 +1413,7 @@ SXE_METHOD(registerXPathNamespace)
}
if (xmlXPathRegisterNs(sxe->xpath, (xmlChar *)prefix, (xmlChar *)ns_uri) != 0) {
- RETURN_FALSE
+ RETURN_FALSE;
}
RETURN_TRUE;
}
diff --git a/ext/soap/soap.c b/ext/soap/soap.c
index e4fb3c5fd7..9eebe19096 100644
--- a/ext/soap/soap.c
+++ b/ext/soap/soap.c
@@ -2250,7 +2250,7 @@ PHP_FUNCTION(is_soap_fault)
instanceof_function(Z_OBJCE_P(fault), soap_fault_class_entry)) {
RETURN_TRUE;
}
- RETURN_FALSE
+ RETURN_FALSE;
}
/* }}} */
diff --git a/ext/standard/array.c b/ext/standard/array.c
index 3bbe5bebba..121d09f40d 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -3918,7 +3918,7 @@ PHP_FUNCTION(array_keys)
/* Base case: empty input */
if (!elem_count) {
- RETURN_ZVAL(input, 1, 0)
+ RETURN_ZVAL(input, 1, 0);
}
/* Initialize return array */
diff --git a/ext/standard/hrtime.c b/ext/standard/hrtime.c
index 2a6707f7bd..c6e48d075e 100644
--- a/ext/standard/hrtime.c
+++ b/ext/standard/hrtime.c
@@ -183,7 +183,7 @@ PHP_FUNCTION(hrtime)
add_next_index_long(return_value, (zend_long)(t % (php_hrtime_t)NANO_IN_SEC));
}
#else
- RETURN_FALSE
+ RETURN_FALSE;
#endif
}
/* }}} */
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
index 65e6a0db22..6c301cc490 100644
--- a/ext/zip/php_zip.c
+++ b/ext/zip/php_zip.c
@@ -1286,7 +1286,7 @@ static PHP_NAMED_FUNCTION(zif_zip_entry_read)
RETURN_NEW_STR(buffer);
} else {
zend_string_efree(buffer);
- RETURN_EMPTY_STRING()
+ RETURN_EMPTY_STRING();
}
} else {
RETURN_FALSE;
View Lorry Controller Status