X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=phpstr%2Fphpstr.h;h=3a4f88b4794c32d6e402ba2c181bba5ff71495f1;hp=03d024ef1e1f43977b80c6fdb18ee9726e76badd;hb=1df42dae0279a4d0f98b042bb389e90cbd197f6f;hpb=40e535bf0ccece715c2ccc640148fab5ebd9a053

diff --git a/phpstr/phpstr.h b/phpstr/phpstr.h
index 03d024e..3a4f88b 100644
--- a/phpstr/phpstr.h
+++ b/phpstr/phpstr.h
@@ -4,12 +4,20 @@
 #ifndef _PHPSTR_H_
 #define _PHPSTR_H_
 
-#include "php.h"
-
 #ifndef PHPSTR_DEFAULT_SIZE
 #	define PHPSTR_DEFAULT_SIZE 256
 #endif
 
+#define PHPSTR_NOMEM ((size_t) -1)
+
+#ifndef STR_FREE
+#	define STR_FREE(STR) \
+	{ \
+		if (STR) { \
+			efree(STR); \
+		} \
+	}
+#endif
 #ifndef STR_SET
 #	define STR_SET(STR, SET) \
 	{ \
@@ -17,6 +25,30 @@
 		STR = SET; \
 	}
 #endif
+#ifndef TSRMLS_D
+#	define TSRMLS_D
+#	define TSRMLS_DC
+#	define TSRMLS_CC
+#	define TSRMLS_C
+#endif
+#ifdef PHP_ATTRIBUTE_FORMAT
+#	define PHPSTR_ATTRIBUTE_FORMAT(f, a, b) PHP_ATTRIBUTE_FORMAT(f, a, b)
+#else
+#	define PHPSTR_ATTRIBUTE_FORMAT(f, a, b)
+#endif
+#ifndef pemalloc
+#	define pemalloc(s,p)	malloc(s)
+#	define pefree(x,p)		free(x)
+#	define perealloc(x,s,p)	realloc(x,s)
+#	define perealloc_recoverable perealloc
+#	define ecalloc calloc
+static inline void *estrndup(void *p, size_t s)
+{
+	char *r = (char *) malloc(s+1);
+	if (r) memcpy((void *) r, p, s), r[s] = '\0';
+	return (void *) r;
+}
+#endif
 
 #if defined(PHP_WIN32)
 #	if defined(PHPSTR_EXPORTS)
@@ -57,7 +89,7 @@
 #define RETURN_PHPSTR_DUP(STR) RETURN_PHPSTR((STR), PHPSTR_FREE_NOT, 1)
 #define RETVAL_PHPSTR_PTR(STR) RETVAL_PHPSTR((STR), PHPSTR_FREE_PTR, 0)
 #define RETVAL_PHPSTR_VAL(STR) RETVAL_PHPSTR((STR), PHPSTR_FREE_NOT, 0)
-#define RETVAL_PHPSTR_DUP(STR) RETVAÖ_PHPSTR((STR), PHPSTR_FREE_NOT, 1)
+#define RETVAL_PHPSTR_DUP(STR) RETVAL_PHPSTR((STR), PHPSTR_FREE_NOT, 1)
 /* RETURN_PHPSTR(buf, PHPSTR_FREE_PTR, 0) */
 #define RETURN_PHPSTR(STR, free, dup) \
 	RETVAL_PHPSTR((STR), (free), (dup)); \
@@ -68,15 +100,16 @@
 	RETVAL_STRINGL((STR)->data, (STR)->used, (dup)); \
 	FREE_PHPSTR((free), (STR));
 
