Changeset 3893 in MondoRescue

Timestamp:

Mar 13, 2024, 4:49:30 PM (6 weeks ago)

Author:

Bruno Cornec

Message:

Remove more warnings - switch and size_t/int comparisons

Location:

branches/3.3/mondo/src

Files:

• common/libmondo-archive.c (modified) (4 diffs)
• common/libmondo-cli.c (modified) (1 diff)
• common/libmondo-devices.c (modified) (6 diffs)
• common/libmondo-filelist.c (modified) (1 diff)
• common/libmondo-raid.c (modified) (2 diffs)
• common/libmondo-string.c (modified) (1 diff)
• include/mr_str.h (modified) (1 diff)
• lib/mr_str.c (modified) (3 diffs)
• mondorestore/mondo-prep.c (modified) (1 diff)
• mondorestore/mondo-rstr-newt.c (modified) (2 diffs)
• mondorestore/mondo-rstr-tools.c (modified) (1 diff)
• mondorestore/mondorestore.c (modified) (2 diffs)

branches/3.3/mondo/src/common/libmondo-archive.c

@@ -1800 +1800 @@
                 default:
                     log_msg(2, "feed_into_ntfsprog() called in background --- pid=%ld", (long int) (pid));
+                    break;
                 }
             }
@@ -1980 +1981 @@
 
     p_last_set_archived = (int *) inbuf;
-    p_archival_threads_running = (int *) (inbuf + 4);
-    p_next_set_to_archive = (int *) (inbuf + 8);
-    p_list_of_fileset_flags = (char *) (inbuf + 12);
+    p_archival_threads_running = (int *) (inbuf) + 4;
+    p_next_set_to_archive = (int *) (inbuf) + 8;
+    p_list_of_fileset_flags = (char *) (inbuf) + 12;
 
     mr_asprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, 0L);
@@ -2140 +2141 @@
     memset((void *) transfer_block, 0, sizeof(struct s_bkpinfo) + BKPINFO_LOC_OFFSET + 64);
     p_last_set_archived = (int *) transfer_block;
-    p_archival_threads_running = (int *) (transfer_block + 4);
-    p_next_set_to_archive = (int *) (transfer_block + 8);
-    p_list_of_fileset_flags = (char *) (transfer_block + 12);
+    p_archival_threads_running = (int *) (transfer_block) + 4;
+    p_next_set_to_archive = (int *) (transfer_block) + 8;
+    p_list_of_fileset_flags = (char *) (transfer_block) + 12;
     memcpy((void *) (transfer_block + BKPINFO_LOC_OFFSET), (void *) bkpinfo, sizeof(struct s_bkpinfo));
     pvp = &vp;
@@ -2778 +2779 @@
         mr_asprintf(value, "usb");
         break;
+    case none:
     default:
         fatal_error("Unknown backup_media_type");
+        break;
     }
 

branches/3.3/mondo/src/common/libmondo-cli.c

@@ -969 +969 @@
         mr_asprintf(tmp, "(Unknown)");
         mr_asprintf(tmp2, "(Unknown)");
+        break;
     }
 

branches/3.3/mondo/src/common/libmondo-devices.c

@@ -128 +128 @@
     int i = 0;
     int mount_cnt = 0;
-    int lastpos = 0;
+    size_t lastpos = 0;
     char *mounted_file_system = NULL;
     char *command = NULL;
@@ -249 +249 @@
     int i = 0;
     int c = 0;
-    int lastpos = 0;
+    size_t lastpos = 0;
     char *VG = NULL;
     char *tmp = NULL;
@@ -729 +729 @@
     default:
         mr_asprintf(output, "%s", "default");
+        break;
     }
     return (output);
@@ -1660 +1661 @@
 
 char *token = NULL;
-int lastpos = 0;
+size_t lastpos = 0;
 char *mounted_on_dsf = NULL;
 char *not_mounted_on_dsf = NULL;
@@ -1746 +1747 @@
         mr_free(tmp);
         mr_free(tmp2);
