Mercurial > hg > ucx / file diff

     1.1 --- a/ucx/memstream.c	Tue Oct 09 16:46:29 2012 +0200
     1.2 +++ b/ucx/memstream.c	Wed Oct 10 09:32:06 2012 +0200
     1.3 @@ -69,10 +69,6 @@
     1.4      return stream->pos >= stream->length;
     1.5  }
     1.6  
     1.7 -int ucx_memoverflow(UcxMemstream *stream) {
     1.8 -    return stream->pos > stream->length;
     1.9 -}
    1.10 -
    1.11  size_t ucx_memtell(UcxMemstream *stream) {
    1.12      return stream->pos;
    1.13  }
    1.14 @@ -80,12 +76,8 @@
    1.15  size_t ucx_memio(void* d, size_t s, size_t n, UcxMemstream *m, _Bool read) {
    1.16      size_t len;
    1.17      if (m->pos + s*n > m->length) {
    1.18 -        if (ucx_memoverflow(m)) {
    1.19 -            len = 0;
    1.20 -        } else {
    1.21 -            len = m->length - m->pos;
    1.22 -            if (s > 1) len -= len%s;
    1.23 -        }
    1.24 +        len = m->length - m->pos;
    1.25 +        if (s > 1) len -= len%s;
    1.26      } else {
    1.27          len = s*n;
    1.28      }
    1.29 @@ -124,29 +116,3 @@
    1.30          return c;
    1.31      }
    1.32  }
    1.33 -
    1.34 -int ucx_memprintf(UcxMemstream *stream, const char* format, ...) {
    1.35 -    va_list v;
    1.36 -    va_start(v, format);
    1.37 -    int r = vsprintf((char*)stream->space+stream->pos, format, v);
    1.38 -    va_end(v);
    1.39 -
    1.40 -    stream->pos += r;
    1.41 -
    1.42 -    return r;
    1.43 -}
    1.44 -
    1.45 -int ucx_memscanf(UcxMemstream *stream, const char* format, ...) {
    1.46 -
    1.47 -    /* TODO: vsscanf returns the number of fields read,
    1.48 -     * we need the number of bytes */
    1.49 -
    1.50 -    va_list v;
    1.51 -    va_start(v, format);
    1.52 -    int r = vsscanf((char*)stream->space+stream->pos, format, v);
    1.53 -    va_end(v);
    1.54 -
    1.55 -    stream->pos += r;
    1.56 -
    1.57 -    return r;
    1.58 -}