- ditch warnings

[m6w6/ext-http] / phpstr / phpstr.h

diff --git a/phpstr/phpstr.h b/phpstr/phpstr.h
index a3a15962660da8a7ad552d94c4c12c491ec426ae..295ba3c1402c3f92388d83d6da97a51b6c052d9a 100644 (file)
--- a/phpstr/phpstr.h
+++ b/phpstr/phpstr.h
@@ -31,7 +31,6 @@
 #endif
 
 #define PHPSTR(p) ((phpstr *) (p))
-#define PHPSTR_P(p) ((phpstr **) (&p))
 #define PHPSTR_VAL(p) (PHPSTR(p))->data
 #define PHPSTR_LEN(p) (PHPSTR(p))->used
 
@@ -55,8 +54,10 @@
 
 #define RETURN_PHPSTR_PTR(STR) RETURN_PHPSTR((STR), PHPSTR_FREE_PTR, 0)
 #define RETURN_PHPSTR_VAL(STR) RETURN_PHPSTR((STR), PHPSTR_FREE_NOT, 0)
+#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) 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)); \
@@ -67,7 +68,7 @@
        RETVAL_STRINGL((STR)->data, (STR)->used, (dup)); \
        FREE_PHPSTR((free), (STR));
 
-typedef struct {
+typedef struct _phpstr_t {
        size_t size;
        char  *data;
        size_t used;
@@ -75,7 +76,7 @@ typedef struct {
        int    pmem;
 } phpstr;
 
-typedef enum {
+typedef enum _phpstr_free_t {
        PHPSTR_FREE_NOT = 0,
        PHPSTR_FREE_PTR,        /* pefree() */
        PHPSTR_FREE_VAL,        /* phpstr_dtor() */
@@ -92,7 +93,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);
 
@@ -106,6 +107,9 @@ PHPSTR_API phpstr *phpstr_from_string_ex(phpstr *buf, const char *string, size_t
 #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);
 
+/* 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))
@@ -169,8 +173,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