X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=include%2Fyaz%2Fodr.h;h=eb12dd4ad27e2ee2485c6c91cf23018eae6f56a4;hp=ac554fc547a89bfa443021e5368de3966d260043;hb=f2891d8771cb23cc70d973c6785bec20e31f511e;hpb=6278ee39573b69b59333a876c52671d0ebbca320 diff --git a/include/yaz/odr.h b/include/yaz/odr.h index ac554fc..eb12dd4 100644 --- a/include/yaz/odr.h +++ b/include/yaz/odr.h @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2009 Index Data. + * Copyright (C) 1995-2010 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: @@ -184,7 +184,7 @@ YAZ_EXPORT void odr_reset(ODR o); YAZ_EXPORT void odr_destroy(ODR o); YAZ_EXPORT void odr_setbuf(ODR o, char *buf, int len, int can_grow); YAZ_EXPORT char *odr_getbuf(ODR o, int *len, int *size); -YAZ_EXPORT void *odr_malloc(ODR o, int size); +YAZ_EXPORT void *odr_malloc(ODR o, size_t size); YAZ_EXPORT char *odr_strdup(ODR o, const char *str); YAZ_EXPORT char *odr_strdupn(ODR o, const char *str, size_t n); YAZ_EXPORT char *odr_strdup_null(ODR o, const char *str); @@ -289,7 +289,7 @@ YAZ_EXPORT int odr_seek(ODR o, int whence, int offset); YAZ_EXPORT int odr_dumpBER(FILE *f, const char *buf, int len); YAZ_EXPORT void odr_choice_bias(ODR o, int what); YAZ_EXPORT void odr_choice_enable_bias(ODR o, int mode); -YAZ_EXPORT int odr_total(ODR o); +YAZ_EXPORT size_t odr_total(ODR o); YAZ_EXPORT char *odr_errmsg(int n); YAZ_EXPORT Odr_oid *odr_getoidbystr(ODR o, const char *str); YAZ_EXPORT Odr_oid *odr_getoidbystr_nmem(NMEM o, const char *str); @@ -342,6 +342,8 @@ YAZ_EXPORT const char **odr_get_element_path(ODR o); YAZ_EXPORT Odr_int odr_atoi(const char *s); +YAZ_EXPORT Odr_int odr_strtol(const char *nptr, char **endptr, int base); + YAZ_END_CDECL #include