diff --git a/src/tools/ddsconf/ddsconf.c b/src/tools/ddsconf/ddsconf.c index d0d900e..0ffface 100644 --- a/src/tools/ddsconf/ddsconf.c +++ b/src/tools/ddsconf/ddsconf.c @@ -121,7 +121,7 @@ const char *name(const struct cfgelem *elem) static char spaces[32]; -void print(FILE *out, unsigned int cols, const char *fmt, ...) +void printspc(FILE *out, unsigned int cols, const char *fmt, ...) { va_list ap; assert((size_t)cols < sizeof(spaces)); diff --git a/src/tools/ddsconf/ddsconf.h b/src/tools/ddsconf/ddsconf.h index 6a88f47..482186b 100644 --- a/src/tools/ddsconf/ddsconf.h +++ b/src/tools/ddsconf/ddsconf.h @@ -76,7 +76,7 @@ int hasattributes(const struct cfgelem *elem); struct cfgelem *firstelem(const struct cfgelem *list); struct cfgelem *nextelem(const struct cfgelem *list, const struct cfgelem *elem); const struct cfgunit *findunit(const struct cfgunit *units, const char *name); -void print(FILE *out, unsigned int cols, const char *fmt, ...); +void printspc(FILE *out, unsigned int cols, const char *fmt, ...); int printrnc(FILE *out, struct cfgelem *elem, const struct cfgunit *units); int printxsd(FILE *out, struct cfgelem *elem, const struct cfgunit *units); int printmd(FILE *out, struct cfgelem *elem, const struct cfgunit *units); diff --git a/src/tools/ddsconf/rnc.c b/src/tools/ddsconf/rnc.c index 7b0b825..c473385 100644 --- a/src/tools/ddsconf/rnc.c +++ b/src/tools/ddsconf/rnc.c @@ -45,22 +45,22 @@ printtype( (void)units; if (strcmp(elem->meta.type, "string") == 0) { if (elem->meta.unit != NULL) { - print(out, cols, "%s%s\n", amp[(flags & FLAG_AMP)], elem->meta.unit); + printspc(out, cols, "%s%s\n", amp[(flags & FLAG_AMP)], elem->meta.unit); } else { - print(out, cols, "%stext\n", amp[(flags & FLAG_AMP)]); + printspc(out, cols, "%stext\n", amp[(flags & FLAG_AMP)]); } } else if (strcmp(elem->meta.type, "bool") == 0) { - print(out, cols, "%sxsd:boolean\n", amp[(flags & FLAG_AMP)]); + printspc(out, cols, "%sxsd:boolean\n", amp[(flags & FLAG_AMP)]); } else if (strcmp(elem->meta.type, "int") == 0) { - print(out, cols, "%sxsd:integer\n", amp[(flags & FLAG_AMP)]); + printspc(out, cols, "%sxsd:integer\n", amp[(flags & FLAG_AMP)]); } else if (strcmp(elem->meta.type, "enum") == 0) { assert(elem->meta.pattern != NULL); - print(out, cols, "%s%s\n", amp[(flags & FLAG_AMP)], elem->meta.pattern); + printspc(out, cols, "%s%s\n", amp[(flags & FLAG_AMP)], elem->meta.pattern); } else if (strcmp(elem->meta.type, "list") == 0) { assert(elem->meta.pattern != NULL); - print(out, cols, "%sxsd:token { pattern = \"%s\" }\n", amp[(flags & FLAG_AMP)], elem->meta.pattern); + printspc(out, cols, "%sxsd:token { pattern = \"%s\" }\n", amp[(flags & FLAG_AMP)], elem->meta.pattern); } else { - print(out, cols, "%sempty\n", amp[(flags & FLAG_AMP)]); + printspc(out, cols, "%sempty\n", amp[(flags & FLAG_AMP)]); } } @@ -74,14 +74,14 @@ printattr( { assert(!ismoved(elem) && !isdeprecated(elem)); if (elem->description != NULL) { - print(out, cols, docfmt, amp[(flags & FLAG_AMP)]); + printspc(out, cols, docfmt, amp[(flags & FLAG_AMP)]); fputs(elem->meta.description, out); - print(out, 0, "\"\"\" ] ]\n"); + printspc(out, 0, "\"\"\" ] ]\n"); flags &= ~FLAG_AMP; } - print(out, cols, attrfmt, amp[(flags & FLAG_AMP)], name(elem)); + printspc(out, cols, attrfmt, amp[(flags & FLAG_AMP)], name(elem)); printtype(out, cols+2, flags, elem, units); - print(out, cols, "}%s\n", suffix(elem)); + printspc(out, cols, "}%s\n", suffix(elem)); } static void printelem( @@ -96,12 +96,12 @@ static void printelem( assert(!ismoved(elem) && !isdeprecated(elem)); if (elem->description != NULL) { - print(out, cols, docfmt, amp[(flags & FLAG_AMP)]); + printspc(out, cols, docfmt, amp[(flags & FLAG_AMP)]); fputs(elem->meta.description, out); - print(out, 0, "\"\"\" ] ]\n"); + printspc(out, 0, "\"\"\" ] ]\n"); flags &= ~FLAG_AMP; } - print(out, cols, elemfmt, amp[(flags & FLAG_AMP)], name(elem)); + printspc(out, cols, elemfmt, amp[(flags & FLAG_AMP)], name(elem)); flags &= ~FLAG_AMP; ce = firstelem(elem->attributes); while (ce) { @@ -123,7 +123,7 @@ static void printelem( { printtype(out, cols+2, flags, elem, units); } - print(out, cols, "}%s\n", (flags & FLAG_ROOT) ? "" : suffix(elem)); + printspc(out, cols, "}%s\n", (flags & FLAG_ROOT) ? "" : suffix(elem)); } static int initrnc(struct cfgelem *elem, const struct cfgunit *units) @@ -149,15 +149,15 @@ int printrnc(FILE *out, struct cfgelem *elem, const struct cfgunit *units) { if (initrnc(elem, units) == -1) return -1; - print(out, 0, "default namespace = \"%s\"\n", url()); - print(out, 0, "namespace a = \"http://relaxng.org/ns/compatibility/annotations/1.0\"\n"); - print(out, 0, "grammar {\n"); - print(out, 0, " start =\n"); + printspc(out, 0, "default namespace = \"%s\"\n", url()); + printspc(out, 0, "namespace a = \"http://relaxng.org/ns/compatibility/annotations/1.0\"\n"); + printspc(out, 0, "grammar {\n"); + printspc(out, 0, " start =\n"); printelem(out, 2, FLAG_ROOT, elem, units); for(const struct cfgunit *cu = units; cu->name; cu++) { static const char *fmt = " %s = xsd:token { pattern = \"%s\" }\n"; - print(out, 0, fmt, cu->name, cu->pattern); + printspc(out, 0, fmt, cu->name, cu->pattern); } - print(out, 0, "}\n"); + printspc(out, 0, "}\n"); return 0; } diff --git a/src/tools/ddsconf/xsd.c b/src/tools/ddsconf/xsd.c index 3f57f8f..36d8839 100644 --- a/src/tools/ddsconf/xsd.c +++ b/src/tools/ddsconf/xsd.c @@ -64,11 +64,11 @@ printdesc( if (!elem->description) return; assert(elem->meta.description); - print(out, cols+0, "\n"); - print(out, cols+2, "\n"); + printspc(out, cols+0, "\n"); + printspc(out, cols+2, "\n"); fputs(elem->meta.description, out); fputs("\n", out); - print(out, cols+0, "\n"); + printspc(out, cols+0, "\n"); } static void @@ -81,13 +81,13 @@ printenum( { (void)flags; (void)units; - print(out, cols+0, "\n"); - print(out, cols+2, "\n"); + printspc(out, cols+0, "\n"); + printspc(out, cols+2, "\n"); for(const char **v = elem->meta.values; v && *v; v++) { - print(out, cols+4, "\n", *v); + printspc(out, cols+4, "\n", *v); } - print(out, cols+2, "\n"); - print(out, cols+0, "\n"); + printspc(out, cols+2, "\n"); + printspc(out, cols+0, "\n"); } static void @@ -100,11 +100,11 @@ printlist( { (void)flags; (void)units; - print(out, cols+0, "\n"); - print(out, cols+2, "\n"); - print(out, cols+4, "\n", elem->meta.pattern); - print(out, cols+2, "\n"); - print(out, cols+0, "\n"); + printspc(out, cols+0, "\n"); + printspc(out, cols+2, "\n"); + printspc(out, cols+4, "\n", elem->meta.pattern); + printspc(out, cols+2, "\n"); + printspc(out, cols+0, "\n"); } static void @@ -135,9 +135,9 @@ printattr( if (minimum(elem)) snprintf(type, sizeof(type), " use=\"required\""); - print(out, cols, fmt, name(elem), type, required); + printspc(out, cols, fmt, name(elem), type, required); printdesc(out, cols+2, flags, elem, units); - print(out, cols, "\n"); + printspc(out, cols, "\n"); } static void printelem( @@ -167,7 +167,7 @@ printref( snprintf(maxattr, sizeof(maxattr), "maxOccurs=\"unbounded\" "); else if (!(flags & FLAG_NOMAX) && maximum(elem) != 1) snprintf(maxattr, sizeof(maxattr), "maxOccurs=\"%d\" ", maximum(elem)); - print(out, cols, fmt, minattr, maxattr, schema(), name(elem)); + printspc(out, cols, fmt, minattr, maxattr, schema(), name(elem)); } } @@ -193,17 +193,17 @@ printcomplextype( snprintf(maxattr, sizeof(maxattr), "maxOccurs=\"%d\" ", maximum(elem)); } - print(out, cols, "\n", minattr, maxattr, name(elem)); + printspc(out, cols, "\n", minattr, maxattr, name(elem)); printdesc(out, cols+2, flags, elem, units); flags &= ~(FLAG_NOMIN | FLAG_NOMAX); if (!haschildren(elem) && !hasattributes(elem)) { /* special case, group has only deprecated children and/or attributes */ - print(out, cols+2, "\n"); + printspc(out, cols+2, "\n"); } else { int cnt; unsigned int ofst = 0; - print(out, cols+2, "\n"); + printspc(out, cols+2, "\n"); if ((cnt = haschildren(elem))) { const char *cont = NULL; @@ -268,18 +268,18 @@ printcomplextype( } } - print(out, cols+4, "\n", cont, minattr, maxattr); + printspc(out, cols+4, "\n", cont, minattr, maxattr); ce = firstelem(elem->children); while (ce) { printref(out, cols+6, flags, ce, units); ce = nextelem(elem->children, ce); } - print(out, cols+4, "\n", cont); + printspc(out, cols+4, "\n", cont); } else if (!isgroup(elem) && (!isstring(elem) || elem->meta.unit)) { ofst = 4; - print(out, cols+4, "\n"); + printspc(out, cols+4, "\n"); if (isenum(elem) || islist(elem)) { - print(out, cols+6, "\n"); + printspc(out, cols+6, "\n"); if (isenum(elem)) printenum(out, cols+8, flags, elem, units); else @@ -287,9 +287,9 @@ printcomplextype( } else { const char extfmt[] = "\n"; if (elem->meta.unit) - print(out, cols+6, extfmt, schema(), elem->meta.unit); + printspc(out, cols+6, extfmt, schema(), elem->meta.unit); else - print(out, cols+6, extfmt, "xs", isbuiltintype(elem)); + printspc(out, cols+6, extfmt, "xs", isbuiltintype(elem)); } } flags &= ~(FLAG_NOMIN | FLAG_NOMAX); @@ -303,14 +303,14 @@ printcomplextype( } if (!isgroup(elem) && (!isstring(elem) || elem->meta.unit)) { if (isenum(elem) || islist(elem)) - print(out, cols+6, "\n"); + printspc(out, cols+6, "\n"); else - print(out, cols+6, "\n"); - print(out, cols+4, "\n"); + printspc(out, cols+6, "\n"); + printspc(out, cols+4, "\n"); } - print(out, cols+2, "\n"); + printspc(out, cols+2, "\n"); } - print(out, cols, "\n"); + printspc(out, cols, "\n"); } static void @@ -339,11 +339,11 @@ printsimpletype( } if (!(type = isbuiltintype(elem))) - print(out, cols, fmt, min, max, name(elem)); + printspc(out, cols, fmt, min, max, name(elem)); else if (elem->meta.unit) - print(out, cols, builtinfmt, min, max, name(elem), schema(), elem->meta.unit); + printspc(out, cols, builtinfmt, min, max, name(elem), schema(), elem->meta.unit); else - print(out, cols, builtinfmt, min, max, name(elem), "xs", type); + printspc(out, cols, builtinfmt, min, max, name(elem), "xs", type); printdesc(out, cols+2, flags, elem, units); if (isenum(elem)) @@ -351,7 +351,7 @@ printsimpletype( else if (islist(elem)) printlist(out, cols+2, flags, elem, units); - print(out, cols, "\n"); + printspc(out, cols, "\n"); } static void @@ -410,18 +410,18 @@ int printxsd(FILE *out, struct cfgelem *elem, const struct cfgunit *units) { if (initxsd(elem, units) == -1) return -1; - print(out, 0, "\n"); - print(out, 0, "\n"); + printspc(out, 0, "\n", url(), schema(), url()); printelem(out, 2, FLAG_EXPAND, elem, units); for (const struct cfgunit *cu = units; cu->name; cu++) { - print(out, 2, "\n", cu->name); - print(out, 4, "\n"); - print(out, 6, "\n", cu->pattern); - print(out, 4, "\n"); - print(out, 2, "\n"); + printspc(out, 2, "\n", cu->name); + printspc(out, 4, "\n"); + printspc(out, 6, "\n", cu->pattern); + printspc(out, 4, "\n"); + printspc(out, 2, "\n"); } - print(out, 0, "\n"); + printspc(out, 0, "\n"); return 0; }