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

tsort style fixes

Browse Source 
getline() cannot return 0 so no need to guard against that.
This commit is contained in:
sin 2016-02-24 15:56:39 +00:00
parent 102baab4c4
commit 9a2b8d3531
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tsort.c
View File

@ -6,9 +6,7 @@
#include "util.h" #include "util.h"
#define WHITE 0 enum { WHITE = 0, GREY, BLACK };
#define GREY 1
#define BLACK 2
struct vertex; struct vertex;
@ -41,7 +39,7 @@ find_vertex(const char *name, struct vertex **it, struct vertex **prev)
} }
static void static void
find_edge(struct vertex* from, const char *to, struct edge **it, struct edge **prev) find_edge(struct vertex *from, const char *to, struct edge **it, struct edge **prev)
{ {
for (*prev = &(from->edges); (*it = (*prev)->next); *prev = *it) { for (*prev = &(from->edges); (*it = (*prev)->next); *prev = *it) {
int cmp = strcmp(to, (*it)->to->name); int cmp = strcmp(to, (*it)->to->name);
@ -72,7 +70,7 @@ add_vertex(char *name)
} }
static struct edge * static struct edge *
add_edge(struct vertex* from, struct vertex* to) add_edge(struct vertex *from, struct vertex* to)
{ {
struct edge *edge; struct edge *edge;
struct edge *prev; struct edge *prev;
@ -104,8 +102,8 @@ load_graph(FILE *fp)
struct vertex *from = 0; struct vertex *from = 0;
while ((len = getline(&line, &size, fp)) != -1) { while ((len = getline(&line, &size, fp)) != -1) {
if (len && line[len - 1] == '\n') if (line[len - 1] == '\n')
line[len - 1] = 0; line[--len] = 0;
for (p = line; p;) { for (p = line; p;) {
SKIP(name, p, isspace); SKIP(name, p, isspace);
if (!*name) if (!*name)