Changeset 1193 in MondoRescue for branches/stable/mondo/src/common/newt-specific.c

Timestamp:

Feb 20, 2007, 12:24:22 PM (17 years ago)

Author:

Bruno Cornec

Message:

Remove some useless \r in code
Remove center_string usage as it's now broiken for dynamically created strings

File:

• branches/stable/mondo/src/common/newt-specific.c (modified) (10 diffs)

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

@@ -129 +129 @@
             sync();
             printf
-                ("---promptdialogYN---1--- %s\r\n---promptdialogYN---Q--- [yes] [no] ---\r\n--> ",
+                ("---promptdialogYN---1--- %s\n---promptdialogYN---Q--- [yes] [no] ---\n--> ",
                  prompt);
             mr_getline(&tmp, &n, stdin);
@@ -173 +173 @@
         sync();
         printf
-            ("---promptdialogOKC---1--- %s\r\n---promptdialogOKC---Q--- [OK] [Cancel] ---\r\n--> ",
+            ("---promptdialogOKC---1--- %s\n---promptdialogOKC---Q--- [OK] [Cancel] ---\n--> ",
              prompt);
         mr_getline(&tmp, &n, stdin);
@@ -558 +558 @@
     } else {
         mr_asprintf(&tmp, title);
+        /* BERLIOS: Doesn't work on allocated chains anymore
         center_string(tmp, 80);
+        */
         newtPushHelpLine(tmp);
         mr_free(tmp);
     }
+    /* BERLIOS: Doesn't work on allocated chains anymore
     center_string(g_isoform_header_str, 36);
+    */
     g_isoform_starttime = get_time();
     if (g_text_mode) {
@@ -614 +618 @@
     mr_asprintf(&blurb3, b3);
     mr_asprintf(&b1c, b1);
+    /* BERLIOS: Doesn't work for allocated chains anymore
     center_string(b1c, 80);
+    */
     if (max_val <= 0) {
         max_val = 1;
@@ -665 +671 @@
     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));
@@ -707 +713 @@
     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);
@@ -732 +738 @@
     myForm = newtForm(NULL, NULL, 0);
     newtFormAddComponents(myForm, text, type_here, b_1, b_2, NULL);
+    /* BERLIOS: Doesn't work on allocated chains anymore
     center_string(blurb, 80);
+    */
     newtPushHelpLine(blurb);
     mr_free(blurb);
@@ -814 +822 @@
     myForm = newtForm(NULL, NULL, 0);
     newtFormAddComponents(myForm, text, b_1, b_2, NULL);
+    /* BERLIOS: Doesn't work on allocated chains anymore
     center_string(prompt, 80);
+    */
     newtPushHelpLine(prompt);
     mr_free(prompt);
@@ -968 +978 @@
                 mr_strcat(taskprogress, tmp1);
                 mr_free(tmp1);
-                printf("---evalcall---1--- %s\r\n",
-                       g_isoform_header_str);
-                printf("---evalcall---2--- %s\r\n", taskprogress);
-                printf("---evalcall---E---\r\n");
+                printf("---evalcall------ %s\n", taskprogress);
                 mr_free(taskprogress);
             }
@@ -1095 +1102 @@
         mr_free(taskprogress);
     } else {
+        /* BERLIOS: Doesn't work on allocated chains anymore
         center_string(blurb1, 54);
+        */
+        /* BERLIOS: Doesn't work on allocated chains anymore
         center_string(blurb2, 54);
+        */
+        /* BERLIOS: Doesn't work on allocated chains anymore
         center_string(blurb3, 54);
+        */
         newtLabelSetText(g_blurb1, blurb1);
         newtLabelSetText(g_blurb2, blurb3);