diff -r 21274e5950af -r a1f4cb076d2f src/server/util/util.h --- a/src/server/util/util.h Tue Aug 13 22:14:32 2019 +0200 +++ b/src/server/util/util.h Sat Sep 24 16:26:10 2022 +0200 @@ -170,6 +170,11 @@ NSAPI_PUBLIC int INTutil_snprintf(char *s, int n, const char *fmt, ...); +NSAPI_PUBLIC int util_vasprintf(pool_handle_t *pool, char **s, const char *fmt, + va_list args); + +NSAPI_PUBLIC int util_asprintf(pool_handle_t *pool, char **s, const char *fmt, ...); + NSAPI_PUBLIC int util_strlftime(char *dst, size_t dstsize, const char *format, const struct tm *t); NSAPI_PUBLIC int INTutil_strftime(char *s, const char *format, const struct tm *t); @@ -197,10 +202,13 @@ NSAPI_PUBLIC PRBool INTutil_format_http_version(const char *v, int *protv_num, char *buffer, int size); NSAPI_PUBLIC int INTutil_getboolean(const char *v, int def); -int util_getboolean_s(sstr_t s, int def); +int util_getboolean_s(scstr_t s, int def); // new -NSAPI_PUBLIC int util_strtoint(char *str, int64_t *value); +NSAPI_PUBLIC int util_strtoint(const char *str, int64_t *value); +NSAPI_PUBLIC const char* util_resource_name(const char *url); +NSAPI_PUBLIC char* util_parent_path(const char *path); +NSAPI_PUBLIC char* util_parent_path_pool(pool_handle_t *pool, const char *path); // TODO //NSAPI_PUBLIC PRIntervalTime INTutil_getinterval(const char *v, PRIntervalTime def); @@ -229,8 +237,6 @@ NSAPI_PUBLIC int64_t util_atoi64(const char *a); -NSAPI_PUBLIC char *util_html_escape(const char *s); - NSAPI_PUBLIC int util_qtoi(const char *q, const char **p); /* path utils */ @@ -331,6 +337,8 @@ #define util_sprintf INTutil_sprintf #define util_vsnprintf INTutil_vsnprintf #define util_snprintf INTutil_snprintf +#define util_vasprintf INTutil_vasprintf +#define util_asprintf INTutil_asprintf #define util_strftime INTutil_strftime #define util_strcasecmp INTutil_strcasecmp #define util_strncasecmp INTutil_strncasecmp