diff options
| -rw-r--r-- | graphs.c | 6 | ||||
| -rw-r--r-- | linked_list.inc.h | 2 | ||||
| -rw-r--r-- | macro.h | 8 | ||||
| -rw-r--r-- | vcal.c | 2 |
4 files changed, 9 insertions, 9 deletions
@@ -107,7 +107,7 @@ int trie_to_dot_helper ( TRIE_NODE(T)* root, FILE* f ) { #if 1 /* Toggle values */ if (L(root) != NULL) { - FOR(LLIST(content_set), content_set, v, &L(root)->val) { + FOR(LLIST, content_set, v, &L(root)->val) { char buf[0x100]; FMT(strbuf)(&v->key, buf); fprintf(f, "\"%p\" [label=\"%s\" shape=rectangle color=darkgreen];\n", @@ -115,14 +115,14 @@ int trie_to_dot_helper ( TRIE_NODE(T)* root, FILE* f ) { fprintf(f, "\"%p\" -> \"%p\";\n", root, v); /* Parameters */ - FOR(LLIST(param_set), param_set, p, &v->val) { + FOR(LLIST, param_set, p, &v->val) { strbuf* param_key = &p->key; fprintf(f, "\"%p\" [label=\"%s\" color=blue];\n", param_key, param_key->mem); fprintf(f, "\"%p\" -> \"%p\";", p, param_key); - FOR(LLIST(strbuf), strbuf, str, &p->val) { + FOR(LLIST, strbuf, str, &p->val) { fprintf(f, "\"%p\" [label=\"%s\" color=orange];", str, str->mem); fprintf(f, "\"%p\" -> \"%p\";", param_key, str); diff --git a/linked_list.inc.h b/linked_list.inc.h index 6102720a..cdb0ac1a 100644 --- a/linked_list.inc.h +++ b/linked_list.inc.h @@ -168,7 +168,7 @@ int RESET(LLIST(TYPE)) ( LLIST(TYPE)* llist ) { FMT_F(LLIST(TYPE)) { int seek = 0; fmtf("("); - FOR(LLIST(TYPE), TYPE, v, this) { + FOR(LLIST, TYPE, v, this) { seek += FMT(TYPE)(v, buf + seek); fmtf(" "); } @@ -83,10 +83,10 @@ /* Iterator macros. */ #define FOR(CONT_T, T, var, set) \ - PRE_FOR_ ## CONT_T (T, var, set); \ - for( BEG_ ## CONT_T (T, var, set); \ - END_ ## CONT_T (T, var, set); \ - NXT_ ## CONT_T (T, var, set)) + PRE_FOR_ ## CONT_T (T) (T, var, set); \ + for( BEG_ ## CONT_T (T) (T, var, set); \ + END_ ## CONT_T (T) (T, var, set); \ + NXT_ ## CONT_T (T) (T, var, set)) /* Example int implementation * FOR(int, i, 10) { } */ @@ -122,7 +122,7 @@ FMT_F(vcomponent) { seek += sprintf(buf + seek, _RESET); seek += FMT(TRIE(content_line))(&this->clines, buf + seek); seek += sprintf(buf + seek, "\nComponents:\n"); - FOR(VECT(vcomponent), vcomponent, comp, &this->components) { + FOR(VECT, vcomponent, comp, &this->components) { seek += FMT(vcomponent)(comp, buf + seek); } |