COMMON: cleanup code

Author: chrisws

configure.ac

@@ -1,4 +1,4 @@
-dnl 
+dnl
 dnl Configure script for SmallBASIC
 dnl
 dnl Copyright(C) 2001-2014 Chris Warren-Smith.
@@ -116,30 +116,30 @@ function defaultConditionals() {
 
 function buildFLTK() {
    TARGET="Building FLTK version."
- 
+
    dnl Checks for FLTK 2.x
    AC_CHECK_PROG(have_fltk, fltk2-config, [yes], [no])
- 
+
    dnl do we HAVE the needed FLTK API VERSION ?
    HAVE_API_VERSION=no
- 
+
    if test "${have_fltk}" = "yes" ; then
      FLTK_API_VERSION="`fltk2-config --api-version`"
      if test "${FLTK_API_VERSION}" = "2.0" ; then
        HAVE_API_VERSION=yes
      fi
    fi
- 
+
    if test "${HAVE_API_VERSION}" = "no" ; then
        AC_MSG_ERROR([
      You need FLTK version 2.* installed with
      the program fltk2-config in your PATH in order to build sbfltk
-     See the FLTK homepage at http://www.fltk.org/. 
-   
+     See the FLTK homepage at http://www.fltk.org/.
+
      configure failed.
    ])
    fi
- 
+
    dnl avoid using MSCRT versions of printf for long double
    case "${host_os}" in
      *mingw* | cygwin*)
@@ -167,7 +167,7 @@ function buildFLTK() {
      PACKAGE_LIBS="${PACKAGE_LIBS} `sdl-config --libs`"
      AC_DEFINE(HAVE_SDL, 1, [Windows build])
    fi
- 
+
    dnl preconfigured values for FLTK build
    AC_DEFINE(_UnixOS, 1, [Building under Unix like systems.])
    AC_DEFINE(_FLTK, 1, [Defined for FLTK build.])
@@ -181,9 +181,8 @@ function buildFLTK() {
    AC_DEFINE(IMPL_DEV_ENV, 1, [Driver implements dev_env funcs])
    AC_DEFINE(IMPL_LOG_WRITE, 1, [Driver implements lwrite()])
    AC_DEFINE(OS_PREC64, 1, [64 bit variables])
-   AC_DEFINE(NO_SCAN_ERROR_PROMPT, 1, [No prompt for detailed scan report])
    AC_DEFINE(DRV_BEEP, 1, [Use the driver based beep function])
-   AC_DEFINE(IMPL_OSD_SOUND, 1, [Driver implements osd_sound()]) 
+   AC_DEFINE(IMPL_OSD_SOUND, 1, [Driver implements osd_sound()])
 
    BUILD_SUBDIRS="src/common src/platform/fltk"
    AC_SUBST(BUILD_SUBDIRS)
@@ -234,9 +233,8 @@ function buildSDL() {
    AC_DEFINE(IMPL_DEV_DELAY, 1, [Driver implements dev_delay()])
    AC_DEFINE(IMPL_LOG_WRITE, 1, [Driver implements lwrite()])
    AC_DEFINE(IMPL_DEV_READ, 1, [Implement dev_read()])
-   AC_DEFINE(IMPL_OSD_SOUND, 1, [Driver implements osd_sound()]) 
+   AC_DEFINE(IMPL_OSD_SOUND, 1, [Driver implements osd_sound()])
    AC_DEFINE(IMPL_LOG_WRITE, 1, [Driver implements lwrite()])
-   AC_DEFINE(NO_SCAN_ERROR_PROMPT, 1, [No prompt for detailed scan report])
    AC_DEFINE(OS_PREC64, 1, [64 bit variables])
    AC_DEFINE(DRV_BEEP, 1, [Use the driver based beep function])
 
@@ -263,15 +261,14 @@ function buildMosync() {
    AC_DEFINE(IMPL_IMAGE, 1, [Driver implements image commands])
    AC_DEFINE(HAVE_MALLOC_USABLE_SIZE, 0, [Newlib version causes mosync stack panic])
    AC_DEFINE(CPU_BIGENDIAN, 1, [Mosync uses big-endian])
-   AC_DEFINE(NO_SCAN_ERROR_PROMPT, 1, [No prompt for detailed scan report])
    AC_DEFINE(IMPL_LOG_WRITE, 1, [Driver implements lwrite()])
    AC_DEFINE(NONSTANDARD_PORT, 1, [sys.h should include portdefs.h])
    AC_DEFINE(USE_TERM_IO, 0, [Does not use terminal-io functions.])
    AC_DEFINE(_MOSYNC, 1, [Defined for Mosync build.])
 
    dnl Checks for mosync
    AC_CHECK_PROG(have_mosync, pipe-tool, [yes], [no])
- 
+
    PACKAGE_CFLAGS="-MMD -S -DMAPIP -O2 -MF "
 
    dnl find out where mosync is installed
@@ -311,7 +308,6 @@ function buildTizen() {
    AC_DEFINE(IMPL_IMAGE, 1, [Driver implements image commands])
    AC_DEFINE(HAVE_MALLOC_USABLE_SIZE, 0, [Newlib version causes mosync stack panic])
    AC_DEFINE(CPU_BIGENDIAN, 1, [Tizen uses big-endian])
-   AC_DEFINE(NO_SCAN_ERROR_PROMPT, 1, [No prompt for detailed scan report])
    AC_DEFINE(IMPL_LOG_WRITE, 1, [Driver implements lwrite()])
    AC_DEFINE(USE_TERM_IO, 0, [Does not use terminal-io functions.])
 
@@ -333,7 +329,6 @@ function buildAndroid() {
    AC_DEFINE(IMPL_IMAGE, 1, [Driver implements image commands])
    AC_DEFINE(HAVE_MALLOC_USABLE_SIZE, 0, [Newlib version causes mosync stack panic])
    AC_DEFINE(CPU_BIGENDIAN, 1, [Android uses big-endian])
-   AC_DEFINE(NO_SCAN_ERROR_PROMPT, 1, [No prompt for detailed scan report])
    AC_DEFINE(IMPL_LOG_WRITE, 1, [Driver implements lwrite()])
    AC_DEFINE(USE_TERM_IO, 0, [Does not use terminal-io functions.])
 
@@ -389,7 +384,7 @@ function buildConsole() {
       fi
       AC_DEFINE(_Win32, 1, [Windows build])
       AC_DEFINE(__addr_t_defined, 1, [Avoid conflict in cygwin/types.h])
-   else 
+   else
       dnl preconfigured values for unix console build
       TARGET="Building Unix console version."
       AC_DEFINE(_UnixOS, 1, [Building under Unix like systems.])
@@ -439,7 +434,7 @@ elif test x$ac_build_android = xyes; then
    buildAndroid
 else
    buildConsole
-fi  
+fi
 
 checkPCRE
 checkDebugMode

src/common/Makefile.am

@@ -7,7 +7,7 @@
 
 # see: http://www.cygwin.com/ml/cygwin/2004-03/msg00289.html
 if !WITH_CYGWIN_CONSOLE
-  AM_CFLAGS = @PACKAGE_CFLAGS@ -Wno-unused-result
+  AM_CFLAGS = @PACKAGE_CFLAGS@ -Wunused -Wno-unused-result
 endif
 
 AM_CPPFLAGS = -I$(top_builddir)/src -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\"

src/common/blib.c

@@ -205,6 +205,7 @@ void cmd_ladd() {
       v_resize_array(var_p, var_p->v.a.size + 1);
       elem_p = (var_t *) (var_p->v.a.ptr + (sizeof(var_t) * (var_p->v.a.size - 1)));
     }
+    
     v_set(elem_p, arg_p);
 
     // next parameter
@@ -312,7 +313,7 @@ void cmd_lins() {
  */
 void cmd_ldel() {
   var_t *var_p, *arg_p;
-  int idx, count = 1, flags;
+  int idx, count = 1;
   int i, j;
 
   var_p = code_getvarptr();
@@ -337,12 +338,6 @@ void cmd_ldel() {
   if ((idx >= var_p->v.a.size) || (idx < 0)) {
     err_out_of_range();
     return;
-  } else if (idx == var_p->v.a.size - 1) {
-    flags = 2;                  // last element
-  } else if (idx == 0) {
-    flags = 1;                  // first element
-  } else {
-    flags = 0;                  // somewhere inside
   }
   // get 'count'
   if (code_peek() == kwTYPE_SEP) {

src/common/blib_func.c

@@ -933,7 +933,7 @@ void cmd_str1(long funcCode, var_t * arg, var_t * r) {
     r->v.p.ptr = tmp_alloc(64);
     if (arg->type == V_INT) {
       ltostr(arg->v.i, (char *) r->v.p.ptr);
-    } else if (arg->type == V_REAL) {
+    } else if (arg->type == V_NUM) {
       ftostr(arg->v.n, (char *) r->v.p.ptr);
     } else if (arg->type == V_STR) {
       tmp_free(r->v.p.ptr);
@@ -1760,7 +1760,6 @@ void cmd_strN(long funcCode, var_t * r) {
 // int <- FUNC (...)
 //
 void cmd_intN(long funcCode, var_t * r) {
-  int pc;
   char *s1 = NULL, *s2 = NULL, *s3 = NULL;
   var_int_t start;
 
@@ -1782,7 +1781,7 @@ void cmd_intN(long funcCode, var_t * r) {
     //
     r->v.i = 0;
     start = 1;
-    pc = par_massget("iSS", &start, &s1, &s2);
+    par_massget("iSS", &start, &s1, &s2);
     if (!prog_error) {
       l = strlen(s1);
       if (l) {
@@ -1977,7 +1976,7 @@ void cmd_intN(long funcCode, var_t * r) {
     var_num_t rc, gc, bc;
     int code;
 
-    pc = par_massget("FFF", &rc, &gc, &bc);
+    par_massget("FFF", &rc, &gc, &bc);
     IF_ERR_RETURN;
     code = 0;
     if (funcCode == kwRGBF) {