commit 4d498ceb7f52b0eb7473010d94b36225ccfd85ab
author Gavin Howard <yzena.tech@gmail.com> Sat Mar 17 08:29:09 2018 -0600
committer Gavin Howard <yzena.tech@gmail.com> Tue Aug 28 17:11:05 2018 -0600
tree ab501fcdb12c77a374941bbcddd101aefb15fe11
parent 431435bf66dc001cd354a3178914b7896cab55af

Get my params and args straight in status name and message

include/bc.h

diff --git a/include/bc.h b/include/bc.h
index a657015..87701f3 100644
--- a/include/bc.h
+++ b/include/bc.h
@@ -60,7 +60,7 @@
   BC_STATUS_MALLOC_FAIL,
   BC_STATUS_IO_ERR,
 
-  BC_STATUS_INVALID_PARAM,
+  BC_STATUS_INVALID_ARG,
 
   BC_STATUS_NO_LIMIT,
   BC_STATUS_BAD_LIMIT,

src/bc/data.c

diff --git a/src/bc/data.c b/src/bc/data.c
index 7907d46..c018402 100644
--- a/src/bc/data.c
+++ b/src/bc/data.c
@@ -128,7 +128,7 @@
   "memory allocation error",
   "I/O error",
 
-  "bad parameter",
+  "bad argument",
 
   "one or more limits not specified",
   "bad limit; this is a bug in bc",

src/bc/io.c

diff --git a/src/bc/io.c b/src/bc/io.c
index 10ecc03..4e52783 100644
--- a/src/bc/io.c
+++ b/src/bc/io.c
@@ -76,7 +76,7 @@
   char *s;
   char *t;
 
