New upstream version 5.2upstream/5.2upstream

1 files changed, 5 insertions, 17 deletions

diff --git a/include/libHX/string.h b/include/libHX/string.h
index 4da3619..707a2a9 100644
--- a/include/libHX/string.h
+++ b/include/libHX/string.h
@@ -26,8 +26,6 @@ enum {
 	HXQUOTE_LDAPRDN,
 	HXQUOTE_BASE64,
 	HXQUOTE_URIENC,
-	HXQUOTE_SQLSQUOTE,
-	HXQUOTE_SQLBQUOTE,
 	HXQUOTE_BASE64URL,
 	HXQUOTE_BASE64IMAP,
 	_HXQUOTE_MAX,
@@ -63,6 +61,10 @@ extern hxmc_t *HXmc_memins(hxmc_t **, size_t, const void *, size_t);
 extern hxmc_t *HXmc_memdel(hxmc_t *, size_t, size_t);
 extern void HXmc_free(hxmc_t *);
 extern void HXmc_zvecfree(hxmc_t **);
+#ifndef LIBHX_ZVECFREE_DECLARATION
+#define LIBHX_ZVECFREE_DECLARATION
+extern void HX_zvecfree(char **);
+#endif
 
 /*
  *	STRING.C
@@ -87,15 +89,12 @@ extern char *HX_strlcpy(char *, const char *, size_t);
 extern char *HX_strlncat(char *, const char *, size_t, size_t);
 extern char *HX_strlower(char *);
 extern size_t HX_strltrim(char *);
-extern char *HX_stpltrim(const char *);
 extern char *HX_strmid(const char *, long, long);
 extern char *HX_strndup(const char *, size_t);
-extern size_t HX_strnlen(const char *, size_t);
 extern char *HX_strquote(const char *, unsigned int, char **);
 extern size_t HX_strrcspn(const char *, const char *);
 extern char *HX_strrev(char *);
 extern size_t HX_strrtrim(char *);
-extern char *HX_strsep(char **, const char *);
 extern char *HX_strsep2(char **, const char *);
 extern char *HX_strupper(char *);
 extern double HX_strtod_unit(const char *, char **, unsigned int exponent);
@@ -104,6 +103,7 @@ extern char *HX_unit_size(char *out, size_t bufsize, unsigned long long size, un
 extern char *HX_unit_size_cu(char *out, size_t bufsize, unsigned long long size, unsigned int divisor);
 extern unsigned long long HX_strtoull_sec(const char *s, char **);
 extern unsigned long long HX_strtoull_nsec(const char *s, char **);
+extern unsigned long long HX_strtoull8601p_sec(const char *s, char **);
 extern char *HX_unit_seconds(char *out, size_t bufsize, unsigned long long seconds, unsigned int flags);
 
 static __inline__ void *HX_memdup(const void *buf, size_t len)
@@ -118,16 +118,4 @@ static __inline__ void *HX_memdup(const void *buf, size_t len)
 } /* extern "C" */
 #endif
 
-#ifdef __cplusplus
-extern "C++" {
-
-template<typename type> static __inline__ type
-HX_memdup(const void *data, size_t n)
-{
-	return reinterpret_cast<type>(HX_memdup(data, n));
-}
-
-} /* extern "C++" */
-#endif
-
 #endif /* _LIBHX_STRING_H */