Clean up STR_CAT macro (it is still ugly)

diff --git a/ext/session/session.c b/ext/session/session.c
index 3416985fe0e3e1ba46f705972e2aacdd1773bbc7..33d36d17af81ef3efbf6dbb0986a9a33b1d72c1d 100644 (file)
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -169,14 +169,9 @@ typedef struct {
 #define STR_CAT(P,S,I) {\
        pval *__p = (P);\
        size_t __l = (I);\
-               ulong __i = Z_STRLEN_P(__p);\
-               Z_STRLEN_P(__p) += __l;\
-               if (Z_STRVAL_P(__p)) {\
-                       Z_STRVAL_P(__p) = (char *)erealloc(Z_STRVAL_P(__p), Z_STRLEN_P(__p) + 1);\
-               } else {\
-                       Z_STRVAL_P(__p) = emalloc(Z_STRLEN_P(__p) + 1);\
-                               *Z_STRVAL_P(__p) = 0;\
-               }\
+       ulong __i = Z_STRLEN_P(__p);\
+       Z_STRLEN_P(__p) += __l;\
+       Z_STRVAL_P(__p) = (char *)erealloc(Z_STRVAL_P(__p), Z_STRLEN_P(__p) + 1);\
        memcpy(Z_STRVAL_P(__p) + __i, (S), __l); \
        Z_STRVAL_P(__p)[Z_STRLEN_P(__p)] = '\0'; \
 }