Changeset 2339 in MondoRescue for branches

Timestamp:

Aug 21, 2009, 1:50:43 AM (16 years ago)

Author:

Bruno Cornec

Message:

Finish the previous commit concerning the change of interface of eval_call_to_make_ISO

Location:

branches/2.2.10/mondo/src/common

Files:

• libmondo-fork-EXT.h (modified) (1 diff)
• libmondo-fork.c (modified) (5 diffs)
• libmondo-fork.h (modified) (1 diff)

branches/2.2.10/mondo/src/common/libmondo-fork-EXT.h

@@ -7 +7 @@
 extern int eval_call_to_make_USB(char *call,
                                  char *what_i_am_doing);
-extern int eval_call_to_make_ISO(char *basic_call, char *isofile,
-                                 int cd_no, char *logstub,
-                                 char *what_i_am_doing);
+extern int eval_call_to_make_ISO(char *basic_call, char *isofile, int cd_no, char *what_i_am_doing);
 extern int run_external_binary_with_percentage_indicator_NEW(char *tt,
                                                              char *cmd);

branches/2.2.10/mondo/src/common/libmondo-fork.c

@@ -86 +86 @@
  * @param isofile Replaces @c _ISO_ in @p basic_call. Should probably be the ISO image to create (-o parameter to mkisofs).
  * @param cd_no Replaces @c _CD#_ in @p basic_call. Should probably be the CD number.
- * @param logstub Unused.
  * @param what_i_am_doing The action taking place (e.g. "Making ISO #1"). Used as the title of the progress dialog.
  * @return Exit code of @c mkisofs (0 is success, anything else indicates failure).
- * @bug @p logstub is unused.
  */
 int
-eval_call_to_make_ISO(char *basic_call, char *isofile,
-                      int cd_no, char *logstub, char *what_i_am_doing)
-{
+eval_call_to_make_ISO(char *basic_call, char *isofile, int cd_no, char *what_i_am_doing) {
 
     /*@ int's  *** */
@@ -117 +113 @@
     assert(bkpinfo != NULL);
     assert_string_is_neither_NULL_nor_zerolength(isofile);
-    assert_string_is_neither_NULL_nor_zerolength(logstub);
     malloc_string(incoming);
     malloc_string(old_stderr);
@@ -222 +217 @@
     log_msg(1, "command = '%s'", command);
     if (!g_text_mode) {
-        retval = run_external_binary_with_percentage_indicator_NEW
-            (what_i_am_doing, command);
+        retval = run_external_binary_with_percentage_indicator_NEW(what_i_am_doing, command);
     } else {
         retval += system(command);
@@ -630 +624 @@
 
 
-int run_external_binary_with_percentage_indicator_NEW(char *tt, char *cmd)
-{
+int run_external_binary_with_percentage_indicator_NEW(char *tt, char *cmd) {
 
     /*@ int *************************************************************** */
@@ -667 +660 @@
     for (sleep(1); command[0] != '\0'; sleep(1)) {
         pcno = grab_percentage_from_last_line_of_file(MONDO_LOGFILE);
-        if (pcno <= 0 || pcno > 100) {
-            log_msg(8, "Weird pc#");
+        if (pcno < 0 || pcno > 100) {
+            log_msg(8, "Weird pc# %d", pcno);
             continue;
         }

branches/2.2.10/mondo/src/common/libmondo-fork.h

@@ -9 +9 @@
 int run_program_and_log_output(char *program, int);
 int eval_call_to_make_USB(char *call, char *what_i_am_doing);
-int eval_call_to_make_ISO(char *basic_call, char *isofile,
-                          int cd_no, char *logstub, char *what_i_am_doing);
-
+int eval_call_to_make_ISO(char *basic_call, char *isofile, int cd_no, char *what_i_am_doing);
 int run_external_binary_with_percentage_indicator_NEW(char *tt, char *cmd);
 int copy_from_src_to_dest(FILE *, FILE *, char);