Changeset: fc52e1b93812 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fc52e1b93812
Modified Files:
gdk/gdk_storage.mx
Branch: default
Log Message:
Use straight C instead of MX macros.
diffs (76 lines):
diff --git a/gdk/gdk_storage.mx b/gdk/gdk_storage.mx
--- a/gdk/gdk_storage.mx
+++ b/gdk/gdk_storage.mx
@@ -1116,42 +1116,41 @@
c->len = (*c->format) (&c->buf, &c->size, v);
}
-@= print_head
- str buf = @1 ? argv[@2].tpe : argv[@2].buf; /* contains column title */
- int len = (int) strlen(buf);
-
- if (mnstr_write(s, buf, len, 1) != 1)
- return -1;
- TABS(s, argv[@2].tabs - ((@1 + len - 1) / 8));
- if (mnstr_errnr(s))
- return -1;
-@= print_header
- k = 1;
- if (mnstr_write(s, "# ", 2, 1) != 1)
- return -1;
- if (argv[0].format) {
- @:print_head(@1,0)@
- }
- for (;;) {
- @:print_head(@1,k)@
- if (k++ >= argc)
- break;
- }
- if (@1) {
- if (mnstr_printf(s, " # type\n") < 0)
- return -1;
- } else {
- if (mnstr_printf(s, " # name\n") < 0)
- return -1;
- }
-@c
static int
print_header(int argc, col_format_t *argv, stream *s)
{
int k;
+ str buf;
+ int len;
- @:print_header(0)@
- @:print_header(2)@
+ if (mnstr_write(s, "# ", 2, 1) != 1)
+ return -1;
+ for (k = argv[0].format ? 0 : 1; k <= argc; k++) {
+ buf = argv[k].buf; /* contains column title */
+ len = (int) strlen(buf);
+
+ if (mnstr_write(s, buf, len, 1) != 1)
+ return -1;
+ TABS(s, argv[k].tabs - ((0 + len - 1) / 8));
+ if (mnstr_errnr(s))
+ return -1;
+ }
+ if (mnstr_printf(s, " # name\n") < 0)
+ return -1;
+ if (mnstr_write(s, "# ", 2, 1) != 1)
+ return -1;
+ for (k = argv[0].format ? 0 : 1; k <= argc; k++) {
+ buf = argv[k].tpe; /* contains column title */
+ len = (int) strlen(buf);
+
+ if (mnstr_write(s, buf, len, 1) != 1)
+ return -1;
+ TABS(s, argv[k].tabs - ((2 + len - 1) / 8));
+ if (mnstr_errnr(s))
+ return -1;
+ }
+ if (mnstr_printf(s, " # type\n") < 0)
+ return -1;
return 0;
}
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
