X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fyaz%2Fnmem.h;h=bd4ff0988e2be23f8e5a475e267e487a749f1465;hb=110d2cfec5051b981403e6aa432fa4863d401893;hp=da63a1a6e440f55448c751ebb0da29df6836bb67;hpb=e627986266d8fcda1b273c1ecab36400494bf76c;p=yaz-moved-to-github.git diff --git a/include/yaz/nmem.h b/include/yaz/nmem.h index da63a1a..bd4ff09 100644 --- a/include/yaz/nmem.h +++ b/include/yaz/nmem.h @@ -23,7 +23,7 @@ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. * - * $Id: nmem.h,v 1.15 2005-05-02 19:14:33 adam Exp $ + * $Id: nmem.h,v 1.17 2005-06-25 15:46:03 adam Exp $ */ /** @@ -35,6 +35,8 @@ */ #ifndef NMEM_H #define NMEM_H + +#include #include #define NMEM_DEBUG 0 @@ -45,20 +47,9 @@ YAZ_BEGIN_CDECL -typedef struct nmem_block -{ - char *buf; /* memory allocated in this block */ - int size; /* size of buf */ - int top; /* top of buffer */ - struct nmem_block *next; -} nmem_block; - -typedef struct nmem_control -{ - int total; - nmem_block *blocks; - struct nmem_control *next; -} nmem_control; +typedef struct nmem_block nmem_block; + +typedef struct nmem_control nmem_control; typedef struct nmem_mutex *NMEM_MUTEX; YAZ_EXPORT void nmem_mutex_create(NMEM_MUTEX *); @@ -73,10 +64,10 @@ YAZ_EXPORT int nmem_total(NMEM n); YAZ_EXPORT char *nmem_strdup (NMEM mem, const char *src); YAZ_EXPORT char *nmem_strdupn (NMEM mem, const char *src, size_t n); YAZ_EXPORT void nmem_strsplit_blank(NMEM nmem, const char *dstr, - char ***darray, int *num); + char ***darray, int *num); YAZ_EXPORT void nmem_strsplit(NMEM nmem, const char *delim, - const char *dstr, - char ***darray, int *num); + const char *dstr, + char ***darray, int *num); YAZ_EXPORT int *nmem_intdup (NMEM mem, int v); YAZ_EXPORT void nmem_transfer (NMEM dst, NMEM src); @@ -115,3 +106,11 @@ YAZ_EXPORT void yaz_strerror(char *buf, int max); YAZ_END_CDECL #endif +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +