From 365cc1632a912a7ab6ab2b4f43207b070315798a Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Thu, 21 Feb 2019 23:33:20 -0800 Subject: [PATCH] Remove obsolete files --- lasagna/ioq/iobuf_getnets.c | 104 ------------------------------------ lasagna/ioq/iobuf_getrec.c | 50 ----------------- 2 files changed, 154 deletions(-) delete mode 100644 lasagna/ioq/iobuf_getnets.c delete mode 100644 lasagna/ioq/iobuf_getrec.c diff --git a/lasagna/ioq/iobuf_getnets.c b/lasagna/ioq/iobuf_getnets.c deleted file mode 100644 index 55447ee..0000000 --- a/lasagna/ioq/iobuf_getnets.c +++ /dev/null @@ -1,104 +0,0 @@ -/* -** iobuf_getnets.c -** wcm, 2004.04.28 - 2004.04.29 -** === -*/ -#include "iobuf.h" - -#include "buf.h" -#include "dynbuf.h" - - -static -int -get_netslen(iobuf *ibuf, size_t *len, size_t max) -{ - char c; - size_t n = 0; - int digits = 0; - -/* -** returns length in len and: -** -3, netstring format error -** -1, io error -** 0, EOF -** 1, ok -*/ - - for(;;){ - switch(iobuf_GETC(ibuf, &c)){ - case -1: return -1; /* io error */ - case 0: return 0; /* EOF */ - default: break; /* ok */ - } - if(c == ':'){ - if(digits){ - *len = n; - return 1; - } - else break; - } - if((c < '0') || (c > '9')) break; - n = 10 * n + (c - '0'); - if((digits && (n == 0)) || (n > max)) break; - ++digits; - } - - /* netstring format error: */ - return -3; -} - - -int iobuf_getnets(iobuf *ibuf, dynbuf *b, size_t max) -{ - int r; - size_t len = 0; - char *buf; - char c; - -/* -** returns netstring in dynbuf: -** -3, netstring format error -** -1, error (io or malloc) -** 0, EOF -** 1, ok -*/ - - switch(get_netslen(ibuf, &len, max)){ - case -3: return -3; - case -1: return -1; - case 0: return 0; - default: break; - } - - if(dynbuf_grow(b, len) != 0) - return -1; /* malloc error */ - - buf = dynbuf_BUF(b); - while(len){ - r = iobuf_get(ibuf, buf, len); - switch(r){ - case -1: return -1; /* io error */ - case 0: return -3; /* eof before complete */ - default: break; - } - dynbuf_LEN(b) += r; - if(r == len) break; - /* else: */ - buf += r; - len -= r; - } - - /* so far, so good; now comma? */ - switch(iobuf_GETC(ibuf, &c)){ - case -1: return -1; /* io error */ - case 0: return -3; /* eof before comma */ - default: break; - } - if(c != ',') return -3; - - /* success: */ - return 1; -} - -/* that's all, folks! */ diff --git a/lasagna/ioq/iobuf_getrec.c b/lasagna/ioq/iobuf_getrec.c deleted file mode 100644 index 6462452..0000000 --- a/lasagna/ioq/iobuf_getrec.c +++ /dev/null @@ -1,50 +0,0 @@ -/* -** iobuf_getrec.c -** wcm, 2004.04.28 - 2004.04.29 -** === -*/ -#include "iobuf.h" - -#include "buf.h" -#include "dynbuf.h" - -int iobuf_getrec(iobuf *ibuf, dynbuf *b, int sep) -{ - int r; - int n; - char *x; - -/* -** returns: -** -1, error (io or malloc) -** 0, EOF -** 1, ok -*/ - - for(;;){ - r = iobuf_feed(ibuf); - if(r <= 0) return r; /* EOF (0) or io error (-1) */ - - x = (char *)iobuf_PEEK(ibuf); - n = buf_ndx(x, r, sep); - if(n < r){ /* sep found */ - if(dynbuf_putbuf(b, x, n) == 0) { /* ok */ - /* strip contents out of ibuf */ - iobuf_SEEK(ibuf, (n+1)); - /* success: */ - return 1; - } - else /* dynbuf malloc failure: */ - return -1; - } - /* else: */ - if(dynbuf_grow(b, r) != 0) - return -1; - dynbuf_LEN(b) += iobuf_get(ibuf, dynbuf_BUF(b)+dynbuf_LEN(b), r); - } - - /* not here: */ - return -1; -} - -/* that's all, folks! */ -- 2.20.1