-typedef struct {
-	size_t size;
+typedef struct _phpstr_t {
 	char  *data;
 	size_t used;
 	size_t free;
-	int    pmem;
+	size_t size;
+	unsigned pmem:1;
+	unsigned reserved:31;
 } phpstr;
 
-typedef enum {
+typedef enum _phpstr_free_t {
 	PHPSTR_FREE_NOT = 0,
 	PHPSTR_FREE_PTR,	/* pefree() */
 	PHPSTR_FREE_VAL,	/* phpstr_dtor() */
@@ -93,7 +126,7 @@ typedef enum {
 
 /* create a new phpstr */
 #define phpstr_new() phpstr_init(NULL)
-#define phpstr_init(b) phpstr_init_ex(b, 0, 0)
+#define phpstr_init(b) phpstr_init_ex(b, PHPSTR_DEFAULT_SIZE, 0)
 #define phpstr_clone(phpstr_pointer) phpstr_init_ex(NULL, (phpstr_pointer)->size, (phpstr_pointer)->pmem ? PHPSTR_INIT_PERSISTENT:0)
 PHPSTR_API phpstr *phpstr_init_ex(phpstr *buf, size_t chunk_size, int flags);
 
@@ -104,26 +137,29 @@ PHPSTR_API phpstr *phpstr_init_ex(phpstr *buf, size_t chunk_size, int flags);
 PHPSTR_API phpstr *phpstr_from_string_ex(phpstr *buf, const char *string, size_t length);
 
 /* usually only called from within the internal functions */
-#define phpstr_resize(b, s) phpstr_resize_ex((b), (s), 0)
-PHPSTR_API size_t phpstr_resize_ex(phpstr *buf, size_t len, size_t override_size);
+#define phpstr_resize(b, s) phpstr_resize_ex((b), (s), 0, 0)
+PHPSTR_API size_t phpstr_resize_ex(phpstr *buf, size_t len, size_t override_size, int allow_error);
+
+/* shrink memory chunk to actually used size (+1) */
+PHPSTR_API size_t phpstr_shrink(phpstr *buf);
 
 /* append data to the phpstr */
 #define phpstr_appends(b, a) phpstr_append((b), (a), sizeof(a)-1)
 #define phpstr_appendl(b, a) phpstr_append((b), (a), strlen(a))
 PHPSTR_API size_t phpstr_append(phpstr *buf, const char *append, size_t append_len);
-PHPSTR_API size_t phpstr_appendf(phpstr *buf, const char *format, ...) PHP_ATTRIBUTE_FORMAT(printf, 2, 3);
+PHPSTR_API size_t phpstr_appendf(phpstr *buf, const char *format, ...) PHPSTR_ATTRIBUTE_FORMAT(printf, 2, 3);
 
 /* insert data at a specific position of the phpstr */
 #define phpstr_inserts(b, i, o) phpstr_insert((b), (i), sizeof(i)-1, (o))
 #define phpstr_insertl(b, i, o) phpstr_insert((b), (i), strlen(i), (o))
 PHPSTR_API size_t phpstr_insert(phpstr *buf, const char *insert, size_t insert_len, size_t offset);
-PHPSTR_API size_t phpstr_insertf(phpstr *buf, size_t offset, const char *format, ...) PHP_ATTRIBUTE_FORMAT(printf, 3, 4);
+PHPSTR_API size_t phpstr_insertf(phpstr *buf, size_t offset, const char *format, ...) PHPSTR_ATTRIBUTE_FORMAT(printf, 3, 4);
 
 /* prepend data */
 #define phpstr_prepends(b, p) phpstr_prepend((b), (p), sizeof(p)-1)
 #define phpstr_prependl(b, p) phpstr_prepend((b), (p), strlen(p))
 PHPSTR_API size_t phpstr_prepend(phpstr *buf, const char *prepend, size_t prepend_len);
-PHPSTR_API size_t phpstr_prependf(phpstr *buf, const char *format, ...) PHP_ATTRIBUTE_FORMAT(printf, 2, 3);
+PHPSTR_API size_t phpstr_prependf(phpstr *buf, const char *format, ...) PHPSTR_ATTRIBUTE_FORMAT(printf, 2, 3);
 
 /* get a zero-terminated string */
 PHPSTR_API char *phpstr_data(const phpstr *buf, char **into, size_t *len);
@@ -170,8 +206,10 @@ PHPSTR_API void phpstr_free(phpstr **buf);
 /* stores data in a phpstr until it reaches chunk_size */
 PHPSTR_API size_t phpstr_chunk_buffer(phpstr **s, const char *data, size_t data_len, char **chunk, size_t chunk_size);
 
+typedef void (*phpstr_passthru_func)(void *opaque, const char *, size_t TSRMLS_DC);
+
 /* wrapper around phpstr_chunk_buffer, which passes available chunks to passthru() */
-PHPSTR_API void phpstr_chunked_output(phpstr **s, const char *data, size_t data_len, size_t chunk_size, void (*passthru)(const char *, size_t TSRMLS_DC) TSRMLS_DC);
+PHPSTR_API void phpstr_chunked_output(phpstr **s, const char *data, size_t data_len, size_t chunk_size, phpstr_passthru_func passthru, void *opaque TSRMLS_DC);
 
 #endif