Changeset 3849 in MondoRescue for branches/3.3/mondo/src/common


Ignore:
Timestamp:
Mar 6, 2024, 2:52:16 AM (4 months ago)
Author:
Bruno Cornec
Message:

Remove a useless param from eval_call_to_make_ISO

Location:
branches/3.3/mondo/src/common
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/3.3/mondo/src/common/libmondo-archive.c

    r3827 r3849  
    15931593    if (bkpinfo->call_before_iso != NULL) {
    15941594        mr_asprintf(message_to_screen, "Running pre-ISO call for CD#%d", g_current_media_number);
    1595         res = eval_call_to_make_ISO(bkpinfo->call_before_iso, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
     1595        res = eval_call_to_make_ISO(bkpinfo->call_before_iso, destfile, g_current_media_number, message_to_screen);
    15961596        if (res) {
    15971597            mr_strcat(message_to_screen, "...failed");
    … …  
    16171617        } else {
    16181618            res =
    1619                 eval_call_to_make_ISO(bkpinfo->call_make_iso, bkpinfo->scratchdir, g_current_media_number, MONDO_LOGFILE, message_to_screen);
     1619                eval_call_to_make_ISO(bkpinfo->call_make_iso, bkpinfo->scratchdir, g_current_media_number, message_to_screen);
    16201620            if (res) {
    16211621                log_to_screen("%s...failed to write", message_to_screen);
    … …  
    16751675                }
    16761676                pause_for_N_seconds(5, "Letting DVD drive settle");
    1677                 res = eval_call_to_make_ISO(bkpinfo->call_make_iso, bkpinfo->scratchdir, g_current_media_number, MONDO_LOGFILE, message_to_screen);
     1677                res = eval_call_to_make_ISO(bkpinfo->call_make_iso, bkpinfo->scratchdir, g_current_media_number, message_to_screen);
    16781678                retval += res;
    16791679                if (!bkpinfo->please_dont_eject) {
    … …  
    17111711            log_msg(1, "Making nonbootable backup");
    17121712            mr_asprintf(full_isofs_cmd, "%s%s-o '_ISO_' .",isofs_cmd,MONDO_MKISOFS);
    1713             res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
     1713            res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, message_to_screen);
    17141714            mr_free(full_isofs_cmd);
    17151715        } else {
    … …  
    17271727                log_msg(1, "IA64 --> elilo");
    17281728                mr_asprintf(full_isofs_cmd, "%s%s-o '_ISO_' .",isofs_cmd,MONDO_MKISOFS_REGULAR_ELILO);
    1729                 res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
     1729                res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, message_to_screen);
    17301730                mr_free(full_isofs_cmd);
    17311731#else
    … …  
    17331733                mr_asprintf(full_isofs_cmd, "%s%s-b images/mindi-bootroot.img -c images/boot.cat -o '_ISO_' .",isofs_cmd,MONDO_MKISOFS);
    17341734                // FIXME: fixed boot size probably wrong. lilo to be removed
    1735                 res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
     1735                res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, message_to_screen);
    17361736                mr_free(full_isofs_cmd);
    17371737#endif
    … …  
    17521752                mr_free(uefistr);
    17531753
    1754                 res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
     1754                res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, message_to_screen);
    17551755                mr_free(full_isofs_cmd);
    17561756            }
    … …  
    17851785        mr_free(mds);
    17861786        pause_and_ask_for_cdr(2, &cd_is_mountable);
    1787         res = eval_call_to_make_ISO(bkpinfo->call_burn_iso, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
     1787        res = eval_call_to_make_ISO(bkpinfo->call_burn_iso, destfile, g_current_media_number, message_to_screen);
    17881788        if (res) {
    17891789            mr_strcat(message_to_screen, "...failed");
    … …  
    18011801        mr_asprintf(message_to_screen, "Running post-ISO call (%s #%d)", mds, g_current_media_number);
    18021802        mr_free(mds);
    1803         res = eval_call_to_make_ISO(bkpinfo->call_after_iso, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
     1803        res = eval_call_to_make_ISO(bkpinfo->call_after_iso, destfile, g_current_media_number, message_to_screen);
    18041804        if (res) {
    18051805            mr_strcat(message_to_screen, "...failed");

  • branches/3.3/mondo/src/common/libmondo-fork-EXT.h

    r3614 r3849  
    88                                 char *what_i_am_doing);
    99extern int eval_call_to_make_ISO(char *basic_call, char *isofile,
    10                                  int cd_no, char *logstub,
     10                                 int cd_no,
    1111                                 char *what_i_am_doing);
    1212extern int run_external_binary_with_percentage_indicator_NEW(char *tt,

  • branches/3.3/mondo/src/common/libmondo-fork.c

    r3829 r3849  
    104104int
    105105eval_call_to_make_ISO(char *basic_call, char *isofile,
    106                       int cd_no, char *logstub, char *what_i_am_doing)
     106                      int cd_no, char *what_i_am_doing)
    107107{
    108108
Note: See TracChangeset for help on using the changeset viewer.