Changeset 1899 in MondoRescue

Timestamp:

Apr 3, 2008, 12:08:14 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Removes the useless uid field of the mountlist_line struct
• Removes some \r found useless
• Adds conditions of existence around button updates with Newt (valgrind feedback)

Location:

branches/2.2.6/mondo/src/common

Files:

• libmondo-mountlist.c (modified) (4 diffs)
• libmondo-stream.c (modified) (1 diff)
• mondostructures.h (modified) (1 diff)
• newt-specific.c (modified) (8 diffs)

branches/2.2.6/mondo/src/common/libmondo-mountlist.c

@@ -956 +956 @@
                mountlist->el[items].mountpoint,
                mountlist->el[items].format,
-               siz, mountlist->el[items].label, mountlist->el[items].uuid);
+               siz, mountlist->el[items].label);
 #elif __FreeBSD__
         sscanf(incoming,
@@ -964 +964 @@
                mountlist->el[items].format, siz);
         strcpy(mountlist->el[items].label, "");
-        strcpy(mountlist->el[items].uuid, "");
 #endif
 
@@ -1018 +1017 @@
                     mountlist->el[items].format,
                     mountlist->el[items].size,
-                    mountlist->el[items].label,
-                    mountlist->el[items].uuid);
+                    mountlist->el[items].label);
 
             log_it(tmp);
@@ -1065 +1063 @@
                 mountlist->el[i].device, mountlist->el[i].mountpoint,
                 mountlist->el[i].format, mountlist->el[i].size,
-                mountlist->el[i].label, mountlist->el[i].uuid);
+                mountlist->el[i].label);
     }
     paranoid_fclose(fout);

branches/2.2.6/mondo/src/common/libmondo-stream.c

@@ -963 +963 @@
 
     /*@ long    ***************************************************** */
-    long bytes_to_write = 0 /*,i */ ;
+    long bytes_to_write = 0L /*,i */ ;
 //  long bytes_successfully_read_in_this_time = 0;
 

branches/2.2.6/mondo/src/common/mondostructures.h

@@ -59 +59 @@
 
   /**
-   * For ext2 and ext3, this is the filesystem label (if there is one). If not, this should be "".
+   * For ext2 and ext3, this is the filesystem label or uuid (if there is one). If not, this should be "".
    */
     char label[256];
 
-    /**
-     * This is the filesystem UUID (if there is one). If not, this should be "".
-     */
-    char uuid[64];
 };
 

branches/2.2.6/mondo/src/common/newt-specific.c

@@ -221 +221 @@
                 system("sync");
                 printf
-                    ("---promptdialogYN---1--- %s\r\n---promptdialogYN---Q--- [yes] [no] ---\r\n--> ",
+                    ("---promptdialogYN---1--- %s\n---promptdialogYN---Q--- [yes] [no] ---\n--> ",
                      prompt);
                 (void) fgets(tmp, MAX_NEWT_COMMENT_LEN, stdin);
@@ -267 +267 @@
             system("sync");
             printf
-                ("---promptdialogOKC---1--- %s\r\n---promptdialogOKC---Q--- [OK] [Cancel] ---\r\n--> ",
+                ("---promptdialogOKC---1--- %s\n---promptdialogOKC---Q--- [OK] [Cancel] ---\n--> ",
                  prompt);
             (void) fgets(tmp, MAX_NEWT_COMMENT_LEN, stdin);
@@ -791 +791 @@
         if (g_text_mode) {
             printf
-                ("---promptpopup---1--- %s\r\n---promptpopup---Q--- [OK] ---\r\n--> ",
+                ("---promptpopup---1--- %s\n---promptpopup---Q--- [OK] ---\n--> ",
                  prompt);
             while (((ch = getchar()) != '\n') && (ch != EOF));
@@ -833 +833 @@
         if (g_text_mode) {
             printf
-                ("---promptstring---1--- %s\r\n---promptstring---2--- %s\r\n---promptstring---Q---\r\n-->  ",
+                ("---promptstring---1--- %s\n---promptstring---2--- %s\n---promptstring---Q---\n-->  ",
                  title, b);
             (void) fgets(output, maxsize, stdin);
@@ -1081 +1081 @@
         }
         if (!g_text_mode) {
-            newtLabelSetText(g_isoform_header, g_isoform_header_str);
+            if (g_isoform_header) {
+                newtLabelSetText(g_isoform_header, g_isoform_header_str);
+            }
         }
         g_mysterious_dot_counter = (g_mysterious_dot_counter + 1) % 27;
@@ -1117 +1119 @@
                             "] %3d%% done; %2ld:%02ld to go", percentage,
                             time_remaining / 60, time_remaining % 60);
-                    printf("---evalcall---1--- %s\r\n",
+                    printf("---evalcall---1--- %s\n",
                            g_isoform_header_str);
-                    printf("---evalcall---2--- %s\r\n", taskprogress);
-                    printf("---evalcall---E---\r\n");
+                    printf("---evalcall---2--- %s\n", taskprogress);
+                    printf("---evalcall---E---\n");
                 }
             } else {
                 newtScaleSet(g_isoform_scale,
                              (unsigned long long) percentage);
-                newtLabelSetText(g_isoform_pcline, pcline_str);
-                if (percentage >= 3) {
+                if (g_isoform_pcline) {
+                    newtLabelSetText(g_isoform_pcline, pcline_str);
+                }
+                if ((percentage >= 3) && (g_isoform_timeline)) {
                     newtLabelSetText(g_isoform_timeline, timeline_str);
                 }
@@ -1248 +1252 @@
 
         if (g_text_mode) {
-            printf("---progress-form---1--- %s\r\n", blurb1);
-            printf("---progress-form---2--- %s\r\n", blurb2);
-            printf("---progress-form---3--- %s\r\n", blurb3);
+            printf("---progress-form---1--- %s\n", blurb1);
+            printf("---progress-form---2--- %s\n", blurb2);
+            printf("---progress-form---3--- %s\n", blurb3);
             printf("---progress-form---E---\n");
             sprintf(taskprogress, "TASK:  [");
@@ -1267 +1271 @@
                     " done; %2ld:%02ld to go",
                     time_remaining / 60, time_remaining % 60);
-            printf("---progress-form---4--- %s\r\n", taskprogress);
+            printf("---progress-form---4--- %s\n", taskprogress);
         } else {
             center_string(blurb1, 54);
             center_string(blurb2, 54);
             center_string(blurb3, 54);
-            newtLabelSetText(g_blurb1, blurb1);
-            newtLabelSetText(g_blurb2, blurb3);
-            newtLabelSetText(g_blurb3, blurb2);
+            if (g_blurb1) {
+                newtLabelSetText(g_blurb1, blurb1);
+            }
+            if (g_blurb2) {
+                newtLabelSetText(g_blurb2, blurb3);
+            }
+            if (g_blurb3) {
+                newtLabelSetText(g_blurb3, blurb2);
+            }
             newtScaleSet(g_scale, (unsigned long long) g_current_progress);
-            if (percentage >= 2) {
+            if ((percentage >= 2) && (g_timeline)) {
                 newtLabelSetText(g_timeline, timeline_str);
             }
-            newtLabelSetText(g_percentline, percentline_str);
+            if (g_percentline) {
+                newtLabelSetText(g_percentline, percentline_str);
+            }
             newtRefresh();
         }