Fix scanf conversion arguments from signed to unsigned where appropri…

…ate.
LinuxCNC · Feb 4, 2025 · 17fae0a · 17fae0a
1 parent 9afa49c
commit 17fae0a
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/src/emc/task/emcsvr.cc b/src/emc/task/emcsvr.cc
@@ -83,14 +83,14 @@ static int iniLoad(const char *filename)
 
     // set flags if RCS_DEBUG in ini file
     if ((inistring = inifile.Find("RCS_DEBUG", "EMC"))) {
-        static long int flags;
+        long unsigned int flags;
         if (sscanf(*inistring, "%lx", &flags) < 1) {
             perror("failed to parse [EMC] RCS_DEBUG");
         }
         // clear all flags
         clear_rcs_print_flag(PRINT_EVERYTHING);
         // set parsed flags
-        set_rcs_print_flag(flags);
+        set_rcs_print_flag((long)flags);
     }
     // output infinite RCS errors by default
     max_rcs_errors_to_print = -1;

diff --git a/src/emc/task/emctaskmain.cc b/src/emc/task/emctaskmain.cc
@@ -710,7 +710,7 @@ void readahead_waiting(void)
 	    int was_open = taskplanopen;
 	    if (was_open) {
 		emcTaskPlanClose();
-		if (emc_debug & EMC_DEBUG_INTERP && was_open) {
+		if ((emc_debug & EMC_DEBUG_INTERP) && was_open) {
 		    rcs_print
 			("emcTaskPlanClose() called at %s:%d\n",
 			 __FILE__, __LINE__);
@@ -3146,14 +3146,14 @@ static int iniLoad(const char *filename)
 
     // set flags if RCS_DEBUG in ini file
     if ((inistring = inifile.Find("RCS_DEBUG", "EMC"))) {
-        static long int flags;
+        long unsigned int flags;
         if (sscanf(*inistring, "%lx", &flags) < 1) {
             perror("failed to parse [EMC] RCS_DEBUG");
         }
         // clear all flags
         clear_rcs_print_flag(PRINT_EVERYTHING);
         // set parsed flags
-        set_rcs_print_flag(flags);
+        set_rcs_print_flag((long)flags);
     }
     // output infinite RCS errors by default
     max_rcs_errors_to_print = -1;

diff --git a/src/emc/usr_intf/halui.cc b/src/emc/usr_intf/halui.cc
@@ -1430,14 +1430,14 @@ static int iniLoad(const char *filename)
 
     // set flags if RCS_DEBUG in ini file
     if ((inistring = inifile.Find("RCS_DEBUG", "EMC"))) {
-        static long int flags;
+        long unsigned int flags;
         if (sscanf(*inistring, "%lx", &flags) < 1) {
             perror("failed to parse [EMC] RCS_DEBUG");
         }
         // clear all flags
         clear_rcs_print_flag(PRINT_EVERYTHING);
         // set parsed flags
-        set_rcs_print_flag(flags);
+        set_rcs_print_flag((long)flags);
     }
     // output infinite RCS errors by default
     max_rcs_errors_to_print = -1;

diff --git a/src/emc/usr_intf/shcom.cc b/src/emc/usr_intf/shcom.cc
@@ -1302,14 +1302,14 @@ int iniLoad(const char *filename)
 
     // set flags if RCS_DEBUG in ini file
     if ((inistring = inifile.Find("RCS_DEBUG", "EMC"))) {
-        static long int flags;
+        long unsigned int flags;
         if (sscanf(*inistring, "%lx", &flags) < 1) {
             perror("failed to parse [EMC] RCS_DEBUG");
         }
         // clear all flags
         clear_rcs_print_flag(PRINT_EVERYTHING);
         // set parsed flags
-        set_rcs_print_flag(flags);
+        set_rcs_print_flag((long)flags);
     }
     // output infinite RCS errors by default
     max_rcs_errors_to_print = -1;

diff --git a/src/hal/classicladder/config_gtk.c b/src/hal/classicladder/config_gtk.c
@@ -467,7 +467,7 @@ void GetIOSettings( char ForInputs )
 					case 2:
 						text = (char *)gtk_entry_get_text((GtkEntry *)*IOParamEntry);
 						if ( DeviceTypeValue==DEVICE_TYPE_DIRECT_ACCESS )
-							sscanf( text, "%X", &pConf->SubDevOrAdr );
+							sscanf( text, "%X", (unsigned *)&pConf->SubDevOrAdr );
 						else
 							pConf->SubDevOrAdr = atoi( text );
 						break;

diff --git a/src/hal/utils/upci.c b/src/hal/utils/upci.c
@@ -202,7 +202,7 @@ int upci_scan_bus(void)
 	devices[num_devs++] = dev;
 	n = sscanf(lineptr,
 	    "%hx %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x",
-	    &busdevfunc, &vendordev, &(dev->p.irq),
+	    &busdevfunc, &vendordev, (unsigned *)&(dev->p.irq),
 	    &dev->p.base_addr[0],  &dev->p.base_addr[1], &dev->p.base_addr[2],
 	    &dev->p.base_addr[3],  &dev->p.base_addr[4], &dev->p.base_addr[5],
 	    &dev->p.rom_base_addr,

diff --git a/src/rtapi/uspace_rtapi_parport.cc b/src/rtapi/uspace_rtapi_parport.cc
@@ -50,7 +50,7 @@ static void map_parports() {
         }
         struct portinfo pi;
         pi.port_id = i;
-        if(fscanf(f, "%hd %hd", &pi.base, &pi.base_hi) != 2) {
+        if(fscanf(f, "%hu %hu", &pi.base, &pi.base_hi) != 2) {
             rtapi_print_msg(RTAPI_MSG_ERR, "Failed to parse base-addr for port #%d\n", i);
             fclose(f);
             continue;