midfavila
/
sbase
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Use en* instead of e* function family in tsort(1) 

The wtf macros overwrote the semantics, for more clarity this
has been fixed.
This commit is contained in:
FRIGN 2016-02-24 16:26:29 +01:00 committed by sin
parent 50b30bbd69
commit 102baab4c4
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tsort.c
View File

@ -63,7 +63,7 @@ add_vertex(char *name)
if (vertex) if (vertex)
return vertex; return vertex;
vertex = ecalloc(1, sizeof(*vertex)); vertex = encalloc(2, 1, sizeof(*vertex));
vertex->name = name; vertex->name = name;
vertex->next = prev->next; vertex->next = prev->next;
prev->next = vertex; prev->next = vertex;
@ -81,7 +81,7 @@ add_edge(struct vertex* from, struct vertex* to)
if (edge) if (edge)
return edge; return edge;
edge = ecalloc(1, sizeof(*edge)); edge = encalloc(2, 1, sizeof(*edge));
edge->to = to; edge->to = to;
edge->next = prev->next; edge->next = prev->next;
prev->next = edge; prev->next = edge;
@ -113,9 +113,9 @@ load_graph(FILE *fp)
SKIP(p, name, !isspace); SKIP(p, name, !isspace);
TOKEN_END(p); TOKEN_END(p);
if (!from) { if (!from) {
from = add_vertex(estrdup(name)); from = add_vertex(enstrdup(2, name));
} else if (strcmp(from->name, name)) { } else if (strcmp(from->name, name)) {
add_edge(from, add_vertex(estrdup(name))); add_edge(from, add_vertex(enstrdup(2, name)));
from = 0; from = 0;
} else { } else {
from = 0; from = 0;
@ -126,7 +126,7 @@ load_graph(FILE *fp)
free(line); free(line);
if (from) if (from)
eprintf("odd number of tokens in input\n"); enprintf(2, "odd number of tokens in input\n");
} }
static int static int
@ -177,7 +177,7 @@ sort_graph(void)
static void static void
usage(void) usage(void)
{ {
eprintf("usage: %s [file]\n", argv0); enprintf(2, "usage: %s [file]\n", argv0);
} }
int int
@ -196,11 +196,11 @@ main(int argc, char *argv[])
usage(); usage();
if (argc && strcmp(*argv, "-")) if (argc && strcmp(*argv, "-"))
if (!(fp = fopen(fn = *argv, "r"))) if (!(fp = fopen(fn = *argv, "r")))
eprintf("fopen %s:", *argv); enprintf(2, "fopen %s:", *argv);
memset(&graph, 0, sizeof(graph)); memset(&graph, 0, sizeof(graph));
load_graph(fp); load_graph(fp);
efshut(fp, fn); enfshut(2, fp, fn);
ret = sort_graph(); ret = sort_graph();