Changeset 2339


Ignore:
Timestamp:
Aug 21, 2009, 1:50:43 AM (10 years ago)
Author:
bruno
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:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.10/mondo/src/common/libmondo-fork-EXT.h

    r1999 r2339  
    77extern int eval_call_to_make_USB(char *call,
    88                                 char *what_i_am_doing);
    9 extern int eval_call_to_make_ISO(char *basic_call, char *isofile,
    10                                  int cd_no, char *logstub,
    11                                  char *what_i_am_doing);
     9extern int eval_call_to_make_ISO(char *basic_call, char *isofile, int cd_no, char *what_i_am_doing);
    1210extern int run_external_binary_with_percentage_indicator_NEW(char *tt,
    1311                                                             char *cmd);
  • branches/2.2.10/mondo/src/common/libmondo-fork.c

    r2331 r2339  
    8686 * @param isofile Replaces @c _ISO_ in @p basic_call. Should probably be the ISO image to create (-o parameter to mkisofs).
    8787 * @param cd_no Replaces @c _CD#_ in @p basic_call. Should probably be the CD number.
    88  * @param logstub Unused.
    8988 * @param what_i_am_doing The action taking place (e.g. "Making ISO #1"). Used as the title of the progress dialog.
    9089 * @return Exit code of @c mkisofs (0 is success, anything else indicates failure).
    91  * @bug @p logstub is unused.
    9290 */
    9391int
    94 eval_call_to_make_ISO(char *basic_call, char *isofile,
    95                       int cd_no, char *logstub, char *what_i_am_doing)
    96 {
     92eval_call_to_make_ISO(char *basic_call, char *isofile, int cd_no, char *what_i_am_doing) {
    9793
    9894    /*@ int's  *** */
     
    117113    assert(bkpinfo != NULL);
    118114    assert_string_is_neither_NULL_nor_zerolength(isofile);
    119     assert_string_is_neither_NULL_nor_zerolength(logstub);
    120115    malloc_string(incoming);
    121116    malloc_string(old_stderr);
     
    222217    log_msg(1, "command = '%s'", command);
    223218    if (!g_text_mode) {
    224         retval = run_external_binary_with_percentage_indicator_NEW
    225             (what_i_am_doing, command);
     219        retval = run_external_binary_with_percentage_indicator_NEW(what_i_am_doing, command);
    226220    } else {
    227221        retval += system(command);
     
    630624
    631625
    632 int run_external_binary_with_percentage_indicator_NEW(char *tt, char *cmd)
    633 {
     626int run_external_binary_with_percentage_indicator_NEW(char *tt, char *cmd) {
    634627
    635628    /*@ int *************************************************************** */
     
    667660    for (sleep(1); command[0] != '\0'; sleep(1)) {
    668661        pcno = grab_percentage_from_last_line_of_file(MONDO_LOGFILE);
    669         if (pcno <= 0 || pcno > 100) {
    670             log_msg(8, "Weird pc#");
     662        if (pcno < 0 || pcno > 100) {
     663            log_msg(8, "Weird pc# %d", pcno);
    671664            continue;
    672665        }
  • branches/2.2.10/mondo/src/common/libmondo-fork.h

    r1999 r2339  
    99int run_program_and_log_output(char *program, int);
    1010int eval_call_to_make_USB(char *call, char *what_i_am_doing);
    11 int eval_call_to_make_ISO(char *basic_call, char *isofile,
    12                           int cd_no, char *logstub, char *what_i_am_doing);
    13 
     11int eval_call_to_make_ISO(char *basic_call, char *isofile, int cd_no, char *what_i_am_doing);
    1412int run_external_binary_with_percentage_indicator_NEW(char *tt, char *cmd);
    1513int copy_from_src_to_dest(FILE *, FILE *, char);
Note: See TracChangeset for help on using the changeset viewer.