+        break;
+    default: 
+        fatal_error("Error processing -I or -E option");
         break;
     }
@@ -2413 +2417 @@
         break;
     default:
-        fatal_error("I, Mojo Jojo, shall defeat those pesky Powerpuff Girls!");
+    case none:
+        fatal_error("Unknown backup_media_type");
+        break;
     }
 

branches/3.3/mondo/src/common/libmondo-filelist.c

@@ -1320 +1320 @@
     char *find_skeleton_marker = NULL;
     int i;
-    int lastpos = 0;
+    size_t lastpos = 0;
     static int depth = 0;
     char *p;

branches/3.3/mondo/src/common/libmondo-raid.c

@@ -359 +359 @@
             mr_asprintf(org, "raid5");
             break;
+        default:
+            mr_asprintf(org, "Unknown RAID level %d", raidrec->plex[i].raidlevel);
+            fatal_error(org);
+            break;
         }
         fprintf(fout, "  plex org %s", org);
@@ -939 +943 @@
 int res = 0, row, i, index_min;
 int v = 0;
-int lastpos = 0;
+size_t lastpos = 0;
 size_t len = 0;
 char *token = NULL;

branches/3.3/mondo/src/common/libmondo-string.c

@@ -997 +997 @@
         mr_asprintf(type_of_backup, "USB");
         break;
+    case none:
     default:
-        mr_asprintf(type_of_backup, "ISO");
+        fatal_error("Unknown backup_media_type");
+        break;
     }
     return (type_of_backup);

branches/3.3/mondo/src/include/mr_str.h

@@ -15 +15 @@
 /* functions (public methods) */
 
-extern char *mr_strtok(char *instr, const char *delims, int *lastpos);
+extern char *mr_strtok(char *instr, const char *delims, size_t *lastpos);
 extern char *mr_stresc(char *instr, char *toesc, const char escchr, const char specialchr);
 extern char *mr_date(void);

branches/3.3/mondo/src/lib/mr_str.c

@@ -26 +26 @@
  * @note this function allocates memory that needs to be freed by caller
  **/
-char *mr_strtok(char *instr, const char *delims, int *lastpos) {
+char *mr_strtok(char *instr, const char *delims, size_t *lastpos) {
 
 char *token = NULL;
@@ -57 +57 @@
 *lastpos = *lastpos + pos1 + pos2 + 1;
 
-return token;
+return(token);
 }
 
@@ -205 +205 @@
 char *output = NULL;
 char *tmp = NULL;
-int i = 0;
+size_t i = 0;
 
 mr_asprintf(output, "%s", in);

branches/3.3/mondo/src/mondorestore/mondo-prep.c

@@ -604 +604 @@
         break;
      default:
-        fatal_error("Unknown RAID parity algorithm.");
+        mr_free(program);
+        mr_asprintf(program, "Unknown RAID parity algorithm %d", raidlist->el[i].parity);
+        fatal_error(program);
         break;
     }

branches/3.3/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -824 +824 @@
             break;
         default:
-            mr_asprintf(tmp, "unknown (%i)", raidrec->raidlevel);
+            mr_asprintf(tmp, "unknown (%d)", raidrec->raidlevel);
             break;
         }
@@ -1227 +1227 @@
                                 (mountlist, raidlist->disks.el[l].device);
                         }
+                        break;
+                    default:
+                        log_msg("Unknown raidlevel %d",raidrec->plex[j].raidlevel);
                         break;
                     }

branches/3.3/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -1438 +1438 @@
             update_evalcall_form(0);
         }
+        break;
     }
     close_evalcall_form();

branches/3.3/mondo/src/mondorestore/mondorestore.c

@@ -385 +385 @@
         default:
             log_msg(3, "feed_into_ntfsprog() called in background --- pid=%ld", (long int) (pid));
+            break;
         }
         mr_free(ntfsprog_fifo);
@@ -1148 +1149 @@
         default:
             log_msg(3, "feed_into_ntfsprog() called in background --- pid=%ld", (long int) (pid));
+            break;
         }
         mr_free(ntfsprog_fifo);