librb: remove zstring

rb_zstring_serialized leaks memory while doing nothing with its
arguments... nothing is using zstring so remove it

diff --git a/librb/include/rb_tools.h b/librb/include/rb_tools.h
index b8b1f122c4cc4af3b0264c99a398f219e613ca7d..3cadb729a60283b4b80308687a948f323ee2cfe6 100644 (file)
--- a/librb/include/rb_tools.h
+++ b/librb/include/rb_tools.h
@@ -349,27 +349,6 @@ rb_dlinkMoveList(rb_dlink_list *from, rb_dlink_list *to)
        from->length = 0;
 }
 
-typedef struct _rb_zstring
-{
-       uint16_t len; /* big enough */
-       uint16_t alloclen;
-       uint8_t *data;
-} rb_zstring_t;
-
-size_t rb_zstring_serialized(rb_zstring_t *zs, void **buf, size_t *buflen);
-size_t rb_zstring_deserialize(rb_zstring_t *zs, void *buf);
-void rb_zstring_free(rb_zstring_t *zs);
-rb_zstring_t *rb_zstring_alloc(void);
-rb_zstring_t *rb_zstring_from_c_len(const char *buf, size_t len);
-rb_zstring_t *rb_zstring_from_c(const char *buf);
-size_t rb_zstring_len(rb_zstring_t *zs);
-void rb_zstring_append_from_zstring(rb_zstring_t *dst_zs, rb_zstring_t *src_zs);
-void rb_zstring_append_from_c(rb_zstring_t *zs, const char *buf, size_t len);
-char *rb_zstring_to_c(rb_zstring_t *zs, char *buf, size_t len);
-char *rb_zstring_to_c_alloc(rb_zstring_t *zs);
-size_t rb_zstring_to_ptr(rb_zstring_t *zs, void **ptr);
-
-
 
 typedef int (*rb_strf_func_t)(char *buf, size_t len, void *args);
 

diff --git a/librb/src/export-syms.txt b/librb/src/export-syms.txt
index 377c79b1ccec796fbe7f65fa67aa67763923421a..21d70ded20f25468f34d1d4c46979d6a5e22a9eb 100644 (file)
--- a/librb/src/export-syms.txt
+++ b/librb/src/export-syms.txt
@@ -182,15 +182,3 @@ rb_supports_ssl
 rb_waitpid
 rb_write
 rb_writev
-rb_zstring_alloc
-rb_zstring_append_from_c
-rb_zstring_append_from_zstring
-rb_zstring_deserialize
-rb_zstring_free
-rb_zstring_from_c
-rb_zstring_from_c_len
-rb_zstring_len
-rb_zstring_serialized
-rb_zstring_to_c
-rb_zstring_to_c_alloc
-rb_zstring_to_ptr

diff --git a/librb/src/tools.c b/librb/src/tools.c
index f4e2af2f310b21f9a943eeeb7a25fbec0e37fa4d..5ed866341439fbd458e5b7f214726acb7161189e 100644 (file)
--- a/librb/src/tools.c
+++ b/librb/src/tools.c
@@ -399,131 +399,6 @@ rb_dirname (const char *path)
        return rb_strndup(path, ((uintptr_t)s - (uintptr_t)path) + 2);
 }
 
-size_t rb_zstring_serialized(rb_zstring_t *zs, void **buf, size_t *buflen)
-{
-        uint8_t *p;
-        size_t alloclen = sizeof(uint16_t) + zs->len;
-
-        p = rb_malloc(sizeof(alloclen));
-        memcpy(p, &zs->len, sizeof(uint16_t));
-        p += sizeof(uint16_t);
-        memcpy(p, zs->data, zs->len);
-        return alloclen;
-}
-
-size_t rb_zstring_deserialize(rb_zstring_t *zs, void *buf)
-{
-       uint8_t *p = (uint8_t *)buf;
-
-       memcpy(&zs->len, p, sizeof(uint16_t));
-       p += sizeof(uint16_t);
-       if(zs->len == 0)
-       {
-               zs->data = NULL;
-               return sizeof(uint16_t);
-       }
-       zs->data = rb_malloc(zs->len);
-       memcpy(zs->data, p, zs->len);
-       return zs->len + sizeof(uint16_t);
-}
-
-void rb_zstring_free(rb_zstring_t *zs)
-{
-       rb_free(zs->data);
-       rb_free(zs);
-
-}
-
-rb_zstring_t *rb_zstring_alloc(void)
-{
-       rb_zstring_t *zs = rb_malloc(sizeof(rb_zstring_t));
-       return zs;
-}
-
-rb_zstring_t *rb_zstring_from_c_len(const char *buf, size_t len)
-{
-       rb_zstring_t *zs;
-
-       if(len > UINT16_MAX-1)
-               return NULL;
-
-       zs = rb_zstring_alloc();
-       zs->alloclen = zs->len = (uint16_t)len;
-       zs->alloclen = (uint16_t)len;
-       if(zs->alloclen < 128)
-               zs->alloclen = 128;
-       zs->data = rb_malloc(zs->alloclen);
-       memcpy(zs->data, buf, zs->len);
-       return(zs);
-}
-
-rb_zstring_t *rb_zstring_from_c(const char *buf)
-{
-       return rb_zstring_from_c_len(buf, strlen(buf));
-}
-
-size_t rb_zstring_len(rb_zstring_t *zs)
-{
-       return zs->len;
-}
-
-void rb_zstring_append_from_zstring(rb_zstring_t *dst_zs, rb_zstring_t *src_zs)
-{
-       void *ep;
-       size_t nlen = dst_zs->len + src_zs->len;
-
-       if(nlen > dst_zs->alloclen)
-       {
-               dst_zs->alloclen += src_zs->len + 64;
-               dst_zs->data = rb_realloc(dst_zs->data, dst_zs->alloclen);
-       }
-
-       ep = dst_zs->data + dst_zs->len;
-       memcpy(ep, src_zs->data, src_zs->len);
-}
-
-void rb_zstring_append_from_c(rb_zstring_t *zs, const char *buf, size_t len)
-{
-       void *ep;
-       size_t nlen = zs->len + len;
-
-       if(nlen > zs->alloclen)
-       {
-               zs->alloclen += len + 64;
-               zs->data = rb_realloc(zs->data, zs->alloclen);
-       }
-       ep = zs->data + zs->len;
-       zs->len += len;
-       memcpy(ep, buf, len);
-}
-
-char *rb_zstring_to_c(rb_zstring_t *zs, char *buf, size_t len)
-{
-        size_t cpylen;
-        if(len < zs->len)
-                cpylen = len - 1;
-        else
-                cpylen = zs->len;
-        buf[cpylen] = '\0';
-        memcpy(buf, zs->data, cpylen);
-        return buf;
-}
-
-
-char *rb_zstring_to_c_alloc(rb_zstring_t *zs)
-{
-       char *p;
-       p = rb_malloc(zs->len+1);
-       memcpy(p, zs->data, zs->len);
-       return p;
-}
-
-size_t rb_zstring_to_ptr(rb_zstring_t *zs, void **ptr)
-{
-       *ptr = (void *)zs->data;
-       return zs->len;
-}
-
 
 
 int rb_fsnprint(char *buf, size_t len, const rb_strf_t *strings)