X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fobject.c;h=fb957bd7e61169271226a5689738e30f8a7fc8ae;hb=81a17ab471944888106c70a719e99d6e6ba96f22;hp=839bc65e558ad6dd4f8735fad4110854de475e3b;hpb=b40107e9c3349c1c712b320c27ef631e6f76da26;p=libucw.git diff --git a/lib/object.c b/lib/object.c index 839bc65e..fb957bd7 100644 --- a/lib/object.c +++ b/lib/object.c @@ -1,25 +1,25 @@ /* * Sherlock Library -- Object Functions * - * (c) 1997--2001 Martin Mares + * (c) 1997--2003 Martin Mares + * + * 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/fastbuf.h" +#include "lib/object.h" #include #include -#define OBJ_POOL_SIZE 4096 - 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); } @@ -29,7 +29,6 @@ oa_new(struct odes *o, uns x, byte *v) struct oattr *a = mp_alloc(o->pool, sizeof(struct oattr) + strlen(v)); a->next = a->same = NULL; - a->last_same = a; a->attr = x; strcpy(a->val, v); return a; @@ -38,53 +37,23 @@ oa_new(struct odes *o, uns x, byte *v) struct odes * obj_new(struct mempool *pool) { - struct mempool *lp = pool; - struct odes *o; - - if (!lp) - lp = mp_new(OBJ_POOL_SIZE); - o = mp_alloc(lp, sizeof(struct odes)); - o->pool = lp; - o->local_pool = (pool == lp) ? NULL : lp; + struct odes *o = mp_alloc(pool, sizeof(struct odes)); + o->pool = pool; o->attrs = NULL; + o->cached_attr = NULL; return o; } -void -obj_free(struct odes *o) -{ - if (o->local_pool) - mp_delete(o->local_pool); -} - int obj_read(struct fastbuf *f, struct odes *o) { - byte buf[1024]; - struct oattr **last = &o->attrs; - struct oattr *a, *la; + byte buf[MAX_ATTR_SIZE]; - la = NULL; - *last = NULL; while (bgets(f, buf, sizeof(buf))) { if (!buf[0]) return 1; - a = oa_new(o, buf[0], buf+1); - if (!la || la->attr != a->attr) - for(la=o->attrs; la && la->attr != a->attr; la=la->next) - ; - if (la) - { - la->last_same->same = a; - la->last_same = a; - } - else - { - *last = a; - last = &a->next; - la = a; - } + obj_add_attr(o, buf[0], buf+1); } return 0; } @@ -92,30 +61,39 @@ 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) { + byte *z; bputc(f, a->attr); for(z = b->val; *z; z++) - if (*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 *a; - for(a=o->attrs; a && a->attr != x; a=a->next) ; return a; @@ -126,7 +104,12 @@ obj_find_attr_last(struct odes *o, uns x) { struct oattr *a = obj_find_attr(o, x); - return a ? a->last_same : NULL; + if (a) + { + while (a->same) + a = a->same; + } + return a; } uns @@ -135,6 +118,7 @@ obj_del_attr(struct odes *o, struct oattr *a) struct oattr *x, **p, *y, *l; byte aa = a->attr; + o->cached_attr = NULL; p = &o->attrs; while (x = *p) { @@ -147,8 +131,6 @@ obj_del_attr(struct odes *o, struct oattr *a) if (x == a) { *p = x->same; - if (y->last_same == x) - y->last_same = l; return 1; } p = &x->same; @@ -194,6 +176,7 @@ obj_set_attr(struct odes *o, uns x, byte *v) } else a = NULL; + o->cached_attr = a; return a; } @@ -207,18 +190,97 @@ obj_set_attr_num(struct odes *o, uns a, uns v) } struct oattr * -obj_add_attr(struct odes *o, struct oattr *a, uns x, byte *v) +obj_add_attr(struct odes *o, uns x, byte *v) { - struct oattr *b; + struct oattr *a, *b; - if (!a) + b = oa_new(o, x, v); + if (!(a = o->cached_attr) || a->attr != x) { - a = obj_find_attr(o, x); - if (!a) - return obj_set_attr(o, x, v); + if (!(a = obj_find_attr(o, x))) + { + b->next = o->attrs; + o->attrs = b; + goto done; + } } + while (a->same) + a = a->same; + a->same = b; + done: + o->cached_attr = b; + return b; +} + +struct oattr * +obj_prepend_attr(struct odes *o, uns x, byte *v) +{ + struct oattr *a, *b, **z; + b = oa_new(o, x, v); - a->last_same->same = b; - a->last_same = b; - return a; + z = &o->attrs; + while (a = *z) + { + if (a->attr == x) + { + b->same = a; + b->next = a->next; + a->next = NULL; + *z = b; + return b; + } + z = &a->next; + } + b->next = o->attrs; + o->attrs = b; + return b; +} + +struct oattr * +obj_insert_attr(struct odes *o, struct oattr *first, struct oattr *after, byte *v) +{ + struct oattr *b = oa_new(o, first->attr, v); + b->same = after->same; + after->same = b; + return b; +} + +void +obj_move_attr_to_head(struct odes *o, uns x) +{ + struct oattr *a, **z; + + z = &o->attrs; + while (a = *z) + { + if (a->attr == x) + { + *z = a->next; + a->next = o->attrs; + o->attrs = a; + break; + } + z = &a->next; + } +} + +void +obj_move_attr_to_tail(struct odes *o, uns x) +{ + struct oattr *a, **z; + + z = &o->attrs; + while (a = *z) + { + if (a->attr == x) + { + *z = a->next; + while (*z) + z = &(*z)->next; + *z = a; + a->next = NULL; + break; + } + z = &a->next; + } }