Make z_HTTP_header_set public and extend z_HTTP_errmsg

[yaz-moved-to-github.git] / include / yaz / nmem.h

diff --git a/include/yaz/nmem.h b/include/yaz/nmem.h
index 39c47eb..e28bf0b 100644 (file)
--- a/include/yaz/nmem.h
+++ b/include/yaz/nmem.h
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2009 Index Data.
+ * Copyright (C) 1995-2013 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -44,13 +44,22 @@ YAZ_BEGIN_CDECL
 typedef struct nmem_control *NMEM;
 
 /** \brief Set to 1 if YAZ BER integer is 64-bit ; 0 otherwise */
+#ifndef NMEM_64
 #define NMEM_64 1
+#endif
 
 #if NMEM_64
-/** \brief BER/utility integer (64-bit or more) */
+
+#ifdef _MSC_VER
+/* Visual Studio. 6.0 and later supports this */
+typedef __int64 nmem_int_t;
+#define NMEM_INT_PRINTF "%I64d"
+#else
+/* C99 */
 typedef long long int nmem_int_t;
-/** \brief printf format for nmem_int_t type */
 #define NMEM_INT_PRINTF "%lld"
+#endif
+
 #else
 /** \brief BER/utility integer (32-bit on most platforms) */
 typedef int nmem_int_t;
@@ -61,7 +70,7 @@ typedef int nmem_int_t;
 /** \brief BER/utility boolean */
 typedef int nmem_bool_t;
 
-/** \brief releases memory associaged with an NMEM handle 
+/** \brief releases memory associaged with an NMEM handle
     \param n NMEM handle
 */
 YAZ_EXPORT void nmem_reset(NMEM n);
@@ -69,9 +78,9 @@ YAZ_EXPORT void nmem_reset(NMEM n);
 /** \brief returns size in bytes of memory for NMEM handle
     \returns number of bytes
  */
-YAZ_EXPORT int nmem_total(NMEM n);
+YAZ_EXPORT size_t nmem_total(NMEM n);
 
-/** \brief allocates string on NMEM handle (similar strdup) 
+/** \brief allocates string on NMEM handle (similar strdup)
     \param mem HNEM handle
     \param src string
     \returns duplicated string
@@ -94,7 +103,7 @@ YAZ_EXPORT char *nmem_strdupn(NMEM mem, const char *src, size_t n);
 
 /** \brief allocates sub strings out of string using certain delimitors
     \param nmem NMEM handle
-    \param delim delimitor chars (splits on each char in there) 
+    \param delim delimitor chars (splits on each char in there)
     \param dstr string to be split
     \param darray result string array for each sub string
     \param num number of result strings
@@ -103,6 +112,19 @@ YAZ_EXPORT void nmem_strsplit(NMEM nmem, const char *delim,
                               const char *dstr,
                               char ***darray, int *num);
 
+/** \brief allocates sub strings out of string using certain delimitors
+    \param nmem NMEM handle
+    \param delim delimitor chars (splits on each char in there)
+    \param dstr string to be split
+    \param darray result string array for each sub string
+    \param num number of result strings
+    \param collapse 1=collapse multiple delims to one; 0=no collapse
+*/
+YAZ_EXPORT void nmem_strsplitx(NMEM nmem, const char *delim,
+                               const char *dstr,
+                               char ***darray, int *num,
+                               int collapse);
+
 /** \brief splits string into sub strings delimited by blanks
     \param nmem NMEM handle
     \param dstr string to be split
@@ -112,6 +134,36 @@ YAZ_EXPORT void nmem_strsplit(NMEM nmem, const char *delim,
 YAZ_EXPORT void nmem_strsplit_blank(NMEM nmem, const char *dstr,
                                     char ***darray, int *num);
 
+
+/** \brief allocates sub strings out of string using certain delimitors
+    \param nmem NMEM handle
+    \param delim delimitor chars (splits on each char in there)
+    \param dstr string to be split
+    \param darray result string array for each sub string
+    \param num number of result strings
+    \param collapse 1=collapse multiple delims to one; 0=no collapse
+    \param escape_char != 0, an escape char (could be \)
+*/
+YAZ_EXPORT void nmem_strsplit_escape(NMEM nmem, const char *delim,
+                                     const char *dstr,
+                                     char ***darray, int *num, int collapse,
+                                     int escape_char);
+
+/** \brief allocates sub strings out of string using certain delimitors
+    \param nmem NMEM handle
+    \param delim delimitor chars (splits on each char in there)
+    \param dstr string to be split
+    \param darray result string array for each sub string
+    \param num number of result strings
+    \param collapse 1=collapse multiple delims to one; 0=no collapse
+    \param escape_char != 0, an escape char (could be \)
+    \param subst_escape 1=substitute escapes, 0 leave as is
+*/
+YAZ_EXPORT void nmem_strsplit_escape2(NMEM nmem, const char *delim,
+                                      const char *dstr,
+                                      char ***darray, int *num, int collapse,
+                                      int escape_char, int subst_escape);
+
 /** \brief allocates and sets integer for NMEM
     \param nmem NMEM handle
     \param v integer value
@@ -132,7 +184,7 @@ YAZ_EXPORT nmem_bool_t *nmem_booldup(NMEM nmem, nmem_bool_t v);
  */
 YAZ_EXPORT void nmem_transfer(NMEM dst, NMEM src);
 
-/** \brief returns new NMEM handle 
+/** \brief returns new NMEM handle
     \returns NMEM handle
  */
 YAZ_EXPORT NMEM nmem_create(void);
@@ -147,7 +199,7 @@ YAZ_EXPORT void nmem_destroy(NMEM n);
     \param size number of bytes to be allocated
     \returns pointer to allocated memory
  */
-YAZ_EXPORT void *nmem_malloc(NMEM n, int size);
+YAZ_EXPORT void *nmem_malloc(NMEM n, size_t size);
 
 YAZ_END_CDECL