cvs: php4 /ext/session session.c
| From: | Sascha Schumann | Date: | Wed, 27 Sep 2000 15:24:09 +0000 |
| Subject: | cvs: php4 /ext/session session.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-1843@lists.php.net to get a copy of this message | ||
sas Wed Sep 27 08:24:09 2000 EDT
Modified files:
/php4/ext/session session.c
Log:
Clean up STR_CAT macro (it is still ugly)
Index: php4/ext/session/session.c
diff -u php4/ext/session/session.c:1.175 php4/ext/session/session.c:1.176
--- php4/ext/session/session.c:1.175 Tue Sep 26 04:00:02 2000
+++ php4/ext/session/session.c Wed Sep 27 08:24:09 2000
@@ -169,14 +169,9 @@
#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'; \
}