Mercurial > hg > ucx / file diff

     1.1 --- a/ucx/utils.c	Mon Jun 02 16:04:11 2014 +0200
     1.2 +++ b/ucx/utils.c	Tue Jun 10 15:43:13 2014 +0200
     1.3 @@ -212,7 +212,7 @@
     1.4      va_copy(ap2, ap);
     1.5      int ret = vsnprintf(buf, UCX_PRINTF_BUFSIZE, fmt, ap);
     1.6      if (ret > 0 && ret < UCX_PRINTF_BUFSIZE) {
     1.7 -        s.ptr = (char*)a->malloc(a->pool, ret + 1);
     1.8 +        s.ptr = (char*)almalloc(a, ret + 1);
     1.9          s.length = (size_t)ret;
    1.10          memcpy(s.ptr, buf, ret);
    1.11          s.ptr[s.length] = '\0';
    1.12 @@ -220,7 +220,7 @@
    1.13          errno = ENOMEM;
    1.14      } else  {
    1.15          int len = ret + 1;
    1.16 -        s.ptr = (char*)a->malloc(a->pool, len);
    1.17 +        s.ptr = (char*)almalloc(a, len);
    1.18          ret = vsnprintf(s.ptr, len, fmt, ap2);
    1.19          if (ret < 0) {
    1.20              free(s.ptr);
    1.21 @@ -232,7 +232,7 @@
    1.22  #else
    1.23      int ret = vsnprintf(buf, UCX_PRINTF_BUFSIZE, fmt, ap);
    1.24      if (ret > 0 && ret < UCX_PRINTF_BUFSIZE) {
    1.25 -        s.ptr = (char*)a->malloc(a->pool, ret + 1);
    1.26 +        s.ptr = (char*)almalloc(a, ret + 1);
    1.27          s.length = (size_t)ret;
    1.28          memcpy(s.ptr, buf, ret);
    1.29          s.ptr[s.length] = '\0';