Convert macros to inline functions in Zend SmartStr

Author: Girgias

Zend/zend_smart_str.h

@@ -21,33 +21,6 @@
 #include "zend_globals.h"
 #include "zend_smart_str_public.h"
 
-#define smart_str_appends_ex(dest, src, what) \
-	smart_str_appendl_ex((dest), (src), strlen(src), (what))
-#define smart_str_appends(dest, src) \
-	smart_str_appendl((dest), (src), strlen(src))
-#define smart_str_extract(dest) \
-	smart_str_extract_ex((dest), 0)
-#define smart_str_trim_to_size(dest) \
-	smart_str_trim_to_size_ex((dest), 0)
-#define smart_str_extend(dest, len) \
-	smart_str_extend_ex((dest), (len), 0)
-#define smart_str_appendc(dest, c) \
-	smart_str_appendc_ex((dest), (c), 0)
-#define smart_str_appendl(dest, src, len) \
-	smart_str_appendl_ex((dest), (src), (len), 0)
-#define smart_str_append(dest, src) \
-	smart_str_append_ex((dest), (src), 0)
-#define smart_str_append_smart_str(dest, src) \
-	smart_str_append_smart_str_ex((dest), (src), 0)
-#define smart_str_sets(dest, src) \
-	smart_str_setl((dest), (src), strlen(src));
-#define smart_str_append_long(dest, val) \
-	smart_str_append_long_ex((dest), (val), 0)
-#define smart_str_append_unsigned(dest, val) \
-	smart_str_append_unsigned_ex((dest), (val), 0)
-#define smart_str_free(dest) \
-	smart_str_free_ex((dest), 0)
-
 BEGIN_EXTERN_C()
 
 ZEND_API void ZEND_FASTCALL smart_str_erealloc(smart_str *str, size_t len);
@@ -87,6 +60,11 @@ static zend_always_inline char* smart_str_extend_ex(smart_str *dest, size_t len,
 	return ret;
 }
 
+static inline char* smart_str_extend(smart_str *dest, size_t length)
+{
+	return smart_str_extend_ex(dest, length, false);
+}
+
 static zend_always_inline void smart_str_free_ex(smart_str *str, bool persistent) {
 	if (str->s) {
 		zend_string_release_ex(str->s, persistent);
@@ -95,6 +73,11 @@ static zend_always_inline void smart_str_free_ex(smart_str *str, bool persistent
 	str->a = 0;
 }
 
+static inline void smart_str_free(smart_str *str)
+{
+	smart_str_free_ex(str, false);
+}
+
 static zend_always_inline void smart_str_0(smart_str *str) {
 	if (str->s) {
 		ZSTR_VAL(str->s)[ZSTR_LEN(str->s)] = '\0';
@@ -113,6 +96,11 @@ static zend_always_inline void smart_str_trim_to_size_ex(smart_str *str, bool pe
 	}
 }
 
+static inline void smart_str_trim_to_size(smart_str *dest)
+{
+	smart_str_trim_to_size_ex(dest, false);
+}
+
 static zend_always_inline zend_string *smart_str_extract_ex(smart_str *str, bool persistent) {
 	if (str->s) {
 		zend_string *res;
@@ -126,6 +114,11 @@ static zend_always_inline zend_string *smart_str_extract_ex(smart_str *str, bool
 	}
 }
 
+static inline zend_string smart_str_extract(smart_str *dest)
+{
+	return smart_str_extract_ex(dest, false);
+}
+
 static zend_always_inline void smart_str_appendc_ex(smart_str *dest, char ch, bool persistent) {
 	size_t new_len = smart_str_alloc(dest, 1, persistent);
 	ZSTR_VAL(dest->s)[new_len - 1] = ch;
@@ -154,15 +147,54 @@ static zend_always_inline void smart_str_append_long_ex(smart_str *dest, zend_lo
 	smart_str_appendl_ex(dest, result, buf + sizeof(buf) - 1 - result, persistent);
 }
 
+static inline void smart_str_append_long(smart_str *dest, zend_long num)
+{
+	smart_str_append_long_ex(dest, num, false);
+}
+
 static zend_always_inline void smart_str_append_unsigned_ex(smart_str *dest, zend_ulong num, bool persistent) {
 	char buf[32];
 	char *result = zend_print_ulong_to_buf(buf + sizeof(buf) - 1, num);
 	smart_str_appendl_ex(dest, result, buf + sizeof(buf) - 1 - result, persistent);
 }
 
+static inline void smart_str_append_unsigned(smart_str *dest, zend_ulong num)
+{
+	smart_str_append_unsigned_ex(dest, num, false);
+}
+
+static inline void smart_str_appendl(smart_str *dest, const char *src, size_t length)
+{
+	smart_str_appendl_ex(dest, src, length, false);
+}
+static inline void smart_str_appends_ex(smart_str *dest, const char *src, bool persistent)
+{
+	smart_str_appendl_ex(dest, src, strlen(src), persistent);
+}
+static inline void smart_str_appends(smart_str *dest, const char *src)
+{
+	smart_str_appendl_ex(dest, src, strlen(src), false);
+}
+static inline void smart_str_append(smart_str *dest, const zend_string *src)
+{
+	smart_str_append_ex(dest, src, false);
+}
+static inline void smart_str_appendc(smart_str *dest, char ch)
+{
+	smart_str_appendc_ex(dest, ch, false);
+}
+static inline void smart_str_append_smart_str(smart_str *dest, const smart_str *src)
+{
+	smart_str_append_smart_str_ex(dest, src, false);
+}
+
 static zend_always_inline void smart_str_setl(smart_str *dest, const char *src, size_t len) {
 	smart_str_free(dest);
 	smart_str_appendl(dest, src, len);
 }
 
+static inline void smart_str_sets(smart_str *dest, const char *src)
+{
+	smart_str_setl(dest, src, strlen(src));
+}
 #endif