COMMON: resolved some compiler warnings

Author: chrisws

configure.ac

@@ -81,8 +81,10 @@ function checkDebugMode() {
    AC_MSG_RESULT([$with_debug])
    if test "$with_debug" = "yes" || test "$with_debug" = "full"
    then
-     CFLAGS="${CFLAGS} -g -O0 -fstack-protector-all"
-     CXXFLAGS="${CXXFLAGS} -g -O0 -fstack-protector-all"
+     DEBUG_FLAGS="-g -O1 -fstack-protector-all -fno-omit-frame-pointer"
+     #-fsanitize=address,undefined"
+     CFLAGS="${DEBUG_FLAGS}"
+     CXXFLAGS="${DEBUG_FLAGS}"
      AC_DEFINE(_DEBUG, 1, [debugging build enabled])
    fi
    AC_SUBST(CFLAGS)

src/common/blib_func.c

@@ -2003,9 +2003,7 @@ void cmd_numN(long funcCode, var_t *r) {
       int pw;
       if (code_peek() == kwTYPE_SEP) {
         par_getcomma();
-        if (!prog_error) {
-          pw = par_getint();
-        }
+        pw = prog_error ? 0 : par_getint();
       } else {
         pw = 0;
       }

src/common/device.c

@@ -111,7 +111,7 @@ void dev_clear_sound_queue() {
 void dev_printf(const char *format, ...) {
   va_list args;
   va_start(args, format);
-  unsigned size = vsnprintf(NULL, 0, format, args);
+  unsigned size = format ? vsnprintf(NULL, 0, format, args) : 0;
   va_end(args);
 
   if (size) {
@@ -133,7 +133,7 @@ void dev_printf(const char *format, ...) {
 void log_printf(const char *format, ...) {
   va_list args;
   va_start(args, format);
-  unsigned size = vsnprintf(NULL, 0, format, args);
+  unsigned size = format ? vsnprintf(NULL, 0, format, args) : 0;
   va_end(args);
 
   if (size) {

src/common/hashmap.c

@@ -150,8 +150,8 @@ int hashmap_destroy(var_p_t var_p) {
 }
 
 int hashmap_get_hash(const char *key, int length) {
-  int hash = 1, i;
-  for (i = 0; i < length && key[i] != '\0'; i++) {
+  uint64_t hash = 1;
+  for (int i = 0; i < length && key[i] != '\0'; i++) {
     hash += to_lower(key[i]);
     hash <<= 3;
     hash ^= (hash >> 3);

src/common/sberr.c

@@ -100,7 +100,7 @@ void sc_raise(const char *format, ...) {
 
     va_list args;
     va_start(args, format);
-    unsigned size = vsnprintf(NULL, 0, format, args);
+    unsigned size = format ? vsnprintf(NULL, 0, format, args) : 0;
     va_end(args);
 
     if (comp_bc_sec) {
@@ -123,7 +123,7 @@ void rt_raise(const char *format, ...) {
 
     va_list args;
     va_start(args, format);
-    unsigned size = vsnprintf(NULL, 0, format, args);
+    unsigned size = format ? vsnprintf(NULL, 0, format, args) : 0;
     va_end(args);
 
     err_title_msg(0, strcmp(format, ERR_PARAM_NUM) == 0);

src/common/scan.c

@@ -4446,7 +4446,7 @@ char *comp_preproc_options(char *p) {
       char lc = *pe;
       *pe = '\0';
       if (strlen(p) < OPT_CMD_SZ) {
-        strcpy(opt_command, p);
+        strlcpy(opt_command, p, sizeof(opt_command));
       } else {
         memcpy(opt_command, p, OPT_CMD_SZ - 1);
         opt_command[OPT_CMD_SZ - 1] = '\0';

src/platform/android/jni/runtime.cpp

@@ -522,7 +522,7 @@ void Runtime::runShell() {
   _app->activity->callbacks->onContentRectChanged = onContentRectChanged;
   loadConfig();
 
-  strcpy(opt_modpath, getString("getModulePath"));
+  strlcpy(opt_modpath, getString("getModulePath"), sizeof(opt_modpath));
 
 #if defined(_ANDROID_LIBRARY)
   runOnce(MAIN_BAS, true);

src/platform/console/main.cpp

@@ -288,7 +288,7 @@ bool process_options(int argc, char *argv[], char **runFile, bool *tmpFile, bool
       break;
     case 'm':
       if (optarg) {
-        strcpy(opt_modpath, optarg);
+        strlcpy(opt_modpath, optarg, sizeof(opt_modpath));
       }
       break;
     case 's':
@@ -301,7 +301,7 @@ bool process_options(int argc, char *argv[], char **runFile, bool *tmpFile, bool
       }
       break;
     case 'o':
-      strcpy(opt_command, optarg);
+      strlcpy(opt_command, optarg, sizeof(opt_command));
       break;
     case 'c':
       if (setup_command_program(optarg, runFile)) {

src/platform/fltk/MainWindow.cxx

@@ -396,7 +396,7 @@ void MainWindow::export_file(Fl_Widget *w, void *eventData) {
 void MainWindow::set_options(Fl_Widget *w, void *eventData) {
   const char *args = fl_input("Enter program command line", opt_command);
   if (args) {
-    strcpy(opt_command, args);
+    strlcpy(opt_command, args, sizeof(opt_command));
   }
 }
 
@@ -768,7 +768,7 @@ int arg_cb(int argc, char **argv, int &i) {
         return 1;
 
       case 'm':
-        strcpy(opt_modpath, argv[i + 1]);
+        strlcpy(opt_modpath, argv[i + 1], sizeof(opt_modpath));
         i += 2;
         return 1;
       }

src/platform/sdl/main.cpp

@@ -52,7 +52,7 @@ int g_debugPort = 4000;
 void appLog(const char *format, ...) {
   va_list args;
   va_start(args, format);
-  unsigned size = vsnprintf(NULL, 0, format, args);
+  unsigned size = format ? vsnprintf(NULL, 0, format, args) : 0;
   va_end(args);
 
   if (size) {
@@ -68,7 +68,7 @@ void appLog(const char *format, ...) {
       buf[i--] = '\0';
     }
     strcat(buf, "\r\n");
-    
+
 #if defined(WIN32)
     OutputDebugString(buf);
 #else
@@ -274,7 +274,7 @@ int main(int argc, char* argv[]) {
                   || (strstr(s, "://") != NULL))) {
             runFile = strdup(s);
           } else if (chdir(s) != 0) {
-            strcpy(opt_command, s);
+            strlcpy(opt_command, s, sizeof(opt_command));
           }
         }
       }
@@ -297,7 +297,7 @@ int main(int argc, char* argv[]) {
       opt_quiet = false;
       break;
     case 'c':
-      strcpy(opt_command, optarg);
+      strlcpy(opt_command, optarg, sizeof(opt_command));
       break;
     case 'f':
       fontFamily = strdup(optarg);
@@ -323,7 +323,7 @@ int main(int argc, char* argv[]) {
       break;
     case 'm':
       if (optarg) {
-        strcpy(opt_modpath, optarg);
+        strlcpy(opt_modpath, optarg, sizeof(opt_modpath));
       }
       break;
     case 'd':