Unified · Split
| @@ -148,7 +148,6 @@ rcpu(char *host) · 147 unmodified lines | ||
| 148 | 148 | |
| 149 | 149 | /* Begin serving the namespace */ |
| 150 | 150 | exportfs(fd); |
| 151 | − sysfatal("starting exportfs: %r"); | |
| 152 | 151 | } |
| 153 | 152 | |
| 154 | 153 | void |
| @@ -202,7 +201,6 @@ ncpu(char *host) · 47 unmodified lines | ||
| 202 | 201 | |
| 203 | 202 | /* Begin serving the gnot namespace */ |
| 204 | 203 | exportfs(fd); |
| 205 | − sysfatal("starting exportfs: %r"); | |
| 206 | 204 | } |
| 207 | 205 | |
| 208 | 206 | void |
| @@ -80,7 +80,7 @@ exportfs(int fd) · 79 unmodified lines | ||
| 80 | 80 | DEBUG(DFD, "read9p..."); |
| 81 | 81 | n = read9pmsg(netfd, r->buf, messagesize); |
| 82 | 82 | if(n <= 0) |
| 83 | − fatal("eof: n=%d %r", n); | |
| 83 | + fatal(nil); | |
| 84 | 84 | |
| 85 | 85 | if(convM2S(r->buf, n, &r->work) == 0){ |
| 86 | 86 | iprint("convM2S %d byte message\n", n); |
| @@ -489,7 +489,7 @@ fatal(char *s, ...) · 402 unmodified lines | ||
| 489 | 489 | char buf[ERRMAX]; |
| 490 | 490 | va_list arg; |
| 491 | 491 | |
| 492 | − if (s) { | |
| 492 | + if (s != nil) { | |
| 493 | 493 | va_start(arg, s); |
| 494 | 494 | vsnprint(buf, ERRMAX, s, arg); |
| 495 | 495 | va_end(arg); |
| @@ -499,10 +499,10 @@ fatal(char *s, ...) · 3 unmodified lines | ||
| 499 | 499 | // for(m = Proclist; m; m = m->next) |
| 500 | 500 | // postnote(PNPROC, m->pid, "kill"); |
| 501 | 501 | |
| 502 | − DEBUG(DFD, "%s\n", buf); | |
| 503 | − if (s) | |
| 504 | − sysfatal(buf); | |
| 505 | − else | |
| 506 | − sysfatal(""); | |
| 502 | + if (s != nil) { | |
| 503 | + DEBUG(DFD, "%s\n", buf); | |
| 504 | + sysfatal("%s", buf); | |
| 505 | + } else | |
| 506 | + exits(nil); | |
| 507 | 507 | } |
| 508 | 508 | |
| @@ -145,4 +145,4 @@ int readmessage(int, char*, int); · 144 unmodified lines | ||
| 145 | 145 | |
| 146 | 146 | #define notify(x) |
| 147 | 147 | #define noted(x) |
| 148 | −#define exits(x) | |
| 148 | + | |