tiny bugfix

[libucw.git] / lib / object.c

diff --git a/lib/object.c b/lib/object.c
index db471c4b0257e25d58e61e4ce9ec6bb9f1879eae..6091d1d75ed20edcfdea7ac8f6b828026263b3bf 100644 (file)
--- a/lib/object.c
+++ b/lib/object.c
@@ -1,14 +1,15 @@
 /*
  *     Sherlock Library -- Object Functions
  *
 /*
  *     Sherlock Library -- Object Functions
  *

- *     (c) 1997--2003 Martin Mares <mj@ucw.cz>
+ *     (c) 1997--2004 Martin Mares <mj@ucw.cz>
+ *     (c) 2004 Robert Spalek <robert@ucw.cz>

  *
  *     This software may be freely distributed and used according to the terms
  *     of the GNU Lesser General Public License.
  */
 
 #include "lib/lib.h"
  *
  *     This software may be freely distributed and used according to the terms
  *     of the GNU Lesser General Public License.
  */
 
 #include "lib/lib.h"

-#include "lib/pools.h"
+#include "lib/mempool.h"

 #include "lib/fastbuf.h"
 #include "lib/object.h"
 
 #include "lib/fastbuf.h"
 #include "lib/object.h"
 


@@ -26,14 +27,26 @@ obj_dump(struct odes *o)
 static struct oattr *
 oa_new(struct odes *o, uns x, byte *v)
 {
 static struct oattr *
 oa_new(struct odes *o, uns x, byte *v)
 {

-  struct oattr *a = mp_alloc(o->pool, sizeof(struct oattr) + strlen(v));
+  struct oattr *a = mp_alloc(o->pool, sizeof(struct oattr) + strlen(v)+1);

 
   a->next = a->same = NULL;
   a->attr = x;
 
   a->next = a->same = NULL;
   a->attr = x;

+  a->val = (byte*) (a+1);

   strcpy(a->val, v);
   return a;
 }
 
   strcpy(a->val, v);
   return a;
 }
 

+static struct oattr *
+oa_new_ref(struct odes *o, uns x, byte *v)
+{
+  struct oattr *a = mp_alloc(o->pool, sizeof(struct oattr));
+
+  a->next = a->same = NULL;
+  a->attr = x;
+  a->val = v;
+  return a;
+}
+

 struct odes *
 obj_new(struct mempool *pool)
 {
 struct odes *
 obj_new(struct mempool *pool)
 {


@@ -44,62 +57,6 @@ obj_new(struct mempool *pool)
   return o;
 }
 
   return o;
 }
 

-int
-obj_read(struct fastbuf *f, struct odes *o)
-{
-  byte buf[MAX_ATTR_SIZE];
-
-  while (bgets(f, buf, sizeof(buf)))
-    {
-      if (!buf[0])
-       return 1;
-      obj_add_attr(o, buf[0], buf+1);
-    }
-  return 0;
-}
-
-void
-obj_read_multi(struct fastbuf *f, struct odes *o)
-{
-  /* Read a multi-part object ending with either EOF or a NUL character */
-  byte buf[MAX_ATTR_SIZE];
-  while (bpeekc(f) > 0 && bgets(f, buf, sizeof(buf)))
-    if (buf[0])
-      obj_add_attr(o, buf[0], buf+1);
-}
-
-void
-obj_write(struct fastbuf *f, struct odes *d)
-{
-  for(struct oattr *a=d->attrs; a; a=a->next)
-    for(struct oattr *b=a; b; b=b->same)
-      {
-       byte *z;
-       bputc(f, a->attr);
-       for(z = b->val; *z; z++)
-         if (*z >= ' ' || *z == '\t')
-           bputc(f, *z);
-         else
-           {
-             bputc(f, '?');
-             log(L_ERROR, "obj_dump: Found non-ASCII characters (URL might be %s)", obj_find_aval(d, 'U'));
-           }
-       ASSERT(z - b->val <= MAX_ATTR_SIZE-2);
-       bputc(f, '\n');
-      }
-}
-
-void
-obj_write_nocheck(struct fastbuf *f, struct odes *d)
-{
-  for(struct oattr *a=d->attrs; a; a=a->next)
-    for(struct oattr *b=a; b; b=b->same)
-      {
-       bputc(f, a->attr);
-       bputsn(f, b->val);
-      }
-}
-

 struct oattr *
 obj_find_attr(struct odes *o, uns x)
 {
 struct oattr *
 obj_find_attr(struct odes *o, uns x)
 {


@@ -157,7 +114,6 @@ byte *
 obj_find_aval(struct odes *o, uns x)
 {
   struct oattr *a = obj_find_attr(o, x);
 obj_find_aval(struct odes *o, uns x)
 {
   struct oattr *a = obj_find_attr(o, x);

-

   return a ? a->val : NULL;
 }
 
   return a ? a->val : NULL;
 }
 


@@ -199,15 +155,14 @@ obj_set_attr_num(struct odes *o, uns a, uns v)
   return obj_set_attr(o, a, x);
 }
 
   return obj_set_attr(o, a, x);
 }
 

-struct oattr *
-obj_add_attr(struct odes *o, uns x, byte *v)
+static inline struct oattr *
+obj_add_attr_internal(struct odes *o, struct oattr *b)

 {
 {

-  struct oattr *a, *b;
+  struct oattr *a;

 
 

-  b = oa_new(o, x, v);
-  if (!(a = o->cached_attr) || a->attr != x)
+  if (!(a = o->cached_attr) || a->attr != b->attr)

     {
     {

-      if (!(a = obj_find_attr(o, x)))
+      if (!(a = obj_find_attr(o, b->attr)))

        {
          b->next = o->attrs;
          o->attrs = b;
        {
          b->next = o->attrs;
          o->attrs = b;


@@ -222,6 +177,18 @@ obj_add_attr(struct odes *o, uns x, byte *v)
   return b;
 }
 
   return b;
 }
 

+struct oattr *
+obj_add_attr(struct odes *o, uns x, byte *v)
+{
+  return obj_add_attr_internal(o, oa_new(o, x, v));
+}
+
+struct oattr *
+obj_add_attr_ref(struct odes *o, uns x, byte *v)
+{
+  return obj_add_attr_internal(o, oa_new_ref(o, x, v));
+}
+

 struct oattr *
 obj_prepend_attr(struct odes *o, uns x, byte *v)
 {
 struct oattr *
 obj_prepend_attr(struct odes *o, uns x, byte *v)
 {