commit 9ae6a5d073c852a2ebec70844de3e52302ba1a0b
author Gavin Howard <yzena.tech@gmail.com> Tue Mar 13 16:14:58 2018 -0600
committer Gavin Howard <yzena.tech@gmail.com> Tue Aug 28 17:10:59 2018 -0600
tree 94fc8d02ca2353a07141814e4572bc935475a1f1
parent 53043d6f4d561a0659a2d6cce9d3f331fb969def

Change some function headers for toybox

include/bc.h

diff --git a/include/bc.h b/include/bc.h
index 4ee446b..6960fb0 100644
--- a/include/bc.h
+++ b/include/bc.h
@@ -144,14 +144,14 @@
 
 } BcGlobals;
 
-BcStatus bc_exec(unsigned long long flags, unsigned int filec, char *filev[]);
+BcStatus bc_main(unsigned int flags, unsigned int filec, char *filev[]);
 // ** Exclude end. **
 
-void bc_error(BcStatus status);
-void bc_error_file(BcStatus status, const char *file, uint32_t line);
+void bc_error(BcStatus st);
+void bc_error_file(BcStatus st, const char *file, size_t line);
 
-BcStatus bc_posix_error(BcStatus status, const char *file,
-                        uint32_t line, const char *msg);
+BcStatus bc_posix_error(BcStatus st, const char *file,
+                        size_t line, const char *msg);
 
 extern BcGlobals bcg;
 

src/bc/bc.c

diff --git a/src/bc/bc.c b/src/bc/bc.c
index bddb65b..70d218a 100644
--- a/src/bc/bc.c
+++ b/src/bc/bc.c
@@ -32,56 +32,54 @@
 #include <bc.h>
 #include <vm.h>
 
-void bc_error(BcStatus status) {
+void bc_error(BcStatus st) {
 
-  if (!status || status == BC_STATUS_PARSE_QUIT ||
-      status == BC_STATUS_EXEC_HALT ||
-      status >= BC_STATUS_POSIX_NAME_LEN)
+  if (!st || st == BC_STATUS_PARSE_QUIT ||
+      st == BC_STATUS_EXEC_HALT ||
+      st >= BC_STATUS_POSIX_NAME_LEN)
   {
     return;
   }
 
   fprintf(stderr, "\n%s error: %s\n\n",
-          bc_err_types[status], bc_err_descs[status]);
+          bc_err_types[st], bc_err_descs[st]);
 }
 
-void bc_error_file(BcStatus status, const char *file, uint32_t line) {
+void bc_error_file(BcStatus st, const char *file, size_t line) {
 
-  if (!status || status == BC_STATUS_PARSE_QUIT ||
-      !file || status >= BC_STATUS_POSIX_NAME_LEN)
+  if (!st || st == BC_STATUS_PARSE_QUIT ||
+      !file || st >= BC_STATUS_POSIX_NAME_LEN)
   {
     return;
   }
 
-  fprintf(stderr, "\n%s error: %s\n", bc_err_types[status],
-          bc_err_descs[status]);
+  fprintf(stderr, "\n%s error: %s\n", bc_err_types[st],
+          bc_err_descs[st]);
 
   fprintf(stderr, "    %s", file);
   fprintf(stderr, &":%d\n\n"[3 * !line], line);
 }
 
-BcStatus bc_posix_error(BcStatus status, const char *file,
-                        uint32_t line, const char *msg)
+BcStatus bc_posix_error(BcStatus st, const char *file,
+                        size_t line, const char *msg)
 {
-  if (!(bcg.bc_std || bcg.bc_warn) ||
-      status < BC_STATUS_POSIX_NAME_LEN ||
-      !file)
-  {
-    return BC_STATUS_SUCCESS;
-  }
+  int s = bcg.bc_std, w = bcg.bc_warn;
 
-  fprintf(stderr, "\n%s %s: %s\n", bc_err_types[status],
-          bcg.bc_std ? "error" : "warning", bc_err_descs[status]);
+  if (!(s || w) || st < BC_STATUS_POSIX_NAME_LEN || !file)
+    return BC_STATUS_SUCCESS;
+
+  fprintf(stderr, "\n%s %s: %s\n", bc_err_types[st],
+          s ? "error" : "warning", bc_err_descs[st]);
 
   if (msg) fprintf(stderr, "    %s\n", msg);
 
   fprintf(stderr, "    %s", file);
   fprintf(stderr, &":%d\n\n"[3 * !line], line);
 
-  return bcg.bc_std ? status : BC_STATUS_SUCCESS;
+  return st * !!s;
 }
 
-BcStatus bc_exec(unsigned long long flags, unsigned int filec, char *filev[]) {
+BcStatus bc_main(unsigned int flags, unsigned int filec, char *filev[]) {
 
   BcStatus status;
   BcVm vm;