X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=phpstr%2Fphpstr.c;h=70673a92ed7c4fd4c8b5f737b75442b98a4d73c9;hp=8d8df3ea25f383cf1e9ec1efe9f0b73d495a4654;hb=dd18f054d481e2d24f766db8f36e8e721950d68c;hpb=909134d3309bdc12023c0fea5acf931041ea0f6b

diff --git a/phpstr/phpstr.c b/phpstr/phpstr.c
index 8d8df3e..70673a9 100644
--- a/phpstr/phpstr.c
+++ b/phpstr/phpstr.c
@@ -4,10 +4,6 @@
 #include "php.h"
 #include "phpstr.h"
 
-#ifndef PHPSTR_DEFAULT_SIZE
-#define PHPSTR_DEFAULT_SIZE 256
-#endif
-
 PHPSTR_API phpstr *phpstr_init_ex(phpstr *buf, size_t chunk_size, zend_bool pre_alloc)
 {
 	if (!buf) {
@@ -235,19 +231,17 @@ PHPSTR_API int phpstr_cmp(phpstr *left, phpstr *right)
 
 PHPSTR_API void phpstr_dtor(phpstr *buf)
 {
-	if (buf->data) {
-		efree(buf->data);
-		buf->data = NULL;
-	}
+	STR_SET(buf->data, NULL);
 	buf->used = 0;
 	buf->free = 0;
 }
 
-PHPSTR_API void phpstr_free(phpstr *buf)
+PHPSTR_API void phpstr_free(phpstr **buf)
 {
-	if (buf) {
-		phpstr_dtor(buf);
-		efree(buf);
+	if (*buf) {
+		phpstr_dtor(*buf);
+		efree(*buf);
+		*buf = NULL;
 	}
 }