X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=phpstr%2Fphpstr.h;h=9ef71efbe5d3bc33a9a3802b20529f5ffe0e4e6e;hb=724e5fabfb5ed0ff62c37a857c403db89eb5fb5e;hp=cb7d06a1d6b05ead57961994ff31185791fd0884;hpb=909134d3309bdc12023c0fea5acf931041ea0f6b;p=m6w6%2Fext-http diff --git a/phpstr/phpstr.h b/phpstr/phpstr.h index cb7d06a..9ef71ef 100644 --- a/phpstr/phpstr.h +++ b/phpstr/phpstr.h @@ -31,6 +31,8 @@ #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 RETVAL_PHPSTR_PTR(STR) RETVAL_PHPSTR((STR), PHPSTR_FREE_PTR, 0) +#define RETVAL_PHPSTR_VAL(STR) RETVAL_PHPSTR(&(STR), PHPSTR_FREE_NOT, 0) /* RETURN_PHPSTR(buf, PHPSTR_FREE_PTR, 0) */ #define RETURN_PHPSTR(STR, free, dup) \ RETVAL_PHPSTR((STR), (free), (dup)); \ @@ -80,19 +82,19 @@ PHPSTR_API void phpstr_resize_ex(phpstr *buf, size_t len, size_t override_size); #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, ...); +PHPSTR_API size_t phpstr_appendf(phpstr *buf, const char *format, ...) PHP_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, ...); +PHPSTR_API size_t phpstr_insertf(phpstr *buf, size_t offset, const char *format, ...) PHP_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, ...); +PHPSTR_API size_t phpstr_prependf(phpstr *buf, const char *format, ...) PHP_ATTRIBUTE_FORMAT(printf, 2, 3); /* get a zero-terminated string */ PHPSTR_API char *phpstr_data(const phpstr *buf, char **into, size_t *len);