Mercurial > hg > ucx / file diff

     1.1 --- a/ucx/string.c	Wed Feb 27 14:52:52 2013 +0100
     1.2 +++ b/ucx/string.c	Wed Feb 27 16:59:02 2013 +0100
     1.3 @@ -39,21 +39,6 @@
     1.4      return size;
     1.5  }
     1.6  
     1.7 -sstr_t sstrcat(sstr_t s, ...) {
     1.8 -    va_list ap;
     1.9 -    va_start(ap, s);
    1.10 -    s.ptr[0] = 0;
    1.11 -
    1.12 -    sstr_t str = va_arg (ap, sstr_t);
    1.13 -    while (str.ptr != NULL) {
    1.14 -        s.ptr = strncat (s.ptr, str.ptr, s.length);
    1.15 -        str = va_arg (ap, sstr_t);
    1.16 -    }
    1.17 -    va_end(ap);
    1.18 -
    1.19 -    return s;
    1.20 -}
    1.21 -
    1.22  sstr_t sstrncat(size_t n, sstr_t s, sstr_t c1, ...) {
    1.23      va_list ap;
    1.24      va_start(ap, c1);
    1.25 @@ -78,6 +63,7 @@
    1.26          ptr += cplen;
    1.27      }
    1.28      va_end(ap);
    1.29 +    s.length = ptr - s.ptr;
    1.30  
    1.31      return s;
    1.32  }