-  if (!p || !n || !fp) return BC_STATUS_INVALID_PARAM;
+  if (!p || !n || !fp) return BC_STATUS_INVALID_ARG;
 
   if (!p) {
 

src/bc/lex.c

diff --git a/src/bc/lex.c b/src/bc/lex.c
index 40824ea..d884eee 100644
--- a/src/bc/lex.c
+++ b/src/bc/lex.c
@@ -685,7 +685,7 @@
 
 BcStatus bc_lex_init(BcLex *lex, const char *file) {
 
-  if (lex == NULL ) return BC_STATUS_INVALID_PARAM;
+  if (lex == NULL ) return BC_STATUS_INVALID_ARG;
 
   lex->line = 1;
   lex->newline = false;
@@ -696,7 +696,7 @@
 
 BcStatus bc_lex_text(BcLex *lex, const char *text) {
 
-  if (lex == NULL || text == NULL) return BC_STATUS_INVALID_PARAM;
+  if (lex == NULL || text == NULL) return BC_STATUS_INVALID_ARG;
 
   lex->buffer = text;
   lex->idx = 0;
@@ -709,7 +709,7 @@
 
   BcStatus status;
 
-  if (lex == NULL || token == NULL) return BC_STATUS_INVALID_PARAM;
+  if (lex == NULL || token == NULL) return BC_STATUS_INVALID_ARG;
 
   if (lex->idx == lex->len) {
     token->type = BC_LEX_EOF;

src/bc/num.c

diff --git a/src/bc/num.c b/src/bc/num.c
index d7abe66..0787294 100644
--- a/src/bc/num.c
+++ b/src/bc/num.c
@@ -942,7 +942,7 @@
   BcNum *ptr_b;
   bool init;
 
-  if (!a || !b || !c || !op) return BC_STATUS_INVALID_PARAM;
+  if (!a || !b || !c || !op) return BC_STATUS_INVALID_ARG;
 
   init = false;
 
@@ -985,7 +985,7 @@
   BcNum a2;
   BcNum *ptr_a;
 
-  if (!a || !b || !op) return BC_STATUS_INVALID_PARAM;
+  if (!a || !b || !op) return BC_STATUS_INVALID_ARG;
 
   if (b == a) {
 
@@ -1486,7 +1486,7 @@
 
 BcStatus bc_num_init(BcNum *n, size_t request) {
 
-  if (!n) return BC_STATUS_INVALID_PARAM;
+  if (!n) return BC_STATUS_INVALID_ARG;
 
   memset(n, 0, sizeof(BcNum));
 
@@ -1503,7 +1503,7 @@
 
 BcStatus bc_num_expand(BcNum *n, size_t request) {
 
-  if (!n || !request) return BC_STATUS_INVALID_PARAM;
+  if (!n || !request) return BC_STATUS_INVALID_ARG;
 
   if (request > n->cap) {
 
@@ -1542,7 +1542,7 @@
   BcNum *d;
   BcNum *s;
 
-  if (!dest || !src) return BC_STATUS_INVALID_PARAM;
+  if (!dest || !src) return BC_STATUS_INVALID_ARG;
 
   if (dest == src) return BC_STATUS_SUCCESS;
 
@@ -1567,7 +1567,7 @@
 
   BcStatus status;
 
-  if (!n || !val) return BC_STATUS_INVALID_PARAM;
+  if (!n || !val) return BC_STATUS_INVALID_ARG;
 
   if (base_t < BC_NUM_MIN_BASE || base_t > BC_NUM_MAX_INPUT_BASE)
     return BC_STATUS_EXEC_BAD_IBASE;
@@ -1585,7 +1585,7 @@
 {
   BcStatus status;
 
-  if (!n || !f) return BC_STATUS_INVALID_PARAM;
+  if (!n || !f) return BC_STATUS_INVALID_ARG;
 
   if (base_t < BC_NUM_MIN_BASE || base_t > BC_BASE_MAX_DEF)
     return BC_STATUS_EXEC_BAD_OBASE;
@@ -1627,7 +1627,7 @@
   unsigned long prev;
   unsigned long pow;
 
-  if (!n || !result) return BC_STATUS_INVALID_PARAM;
+  if (!n || !result) return BC_STATUS_INVALID_ARG;
 
   temp = 0;
   pow = 1;
@@ -1656,7 +1656,7 @@
   unsigned long prev;
   unsigned long pow;
 
-  if (!n || !result) return BC_STATUS_INVALID_PARAM;
+  if (!n || !result) return BC_STATUS_INVALID_ARG;
 
   if (n->neg) return BC_STATUS_MATH_NEGATIVE;
 
@@ -1685,7 +1685,7 @@
   BcDigit *ptr;
   BcDigit carry;
 
-  if (!n) return BC_STATUS_INVALID_PARAM;
+  if (!n) return BC_STATUS_INVALID_ARG;
 
   bc_num_zero(n);
 
@@ -1733,7 +1733,7 @@
   size_t i;
   BcDigit *ptr;
 
-  if (!n) return BC_STATUS_INVALID_PARAM;
+  if (!n) return BC_STATUS_INVALID_ARG;
 
   bc_num_zero(n);
 
@@ -1760,7 +1760,7 @@
 }
 
 BcStatus bc_num_truncate(BcNum *n) {
-  if (!n) return BC_STATUS_INVALID_PARAM;
+  if (!n) return BC_STATUS_INVALID_ARG;
   return bc_num_trunc(n, n->rdx);
 }
 

src/bc/parse.c

diff --git a/src/bc/parse.c b/src/bc/parse.c
index 0a1909f..7b60a40 100644
--- a/src/bc/parse.c
+++ b/src/bc/parse.c
@@ -1738,7 +1738,7 @@
 
   BcStatus status;
 
-  if (parse == NULL || program == NULL) return BC_STATUS_INVALID_PARAM;
+  if (parse == NULL || program == NULL) return BC_STATUS_INVALID_ARG;
 
   status = bc_vec_init(&parse->flags, sizeof(uint8_t), NULL);
 
@@ -1786,7 +1786,7 @@
 
 BcStatus bc_parse_file(BcParse *parse, const char *file) {
 
-  if (parse == NULL || file == NULL) return BC_STATUS_INVALID_PARAM;
+  if (parse == NULL || file == NULL) return BC_STATUS_INVALID_ARG;
 
   return bc_lex_init(&parse->lex, file);
 }
@@ -1795,7 +1795,7 @@
 
   BcStatus status;
 
-  if (parse == NULL || text == NULL) return BC_STATUS_INVALID_PARAM;
+  if (parse == NULL || text == NULL) return BC_STATUS_INVALID_ARG;
 
   status = bc_lex_text(&parse->lex, text);
 
@@ -1808,7 +1808,7 @@
 
   BcStatus status;
 
-  if (parse == NULL) return BC_STATUS_INVALID_PARAM;
+  if (parse == NULL) return BC_STATUS_INVALID_ARG;
 
   switch (parse->token.type) {
 

src/bc/vector.c

diff --git a/src/bc/vector.c b/src/bc/vector.c
index d5613bb..1ac2a6d 100644
--- a/src/bc/vector.c
+++ b/src/bc/vector.c
@@ -43,7 +43,7 @@
 
 BcStatus bc_vec_init(BcVec *vec, size_t esize, BcFreeFunc dtor) {
 
-  if (vec == NULL || esize == 0) return BC_STATUS_INVALID_PARAM;
+  if (vec == NULL || esize == 0) return BC_STATUS_INVALID_ARG;
 
   vec->size = esize;
   vec->cap = BC_VEC_INITIAL_CAP;
@@ -61,7 +61,7 @@
 
   uint8_t *ptr;
 
-  if (!vec) return BC_STATUS_INVALID_PARAM;
+  if (!vec) return BC_STATUS_INVALID_ARG;
 
   if (vec->cap >= request) return BC_STATUS_SUCCESS;
 
@@ -80,7 +80,7 @@
   BcStatus status;
   size_t size;
 
-  if (vec == NULL || data == NULL) return BC_STATUS_INVALID_PARAM;
+  if (vec == NULL || data == NULL) return BC_STATUS_INVALID_ARG;
 
   if (vec->len == vec->cap) {
 
@@ -102,7 +102,7 @@
   BcStatus status;
 
   if (vec == NULL || vec->size != sizeof(uint8_t))
-    return BC_STATUS_INVALID_PARAM;
+    return BC_STATUS_INVALID_ARG;
 
   if (vec->len == vec->cap) {
 
@@ -125,7 +125,7 @@
   size_t size;
 
   if (vec == NULL || data == NULL || idx > vec->len)
-    return BC_STATUS_INVALID_PARAM;
+    return BC_STATUS_INVALID_ARG;
 
   if (idx == vec->len) return bc_vec_push(vec, data);
 
@@ -170,7 +170,7 @@
 
 BcStatus bc_vec_pop(BcVec *vec) {
 
-  if (vec == NULL) return BC_STATUS_INVALID_PARAM;
+  if (vec == NULL) return BC_STATUS_INVALID_ARG;
 
   if (!vec->len) return BC_STATUS_VEC_OUT_OF_BOUNDS;
 
@@ -245,7 +245,7 @@
 BcStatus bc_veco_init(BcVecO* vec, size_t esize,
                       BcFreeFunc dtor, BcVecCmpFunc cmp)
 {
-  if (!vec || esize == 0 || !cmp) return BC_STATUS_INVALID_PARAM;
+  if (!vec || esize == 0 || !cmp) return BC_STATUS_INVALID_ARG;
 
   vec->cmp = cmp;
 
@@ -256,7 +256,7 @@
 
   BcStatus status;
 
-  if (!vec || !data) return BC_STATUS_INVALID_PARAM;
+  if (!vec || !data) return BC_STATUS_INVALID_ARG;
 
   *idx = bc_veco_find(vec, data);
 
@@ -278,7 +278,7 @@
 
   size_t idx;
 
-  if (!vec || !data) return BC_STATUS_INVALID_PARAM;
+  if (!vec || !data) return BC_STATUS_INVALID_ARG;
 
   idx = bc_veco_find(vec, data);