[hackers] [sbase] Use en* instead of e* function family in tsort(1) || FRIGN

From: <git_AT_suckless.org>
Date: Wed, 24 Feb 2016 16:28:04 +0100 (CET)

commit 102baab4c487d99759c19869455d87e6d35fbc55
Author: FRIGN <dev_AT_frign.de>
AuthorDate: Wed Feb 24 16:26:29 2016 +0100
Commit: sin <sin_AT_2f30.org>
CommitDate: Wed Feb 24 15:28:01 2016 +0000

    Use en* instead of e* function family in tsort(1)
    
    The wtf macros overwrote the semantics, for more clarity this
    has been fixed.

diff --git a/tsort.c b/tsort.c
index 317d573..cb4997a 100644
--- a/tsort.c
+++ b/tsort.c
_AT_@ -63,7 +63,7 @@ add_vertex(char *name)
         if (vertex)
                 return vertex;
 
- vertex = ecalloc(1, sizeof(*vertex));
+ vertex = encalloc(2, 1, sizeof(*vertex));
         vertex->name = name;
         vertex->next = prev->next;
         prev->next = vertex;
_AT_@ -81,7 +81,7 @@ add_edge(struct vertex* from, struct vertex* to)
         if (edge)
                 return edge;
 
- edge = ecalloc(1, sizeof(*edge));
+ edge = encalloc(2, 1, sizeof(*edge));
         edge->to = to;
         edge->next = prev->next;
         prev->next = edge;
_AT_@ -113,9 +113,9 @@ load_graph(FILE *fp)
                         SKIP(p, name, !isspace);
                         TOKEN_END(p);
                         if (!from) {
- from = add_vertex(estrdup(name));
+ from = add_vertex(enstrdup(2, name));
                         } else if (strcmp(from->name, name)) {
- add_edge(from, add_vertex(estrdup(name)));
+ add_edge(from, add_vertex(enstrdup(2, name)));
                                 from = 0;
                         } else {
                                 from = 0;
_AT_@ -126,7 +126,7 @@ load_graph(FILE *fp)
         free(line);
 
         if (from)
- eprintf("odd number of tokens in input\n");
+ enprintf(2, "odd number of tokens in input\n");
 }
 
 static int
_AT_@ -177,7 +177,7 @@ sort_graph(void)
 static void
 usage(void)
 {
- eprintf("usage: %s [file]\n", argv0);
+ enprintf(2, "usage: %s [file]\n", argv0);
 }
 
 int
_AT_@ -196,11 +196,11 @@ main(int argc, char *argv[])
                 usage();
         if (argc && strcmp(*argv, "-"))
                 if (!(fp = fopen(fn = *argv, "r")))
- eprintf("fopen %s:", *argv);
+ enprintf(2, "fopen %s:", *argv);
 
         memset(&graph, 0, sizeof(graph));
         load_graph(fp);
- efshut(fp, fn);
+ enfshut(2, fp, fn);
 
         ret = sort_graph();
 
Received on Wed Feb 24 2016 - 16:28:04 CET