From 0369b1505b019becfb74ccd9c82f9f7700af377a Mon Sep 17 00:00:00 2001
From: Nicholas <nbnoll@eml.cc>
Date: Fri, 12 Nov 2021 16:59:46 -0800
Subject: chore: error->int

---
 src/base/bufio/reader.c |  2 +-
 src/base/bufio/unget.c  |  2 +-
 src/base/coro/coro.c    |  2 +-
 src/base/flate/reader.c |  4 ++--
 src/base/flate/writer.c |  4 ++--
 src/base/gz/flush.c     |  2 +-
 src/base/gz/get.c       |  2 +-
 src/base/gz/open.c      |  2 +-
 src/base/gz/printf.c    |  2 +-
 src/base/gz/put.c       |  2 +-
 src/base/gz/putstring.c |  2 +-
 src/base/io/interface.c |  4 ++--
 src/base/io/open.c      |  2 +-
 src/base/io/stat.c      |  2 +-
 src/base/io/unget.c     |  2 +-
 src/base/mmap/mmap.c    |  2 +-
 src/cmd/term/term.c     |  2 +-
 src/libbio/fasta.c      | 30 +++++++++++++++---------------
 src/libbio/newick.c     | 10 +++++-----
 src/libbio/phylo.c      | 26 +++++++++++++-------------
 src/libmath/blas2body   |  2 +-
 21 files changed, 54 insertions(+), 54 deletions(-)

(limited to 'src')

diff --git a/src/base/bufio/reader.c b/src/base/bufio/reader.c
index afdaf60..39ea63e 100644
--- a/src/base/bufio/reader.c
+++ b/src/base/bufio/reader.c
@@ -1,6 +1,6 @@
 #include "internal.h"
 
