Changeset 1129 in MondoRescue

Timestamp:

Feb 10, 2007, 11:42:54 AM (18 years ago)

Author:

Bruno Cornec

Message:

Always typo

Location:

branches/stable

Files:

• mondo/src/common/libmondo-devices.c (modified) (5 diffs)
• tools/quality (modified) (1 diff)

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

@@ -1521 +1521 @@
             }
             if ((bkpinfo->backup_media_type != dvd) && (bkpinfo->backup_media_type != usb)) {
-                if (!popup_and_get_string(_("Speed"), comment, tmp)) {
+                if (!popup_and_get_string(_("Speed"), comment, tmp, 4)) {
                     log_to_screen(_("User has chosen not to backup the PC"));
                     finish(1);
@@ -1535 +1535 @@
                     bkpinfo->backup_media_string);
 
-            if (!popup_and_get_string("Size", comment, sz_size)) {
+            if (!popup_and_get_string("Size", comment, sz_size, 5)) {
                 log_to_screen(_("User has chosen not to backup the PC"));
                 finish(1);
@@ -1571 +1571 @@
                         bkpinfo->backup_media_string);
                 if (!popup_and_get_string
-                    (_("Device?"), comment, bkpinfo->media_device)) {
+                    (_("Device?"), comment, bkpinfo->media_device, MAX_STR_LEN / 4)) {
                     log_to_screen(_("User has chosen not to backup the PC"));
                     finish(1);
@@ -2518 +2518 @@
 {
     static char output[4];
-    char *tmp;
-    char *command;
-    char *fdisk;
+    char *tmp = NULL;
+    char *command = NULL;
+    char *fdisk = NULL;
 #ifdef __IA64__
     struct stat buf;
 #endif
     malloc_string(tmp);
-    malloc_string(command);
-    malloc_string(fdisk);
     mr_msg(0, "Looking for partition table format type");
-    sprintf(fdisk, "/sbin/parted2fdisk");
+    mr_asprintf(&fdisk, "/sbin/parted2fdisk");
     mr_msg(1, "Using %s", fdisk);
-    sprintf(command, "%s -l %s | grep 'EFI GPT'", fdisk, drive);
+    mr_asprintf(&command, "%s -l %s | grep 'EFI GPT'", fdisk, drive);
+    mr_free(fdisk);
+
     strcpy(tmp, call_program_and_get_last_line_of_output(command));
+    mr_free(command);
+
     if (strstr(tmp, "GPT") == NULL) {
         strcpy(output, "MBR");
@@ -2538 +2540 @@
     }
     mr_msg(0, "Found %s partition table format type", output);
-    mr_free(command);
     mr_free(tmp);
-    mr_free(fdisk);
-    return (output);
+    return(output);
 }
 

branches/stable/tools/quality

@@ -49 +49 @@
 echo " "
 echo "Splint: "
-find . -name '*.c' -o -name '*.h' | xargs splint +posixlib -Dlinux
+find . -name '*.c' -o -name '*.h' | xargs splint +posixlib -Dlinux -I$TOOLHOME/../mondo/src/include
 
 rm -f /tmp/mondo.quality