Added obj_write_nocheck which writes the object as quickly as possible,

avoiding checks for strange chars which are probably useful only in the
gatherer anyway.

Some more cleanups.

diff --git a/lib/lib.h b/lib/lib.h
index 8f0b6f45474d612c1f012b5665ca4a80cc61099a..12e79ec5c589e824b92d7d5b38282a5746572c30 100644 (file)
--- a/lib/lib.h
+++ b/lib/lib.h
@@ -116,6 +116,7 @@ void obj_dump(struct odes *);
 struct odes *obj_new(struct mempool *);
 int obj_read(struct fastbuf *, struct odes *);
 void obj_write(struct fastbuf *, struct odes *);
+void obj_write_nocheck(struct fastbuf *, struct odes *);
 struct oattr *obj_find_attr(struct odes *, uns);
 struct oattr *obj_find_attr_last(struct odes *, uns);
 uns obj_del_attr(struct odes *, struct oattr *);

diff --git a/lib/object.c b/lib/object.c
index 49405168354cfb8a117a466287d5c497f41e1c2c..fb5d231ff4e5dbd5194ff15dbdfd0e2736795af5 100644 (file)
--- a/lib/object.c
+++ b/lib/object.c
@@ -17,10 +17,8 @@
 void
 obj_dump(struct odes *o)
 {
-  struct oattr *a, *b;
-
-  for(a=o->attrs; a; a=a->next)
-    for(b=a; b; b=b->same)
+  for(struct oattr *a=o->attrs; a; a=a->next)
+    for(struct oattr *b=a; b; b=b->same)
       printf("%c%s\n", (a==b ? a->attr : ' '), b->val);
 }
 
@@ -38,9 +36,7 @@ oa_new(struct odes *o, uns x, byte *v)
 struct odes *
 obj_new(struct mempool *pool)
 {
-  struct odes *o;
-
-  o = mp_alloc(pool, sizeof(struct odes));
+  struct odes *o = mp_alloc(pool, sizeof(struct odes));
   o->pool = pool;
   o->attrs = NULL;
   o->cached_attr = NULL;
@@ -64,14 +60,11 @@ obj_read(struct fastbuf *f, struct odes *o)
 void
 obj_write(struct fastbuf *f, struct odes *d)
 {
-  struct oattr *a, *b;
-  byte *z;
-
-  for(a=d->attrs; a; a=a->next)
-    for(b=a; b; b=b->same)
+  for(struct oattr *a=d->attrs; a; a=a->next)
+    for(struct oattr *b=a; b; b=b->same)
       {
        bputc(f, a->attr);
-       for(z = b->val; *z; z++)
+       for(byte *z = b->val; *z; z++)
          if (*z >= ' ' || *z == '\t')
            bputc(f, *z);
          else
@@ -83,11 +76,21 @@ obj_write(struct fastbuf *f, struct odes *d)
       }
 }
 
+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 *a;
-
   for(a=o->attrs; a && a->attr != x; a=a->next)
     ;
   return a;
@@ -233,9 +236,7 @@ obj_prepend_attr(struct odes *o, uns x, byte *v)
 struct oattr *
 obj_insert_attr(struct odes *o, struct oattr *first, struct oattr *after, byte *v)
 {
-  struct oattr *b;
-
-  b = oa_new(o, first->attr, v);
+  struct oattr *b = oa_new(o, first->attr, v);
   b->same = after->same;
   after->same = b;
   return b;