29c29
< * $FreeBSD: head/lib/libgeom/geom_xml2tree.c 126748 2004-03-08 16:37:08Z phk $
---
> * $FreeBSD: head/lib/libgeom/geom_xml2tree.c 126786 2004-03-09 21:14:18Z jhb $
72a73
> ref = NULL;
86,89c87,90
< mt->class->id = id;
< LIST_INSERT_HEAD(&mt->mesh->class, mt->class, class);
< LIST_INIT(&mt->class->geom);
< LIST_INIT(&mt->class->config);
---
> mt->class->lg_id = id;
> LIST_INSERT_HEAD(&mt->mesh->lg_class, mt->class, lg_class);
> LIST_INIT(&mt->class->lg_geom);
> LIST_INIT(&mt->class->lg_config);
94,98c95,99
< mt->geom->id = id;
< LIST_INSERT_HEAD(&mt->class->geom, mt->geom, geom);
< LIST_INIT(&mt->geom->provider);
< LIST_INIT(&mt->geom->consumer);
< LIST_INIT(&mt->geom->config);
---
> mt->geom->lg_id = id;
> LIST_INSERT_HEAD(&mt->class->lg_geom, mt->geom, lg_geom);
> LIST_INIT(&mt->geom->lg_provider);
> LIST_INIT(&mt->geom->lg_consumer);
> LIST_INIT(&mt->geom->lg_config);
102c103
< mt->geom->class = ref;
---
> mt->geom->lg_class = ref;
107,109c108,111
< mt->consumer->id = id;
< LIST_INSERT_HEAD(&mt->geom->consumer, mt->consumer, consumer);
< LIST_INIT(&mt->consumer->config);
---
> mt->consumer->lg_id = id;
> LIST_INSERT_HEAD(&mt->geom->lg_consumer, mt->consumer,
> lg_consumer);
> LIST_INIT(&mt->consumer->lg_config);
113c115
< mt->consumer->geom = ref;
---
> mt->consumer->lg_geom = ref;
117c119
< mt->consumer->provider = ref;
---
> mt->consumer->lg_provider = ref;
122,125c124,128
< mt->provider->id = id;
< LIST_INSERT_HEAD(&mt->geom->provider, mt->provider, provider);
< LIST_INIT(&mt->provider->consumers);
< LIST_INIT(&mt->provider->config);
---
> mt->provider->lg_id = id;
> LIST_INSERT_HEAD(&mt->geom->lg_provider, mt->provider,
> lg_provider);
> LIST_INIT(&mt->provider->lg_consumers);
> LIST_INIT(&mt->provider->lg_config);
129c132
< mt->provider->geom = ref;
---
> mt->provider->lg_geom = ref;
134c137
< mt->config = &mt->provider->config;
---
> mt->config = &mt->provider->lg_config;
138c141
< mt->config = &mt->consumer->config;
---
> mt->config = &mt->consumer->lg_config;
142c145
< mt->config = &mt->geom->config;
---
> mt->config = &mt->geom->lg_config;
146c149
< mt->config = &mt->class->config;
---
> mt->config = &mt->class->lg_config;
172c175
< mt->provider->name = p;
---
> mt->provider->lg_name = p;
175c178
< mt->geom->name = p;
---
> mt->geom->lg_name = p;
178c181
< mt->class->name = p;
---
> mt->class->lg_name = p;
183c186
< mt->geom->rank = strtoul(p, NULL, 0);
---
> mt->geom->lg_rank = strtoul(p, NULL, 0);
188c191
< mt->provider->mode = p;
---
> mt->provider->lg_mode = p;
192c195
< mt->consumer->mode = p;
---
> mt->consumer->lg_mode = p;
196c199
< mt->provider->mediasize = strtoumax(p, NULL, 0);
---
> mt->provider->lg_mediasize = strtoumax(p, NULL, 0);
201c204
< mt->provider->sectorsize = strtoul(p, NULL, 0);
---
> mt->provider->lg_sectorsize = strtoul(p, NULL, 0);
213,215c216,218
< gc->name = strdup(name);
< gc->val = p;
< LIST_INSERT_HEAD(mt->config, gc, config);
---
> gc->lg_name = strdup(name);
> gc->lg_val = p;
> LIST_INSERT_HEAD(mt->config, gc, lg_config);
274,275c277,278
< for (gip = gmp->ident; gip->id != NULL; gip++)
< if (gip->id == id)
---
> for (gip = gmp->lg_ident; gip->lg_id != NULL; gip++)
> if (gip->lg_id == id)
292c295
< LIST_INIT(&gmp->class);
---
> LIST_INIT(&gmp->lg_class);
305,306c308,309
< gmp->ident = calloc(sizeof *gmp->ident, mt->nident + 1);
< if (gmp->ident == NULL)
---
> gmp->lg_ident = calloc(sizeof *gmp->lg_ident, mt->nident + 1);
> if (gmp->lg_ident == NULL)
311,314c314,317
< LIST_FOREACH(cl, &gmp->class, class) {
< gmp->ident[i].id = cl->id;
< gmp->ident[i].ptr = cl;
< gmp->ident[i].what = ISCLASS;
---
> LIST_FOREACH(cl, &gmp->lg_class, lg_class) {
> gmp->lg_ident[i].lg_id = cl->lg_id;
> gmp->lg_ident[i].lg_ptr = cl;
> gmp->lg_ident[i].lg_what = ISCLASS;
316,319c319,322
< LIST_FOREACH(ge, &cl->geom, geom) {
< gmp->ident[i].id = ge->id;
< gmp->ident[i].ptr = ge;
< gmp->ident[i].what = ISGEOM;
---
> LIST_FOREACH(ge, &cl->lg_geom, lg_geom) {
> gmp->lg_ident[i].lg_id = ge->lg_id;
> gmp->lg_ident[i].lg_ptr = ge;
> gmp->lg_ident[i].lg_what = ISGEOM;
321,324c324,327
< LIST_FOREACH(pr, &ge->provider, provider) {
< gmp->ident[i].id = pr->id;
< gmp->ident[i].ptr = pr;
< gmp->ident[i].what = ISPROVIDER;
---
> LIST_FOREACH(pr, &ge->lg_provider, lg_provider) {
> gmp->lg_ident[i].lg_id = pr->lg_id;
> gmp->lg_ident[i].lg_ptr = pr;
> gmp->lg_ident[i].lg_what = ISPROVIDER;
327,330c330,333
< LIST_FOREACH(co, &ge->consumer, consumer) {
< gmp->ident[i].id = co->id;
< gmp->ident[i].ptr = co;
< gmp->ident[i].what = ISCONSUMER;
---
> LIST_FOREACH(co, &ge->lg_consumer, lg_consumer) {
> gmp->lg_ident[i].lg_id = co->lg_id;
> gmp->lg_ident[i].lg_ptr = co;
> gmp->lg_ident[i].lg_what = ISCONSUMER;
336,340c339,345
< LIST_FOREACH(cl, &gmp->class, class) {
< LIST_FOREACH(ge, &cl->geom, geom) {
< ge->class = geom_lookupid(gmp, ge->class)->ptr;
< LIST_FOREACH(pr, &ge->provider, provider) {
< pr->geom = geom_lookupid(gmp, pr->geom)->ptr;
---
> LIST_FOREACH(cl, &gmp->lg_class, lg_class) {
> LIST_FOREACH(ge, &cl->lg_geom, lg_geom) {
> ge->lg_class =
> geom_lookupid(gmp, ge->lg_class)->lg_ptr;
> LIST_FOREACH(pr, &ge->lg_provider, lg_provider) {
> pr->lg_geom =
> geom_lookupid(gmp, pr->lg_geom)->lg_ptr;
342,346c347,353
< LIST_FOREACH(co, &ge->consumer, consumer) {
< co->geom = geom_lookupid(gmp, co->geom)->ptr;
< if (co->provider != NULL) {
< co->provider =
< geom_lookupid(gmp, co->provider)->ptr;
---
> LIST_FOREACH(co, &ge->lg_consumer, lg_consumer) {
> co->lg_geom =
> geom_lookupid(gmp, co->lg_geom)->lg_ptr;
> if (co->lg_provider != NULL) {
> co->lg_provider =
> geom_lookupid(gmp,
> co->lg_provider)->lg_ptr;
348,349c355,356
< &co->provider->consumers,
< co, consumers);
---
> &co->lg_provider->lg_consumers,
> co, lg_consumers);
378,380c385,387
< LIST_REMOVE(cf, config);
< free(cf->name);
< free(cf->val);
---
> LIST_REMOVE(cf, lg_config);
> free(cf->lg_name);
> free(cf->lg_val);
393,394c400,401
< free(gmp->ident);
< gmp->ident = NULL;
---
> free(gmp->lg_ident);
> gmp->lg_ident = NULL;
396c403
< cl = LIST_FIRST(&gmp->class);
---
> cl = LIST_FIRST(&gmp->lg_class);
399,401c406,408
< LIST_REMOVE(cl, class);
< delete_config(&cl->config);
< if (cl->name) free(cl->name);
---
> LIST_REMOVE(cl, lg_class);
> delete_config(&cl->lg_config);
> if (cl->lg_name) free(cl->lg_name);
403c410
< ge = LIST_FIRST(&cl->geom);
---
> ge = LIST_FIRST(&cl->lg_geom);
406,408c413,415
< LIST_REMOVE(ge, geom);
< delete_config(&ge->config);
< if (ge->name) free(ge->name);
---
> LIST_REMOVE(ge, lg_geom);
> delete_config(&ge->lg_config);
> if (ge->lg_name) free(ge->lg_name);
410c417
< pr = LIST_FIRST(&ge->provider);
---
> pr = LIST_FIRST(&ge->lg_provider);
413,416c420,423
< LIST_REMOVE(pr, provider);
< delete_config(&pr->config);
< if (pr->name) free(pr->name);
< if (pr->mode) free(pr->mode);
---
> LIST_REMOVE(pr, lg_provider);
> delete_config(&pr->lg_config);
> if (pr->lg_name) free(pr->lg_name);
> if (pr->lg_mode) free(pr->lg_mode);
420c427
< co = LIST_FIRST(&ge->consumer);
---
> co = LIST_FIRST(&ge->lg_consumer);
423,425c430,432
< LIST_REMOVE(co, consumer);
< delete_config(&co->config);
< if (co->mode) free(co->mode);
---
> LIST_REMOVE(co, lg_consumer);
> delete_config(&co->lg_config);
> if (co->lg_mode) free(co->lg_mode);
< * $FreeBSD: head/lib/libgeom/geom_xml2tree.c 126748 2004-03-08 16:37:08Z phk $
---
> * $FreeBSD: head/lib/libgeom/geom_xml2tree.c 126786 2004-03-09 21:14:18Z jhb $
72a73
> ref = NULL;
86,89c87,90
< mt->class->id = id;
< LIST_INSERT_HEAD(&mt->mesh->class, mt->class, class);
< LIST_INIT(&mt->class->geom);
< LIST_INIT(&mt->class->config);
---
> mt->class->lg_id = id;
> LIST_INSERT_HEAD(&mt->mesh->lg_class, mt->class, lg_class);
> LIST_INIT(&mt->class->lg_geom);
> LIST_INIT(&mt->class->lg_config);
94,98c95,99
< mt->geom->id = id;
< LIST_INSERT_HEAD(&mt->class->geom, mt->geom, geom);
< LIST_INIT(&mt->geom->provider);
< LIST_INIT(&mt->geom->consumer);
< LIST_INIT(&mt->geom->config);
---
> mt->geom->lg_id = id;
> LIST_INSERT_HEAD(&mt->class->lg_geom, mt->geom, lg_geom);
> LIST_INIT(&mt->geom->lg_provider);
> LIST_INIT(&mt->geom->lg_consumer);
> LIST_INIT(&mt->geom->lg_config);
102c103
< mt->geom->class = ref;
---
> mt->geom->lg_class = ref;
107,109c108,111
< mt->consumer->id = id;
< LIST_INSERT_HEAD(&mt->geom->consumer, mt->consumer, consumer);
< LIST_INIT(&mt->consumer->config);
---
> mt->consumer->lg_id = id;
> LIST_INSERT_HEAD(&mt->geom->lg_consumer, mt->consumer,
> lg_consumer);
> LIST_INIT(&mt->consumer->lg_config);
113c115
< mt->consumer->geom = ref;
---
> mt->consumer->lg_geom = ref;
117c119
< mt->consumer->provider = ref;
---
> mt->consumer->lg_provider = ref;
122,125c124,128
< mt->provider->id = id;
< LIST_INSERT_HEAD(&mt->geom->provider, mt->provider, provider);
< LIST_INIT(&mt->provider->consumers);
< LIST_INIT(&mt->provider->config);
---
> mt->provider->lg_id = id;
> LIST_INSERT_HEAD(&mt->geom->lg_provider, mt->provider,
> lg_provider);
> LIST_INIT(&mt->provider->lg_consumers);
> LIST_INIT(&mt->provider->lg_config);
129c132
< mt->provider->geom = ref;
---
> mt->provider->lg_geom = ref;
134c137
< mt->config = &mt->provider->config;
---
> mt->config = &mt->provider->lg_config;
138c141
< mt->config = &mt->consumer->config;
---
> mt->config = &mt->consumer->lg_config;
142c145
< mt->config = &mt->geom->config;
---
> mt->config = &mt->geom->lg_config;
146c149
< mt->config = &mt->class->config;
---
> mt->config = &mt->class->lg_config;
172c175
< mt->provider->name = p;
---
> mt->provider->lg_name = p;
175c178
< mt->geom->name = p;
---
> mt->geom->lg_name = p;
178c181
< mt->class->name = p;
---
> mt->class->lg_name = p;
183c186
< mt->geom->rank = strtoul(p, NULL, 0);
---
> mt->geom->lg_rank = strtoul(p, NULL, 0);
188c191
< mt->provider->mode = p;
---
> mt->provider->lg_mode = p;
192c195
< mt->consumer->mode = p;
---
> mt->consumer->lg_mode = p;
196c199
< mt->provider->mediasize = strtoumax(p, NULL, 0);
---
> mt->provider->lg_mediasize = strtoumax(p, NULL, 0);
201c204
< mt->provider->sectorsize = strtoul(p, NULL, 0);
---
> mt->provider->lg_sectorsize = strtoul(p, NULL, 0);
213,215c216,218
< gc->name = strdup(name);
< gc->val = p;
< LIST_INSERT_HEAD(mt->config, gc, config);
---
> gc->lg_name = strdup(name);
> gc->lg_val = p;
> LIST_INSERT_HEAD(mt->config, gc, lg_config);
274,275c277,278
< for (gip = gmp->ident; gip->id != NULL; gip++)
< if (gip->id == id)
---
> for (gip = gmp->lg_ident; gip->lg_id != NULL; gip++)
> if (gip->lg_id == id)
292c295
< LIST_INIT(&gmp->class);
---
> LIST_INIT(&gmp->lg_class);
305,306c308,309
< gmp->ident = calloc(sizeof *gmp->ident, mt->nident + 1);
< if (gmp->ident == NULL)
---
> gmp->lg_ident = calloc(sizeof *gmp->lg_ident, mt->nident + 1);
> if (gmp->lg_ident == NULL)
311,314c314,317
< LIST_FOREACH(cl, &gmp->class, class) {
< gmp->ident[i].id = cl->id;
< gmp->ident[i].ptr = cl;
< gmp->ident[i].what = ISCLASS;
---
> LIST_FOREACH(cl, &gmp->lg_class, lg_class) {
> gmp->lg_ident[i].lg_id = cl->lg_id;
> gmp->lg_ident[i].lg_ptr = cl;
> gmp->lg_ident[i].lg_what = ISCLASS;
316,319c319,322
< LIST_FOREACH(ge, &cl->geom, geom) {
< gmp->ident[i].id = ge->id;
< gmp->ident[i].ptr = ge;
< gmp->ident[i].what = ISGEOM;
---
> LIST_FOREACH(ge, &cl->lg_geom, lg_geom) {
> gmp->lg_ident[i].lg_id = ge->lg_id;
> gmp->lg_ident[i].lg_ptr = ge;
> gmp->lg_ident[i].lg_what = ISGEOM;
321,324c324,327
< LIST_FOREACH(pr, &ge->provider, provider) {
< gmp->ident[i].id = pr->id;
< gmp->ident[i].ptr = pr;
< gmp->ident[i].what = ISPROVIDER;
---
> LIST_FOREACH(pr, &ge->lg_provider, lg_provider) {
> gmp->lg_ident[i].lg_id = pr->lg_id;
> gmp->lg_ident[i].lg_ptr = pr;
> gmp->lg_ident[i].lg_what = ISPROVIDER;
327,330c330,333
< LIST_FOREACH(co, &ge->consumer, consumer) {
< gmp->ident[i].id = co->id;
< gmp->ident[i].ptr = co;
< gmp->ident[i].what = ISCONSUMER;
---
> LIST_FOREACH(co, &ge->lg_consumer, lg_consumer) {
> gmp->lg_ident[i].lg_id = co->lg_id;
> gmp->lg_ident[i].lg_ptr = co;
> gmp->lg_ident[i].lg_what = ISCONSUMER;
336,340c339,345
< LIST_FOREACH(cl, &gmp->class, class) {
< LIST_FOREACH(ge, &cl->geom, geom) {
< ge->class = geom_lookupid(gmp, ge->class)->ptr;
< LIST_FOREACH(pr, &ge->provider, provider) {
< pr->geom = geom_lookupid(gmp, pr->geom)->ptr;
---
> LIST_FOREACH(cl, &gmp->lg_class, lg_class) {
> LIST_FOREACH(ge, &cl->lg_geom, lg_geom) {
> ge->lg_class =
> geom_lookupid(gmp, ge->lg_class)->lg_ptr;
> LIST_FOREACH(pr, &ge->lg_provider, lg_provider) {
> pr->lg_geom =
> geom_lookupid(gmp, pr->lg_geom)->lg_ptr;
342,346c347,353
< LIST_FOREACH(co, &ge->consumer, consumer) {
< co->geom = geom_lookupid(gmp, co->geom)->ptr;
< if (co->provider != NULL) {
< co->provider =
< geom_lookupid(gmp, co->provider)->ptr;
---
> LIST_FOREACH(co, &ge->lg_consumer, lg_consumer) {
> co->lg_geom =
> geom_lookupid(gmp, co->lg_geom)->lg_ptr;
> if (co->lg_provider != NULL) {
> co->lg_provider =
> geom_lookupid(gmp,
> co->lg_provider)->lg_ptr;
348,349c355,356
< &co->provider->consumers,
< co, consumers);
---
> &co->lg_provider->lg_consumers,
> co, lg_consumers);
378,380c385,387
< LIST_REMOVE(cf, config);
< free(cf->name);
< free(cf->val);
---
> LIST_REMOVE(cf, lg_config);
> free(cf->lg_name);
> free(cf->lg_val);
393,394c400,401
< free(gmp->ident);
< gmp->ident = NULL;
---
> free(gmp->lg_ident);
> gmp->lg_ident = NULL;
396c403
< cl = LIST_FIRST(&gmp->class);
---
> cl = LIST_FIRST(&gmp->lg_class);
399,401c406,408
< LIST_REMOVE(cl, class);
< delete_config(&cl->config);
< if (cl->name) free(cl->name);
---
> LIST_REMOVE(cl, lg_class);
> delete_config(&cl->lg_config);
> if (cl->lg_name) free(cl->lg_name);
403c410
< ge = LIST_FIRST(&cl->geom);
---
> ge = LIST_FIRST(&cl->lg_geom);
406,408c413,415
< LIST_REMOVE(ge, geom);
< delete_config(&ge->config);
< if (ge->name) free(ge->name);
---
> LIST_REMOVE(ge, lg_geom);
> delete_config(&ge->lg_config);
> if (ge->lg_name) free(ge->lg_name);
410c417
< pr = LIST_FIRST(&ge->provider);
---
> pr = LIST_FIRST(&ge->lg_provider);
413,416c420,423
< LIST_REMOVE(pr, provider);
< delete_config(&pr->config);
< if (pr->name) free(pr->name);
< if (pr->mode) free(pr->mode);
---
> LIST_REMOVE(pr, lg_provider);
> delete_config(&pr->lg_config);
> if (pr->lg_name) free(pr->lg_name);
> if (pr->lg_mode) free(pr->lg_mode);
420c427
< co = LIST_FIRST(&ge->consumer);
---
> co = LIST_FIRST(&ge->lg_consumer);
423,425c430,432
< LIST_REMOVE(co, consumer);
< delete_config(&co->config);
< if (co->mode) free(co->mode);
---
> LIST_REMOVE(co, lg_consumer);
> delete_config(&co->lg_config);
> if (co->lg_mode) free(co->lg_mode);