-error
+int
 bufio·initreader(io·Buffer *buf, io·Reader rdr, void *h)
 {
     if (buf->state) {
diff --git a/src/base/bufio/unget.c b/src/base/bufio/unget.c
index 3fd16de..1951384 100644
--- a/src/base/bufio/unget.c
+++ b/src/base/bufio/unget.c
@@ -1,6 +1,6 @@
 #include "internal.h"
 
-error
+int
 bufio·ungetbyte(io·Buffer *buf, byte c)
 {
     if(!(buf->state & bufio·rdr)) {
diff --git a/src/base/coro/coro.c b/src/base/coro/coro.c
index 2255c99..5d3bb27 100644
--- a/src/base/coro/coro.c
+++ b/src/base/coro/coro.c
@@ -16,7 +16,7 @@ coro·make(uintptr stk, uintptr (*func)(Coro*, uintptr))
     return co;
 }
 
-error
+int
 coro·free(Coro *co)
 {
     enum 
diff --git a/src/base/flate/reader.c b/src/base/flate/reader.c
index 84f0d80..bbcf5fe 100644
--- a/src/base/flate/reader.c
+++ b/src/base/flate/reader.c
@@ -3,7 +3,7 @@
 flate·Reader*
 flate·openreader(io·Reader rdr, void* r, mem·Allocator mem, void* m)
 {
-    error      err;
+    int err;
     flate·Reader *zrdr;
 
     zrdr = mem.alloc(m, 1, sizeof(*zrdr));
@@ -41,7 +41,7 @@ ERROR:
     return nil;
 }
 
-error
+int
 flate·closereader(flate·Reader *rdr)
 {
     int err;
diff --git a/src/base/flate/writer.c b/src/base/flate/writer.c
index f339ae0..3d7acb0 100644
--- a/src/base/flate/writer.c
+++ b/src/base/flate/writer.c
@@ -3,7 +3,7 @@
 flate·Writer*
 flate·openwriter(io·Writer wtr, void* w, mem·Allocator mem, void* m)
 {
-    error      err;
+    int err;
     flate·Writer *zwtr;
 
     zwtr = mem.alloc(m, 1, sizeof(*zwtr));
@@ -39,7 +39,7 @@ ERROR:
     return nil;
 }
 
-error
+int
 flate·closewriter(flate·Writer *wtr)
 {
     int err;
diff --git a/src/base/gz/flush.c b/src/base/gz/flush.c
index 011a3ab..72d9af7 100644
--- a/src/base/gz/flush.c
+++ b/src/base/gz/flush.c
@@ -1,6 +1,6 @@
 #include "internal.h"
 
-error
+int
 gz·flush(gz·Stream *s)
 {
     return gzflush(s, Z_FINISH);
diff --git a/src/base/gz/get.c b/src/base/gz/get.c
index 24ba23a..9114048 100644
--- a/src/base/gz/get.c
+++ b/src/base/gz/get.c
@@ -10,7 +10,7 @@ gz·getbyte(gz·Stream *s)
     return b[0];
 }
 
-error
+int
 gz·ungetbyte(gz·Stream *s, byte c)
 {
     return gzungetc(c, s);
diff --git a/src/base/gz/open.c b/src/base/gz/open.c
index c84ce5e..50bc94f 100644
--- a/src/base/gz/open.c
+++ b/src/base/gz/open.c
@@ -6,7 +6,7 @@ gz·open(byte *path, byte *mode)
     return gzopen(path, mode);
 }
 
-error
+int
 gz·close(gz·Stream* s)
 {
     return gzclose(s);
diff --git a/src/base/gz/printf.c b/src/base/gz/printf.c
index d7f75cf..d753497 100644
--- a/src/base/gz/printf.c
+++ b/src/base/gz/printf.c
@@ -3,7 +3,7 @@
 int
 gz·printf(gz·Stream *s, byte *fmt, ...)
 {
-    error err;
+    int err;
 
     va_list args;
     va_start(args, fmt);
diff --git a/src/base/gz/put.c b/src/base/gz/put.c
index fa9807d..b887ad2 100644
--- a/src/base/gz/put.c
+++ b/src/base/gz/put.c
@@ -1,6 +1,6 @@
 #include "internal.h"
 
-error
+int
 gz·putbyte(gz·Stream *s, byte c)
 {
     return gzputc(s, c);
diff --git a/src/base/gz/putstring.c b/src/base/gz/putstring.c
index 64ff470..68034fc 100644
--- a/src/base/gz/putstring.c
+++ b/src/base/gz/putstring.c
@@ -1,6 +1,6 @@
 #include "internal.h"
 
-error
+int
 gz·putstring(gz·Stream *s, byte *str)
 {
     return gzputs(s, str);
diff --git a/src/base/io/interface.c b/src/base/io/interface.c
index bead9e1..bc9d5ff 100644
--- a/src/base/io/interface.c
+++ b/src/base/io/interface.c
@@ -15,7 +15,7 @@ byte
 }
 
 static
-error
+int
 ·unget(void *rdr, byte c)
 {
     return io·ungetbyte((io·Stream *)rdr, c);
@@ -29,7 +29,7 @@ int
 }
 
 static
-error
+int
 ·put(void *wtr, byte c)
 {
     return io·putbyte((io·Stream *)wtr, c);
diff --git a/src/base/io/open.c b/src/base/io/open.c
index e50e334..71e88d4 100644
--- a/src/base/io/open.c
+++ b/src/base/io/open.c
@@ -6,7 +6,7 @@ io·open(byte *name, byte *mode)
     return fopen(name, mode);
 }
 
-error
+int
 io·close(io·Stream *s)
 {
     return fclose(s);
diff --git a/src/base/io/stat.c b/src/base/io/stat.c
index d86f1ee..063ff8f 100644
--- a/src/base/io/stat.c
+++ b/src/base/io/stat.c
@@ -1,6 +1,6 @@
 #include "internal.h"
 
-error
+int
 io·stat(io·Stream *s, io·Stat *buf)
 {
     return fstat(fileno(s), buf);
diff --git a/src/base/io/unget.c b/src/base/io/unget.c
index 5ec3536..5c37433 100644
--- a/src/base/io/unget.c
+++ b/src/base/io/unget.c
@@ -1,6 +1,6 @@
 #include "internal.h"
 
-error
+int
 io·ungetbyte(io·Stream *s, byte c)
 {
     return ungetc(c, s);
diff --git a/src/base/mmap/mmap.c b/src/base/mmap/mmap.c
index ce3011c..e5cedbb 100644
--- a/src/base/mmap/mmap.c
+++ b/src/base/mmap/mmap.c
@@ -31,7 +31,7 @@ ERROR:
     return (mmap·Reader){ 0 };
 }
 
-error
+int
 mmap·close(mmap·Reader rdr)
 {
     munmap(rdr.b, rdr.len);
diff --git a/src/cmd/term/term.c b/src/cmd/term/term.c
index 50ab29c..9e13ebd 100644
--- a/src/cmd/term/term.c
+++ b/src/cmd/term/term.c
@@ -525,7 +525,7 @@ sigchld(int a)
 void
 stty(char **args)
 {
-	char cmd[_POSIX_ARG_MAX], **p, *q, *s;
+	char cmd[PATH_MAX], **p, *q, *s;
 	size_t n, siz;
 
 	if ((n = strlen(stty_args)) > sizeof(cmd)-1)
diff --git a/src/libbio/fasta.c b/src/libbio/fasta.c
index 3788544..eb0d090 100644
--- a/src/libbio/fasta.c
+++ b/src/libbio/fasta.c
@@ -23,7 +23,7 @@ reset(struct SeqBuf *sb)
 }
 
 static
-error
+int
 grow(struct SeqBuf **sb, int min)
 {
     void* heap;
@@ -56,7 +56,7 @@ grow(struct SeqBuf **sb, int min)
 }
 
 static
-error
+int
 put(struct SeqBuf **sb, byte c)
 {
     int err;
@@ -79,7 +79,7 @@ put(struct SeqBuf **sb, byte c)
 }
 
 static
-error
+int
 push(struct SeqBuf **sb, int n, void *buf)
 {
     int d, err;
@@ -117,7 +117,7 @@ struct bio·SeqReader {
 };
 
 static
-error
+int
 fill(bio·SeqReader *rdr)
 {
     int n;
@@ -141,7 +141,7 @@ fill(bio·SeqReader *rdr)
 bio·SeqReader*
 bio·openseq(io·Reader rdr, void *io, mem·Allocator mem, void *heap)
 {
-    error err;
+    int err;
     bio·SeqReader *r;
 
     r = mem.alloc(heap, 1, sizeof(bio·SeqReader));
@@ -168,7 +168,7 @@ ERROR:
     return nil;
 }
 
-error
+int
 bio·closeseq(bio·SeqReader *rdr)
 {
     mem·Allocator mem;
@@ -185,11 +185,11 @@ bio·closeseq(bio·SeqReader *rdr)
 
 
 static
-error
+int
 readfasta(bio·SeqReader *rdr, bio·Seq *seq, byte hdr, byte stop)
 {
-    error  err;
-    byte  *beg;
+    int  err;
+    byte *beg;
 
     if(rdr->eof && rdr->b == rdr->bend-1)
         return EOF;
@@ -256,10 +256,10 @@ SUCCESS:
  * fasta files
  */
 
-error
+int
 bio·readfasta(bio·SeqReader *rdr, bio·Seq *seq)
 {
-    error err;
+    int err;
 
     err = readfasta(rdr, seq, '>', '>');
     if(err && err != EOF) {
@@ -279,12 +279,12 @@ bio·readfasta(bio·SeqReader *rdr, bio·Seq *seq)
  * fastq files
  */
 
-error
+int
 bio·readfastq(bio·SeqReader *rdr, bio·Seq *seq)
 {
     int   n;
     byte *beg;
-    error err;
+    int err;
 
     err = readfasta(rdr, seq, '@', '+');
     if(err) {
@@ -352,7 +352,7 @@ SUCCESS:
 // -----------------------------------------------------------------------
 // sequence writing
 
-error 
+int
 bio·writefasta(io·Writer io, void *wtr, bio·Seq seq)
 {
     int i, j, d;
@@ -385,7 +385,7 @@ bio·writefasta(io·Writer io, void *wtr, bio·Seq seq)
     return 0;
 }
 
-error
+int
 bio·writefastq(io·Writer io, void *wtr, bio·Seq seq)
 {
     panicf("need to implement");
diff --git a/src/libbio/newick.c b/src/libbio/newick.c
index 5e6d30a..bc768fd 100644
--- a/src/libbio/newick.c
+++ b/src/libbio/newick.c
@@ -174,10 +174,10 @@ struct Parser
 };
 
 static
-error
+int
 parse(struct Parser *p)
 {
-    error err;
+    int err;
     bio·Node *node;
     bio·Node *root;
     struct Token tok;
@@ -332,7 +332,7 @@ ERROR:
 int
 bio·readnewick(io·Peeker stream, void *s, bio·Tree *tree)
 {
-    error err;
+    int err;
     struct Parser p;
 
     if (!tree) {
@@ -369,7 +369,7 @@ bio·readnewick(io·Peeker stream, void *s, bio·Tree *tree)
 // Write
 
 static
-error
+int
 dump(bio·Node *node, void *impl, io·Putter out)
 {
     byte b[24];
@@ -403,7 +403,7 @@ dump(bio·Node *node, void *impl, io·Putter out)
     return 0;
 }
 
-error
+int
 bio·writenewick(bio·Tree tree, io·Putter out, void* impl)
 {
     dump(tree.root, impl, out);
diff --git a/src/libbio/phylo.c b/src/libbio/phylo.c
index d50934f..41b0f04 100644
--- a/src/libbio/phylo.c
+++ b/src/libbio/phylo.c
@@ -8,7 +8,7 @@
 // NOTE: As of now these don't update nnode & nleaf stats.
 //       It is the caller's responsibility to refresh counts.
 
-error
+int
 phylo·addchild(bio·Node* parent, bio·Node* child)
 {
     bio·Node *it, *sibling;
@@ -28,7 +28,7 @@ SUCCESS:
     return 0;
 }
 
-error
+int
 phylo·rmchild(bio·Node *parent, bio·Node *child)
 {
     bio·Node *it, *prev;
@@ -59,11 +59,11 @@ FOUND:
 // -----------------------------------------------------------------------
 // subtree statistics
 
-error
+int
 phylo·countnodes(bio·Node *node, int *n)
 {
-    int       m;
-    error     err;
+    int  m;
+    int  err;
     bio·Node *child;
     
     m = *n;
@@ -79,10 +79,10 @@ phylo·countnodes(bio·Node *node, int *n)
     return 0;
 }
 
-error
+int
 phylo·countleafs(bio·Node *node, int *n)
 {
-    error     err;
+    int err;
     bio·Node *child;
 
     if (!node->nchild) {
@@ -182,11 +182,11 @@ sortnodelist(bio·Node **head, bio·Node *next)
     *head = tmp.sibling;
 }
 
-error
+int
 phylo·ladderize(bio·Node *root)
 {
-    int       i;
-    error     err;
+    int i;
+    int err;
     bio·Node *child, *sorted, *sibling;
 
     if (!root->nchild) return 0;
@@ -347,10 +347,10 @@ phylo·diameter(bio·Tree tree, int *len, bio·Node **path)
  * reroot a tree on a new node
  */
 static
-error
+int
 rotateparent(bio·Node *node, bio·Node *to)
 {
-    error err;
+    int err;
 
     // NOTE: will this ever be taken?
     if (node->parent == to) {
@@ -385,7 +385,7 @@ RMCHILD:
 }
 
 #define PREC .00000001
-error
+int
 phylo·reroot(bio·Tree *tree, bio·Node *node, double d)
 {
     bio·Node *new;
diff --git a/src/libmath/blas2body b/src/libmath/blas2body
index 45baf67..e3794f9 100644
--- a/src/libmath/blas2body
+++ b/src/libmath/blas2body
@@ -1,5 +1,5 @@
 /* general matrix multiply */
-error
+int
 func(gemv)(uint flag, INT nrow, INT ncol, FLOAT a, FLOAT *m, INT incm, FLOAT *x, INT incx, FLOAT b, FLOAT *y, INT incy)
 {
     INT r, c, nr, nc;
-- 
cgit v1.2.1