Ignore:
Timestamp:
Feb 8, 2007, 12:10:16 AM (13 years ago)
Author:
Bruno Cornec
Message:

log_msg => mr_msg for main files

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mondo/src/mondorestore/mondo-rstr-compare.c

    r1080 r1108  
    7878            sprintf(tmp_ptr,
    7979                    "No CD's left. No biggiefiles left. No prob, Bob.");
    80             log_msg(2, tmp_ptr);
     80            mr_msg(2, tmp_ptr);
    8181            return (0);
    8282        }
     
    9595    strcpy(bigfile_fname_ptr, biggiestruct.filename);
    9696
    97     log_msg(2, "biggiestruct.filename = %s", biggiestruct.filename);
    98     log_msg(2, "biggiestruct.checksum = %s", biggiestruct.checksum);
     97    mr_msg(2, "biggiestruct.filename = %s", biggiestruct.filename);
     98    mr_msg(2, "biggiestruct.checksum = %s", biggiestruct.checksum);
    9999
    100100    sprintf(tmp_ptr, "Comparing %s", bigfile_fname_ptr);
     
    105105    }
    106106    if (!checksum[0]) {
    107         log_msg(2, "Warning - %s has no checksum", bigfile_fname_ptr);
     107        mr_msg(2, "Warning - %s has no checksum", bigfile_fname_ptr);
    108108    }
    109109    if (!strncmp(bigfile_fname_ptr, "/dev/", 5)) {
     
    114114                MNT_RESTORING, bigfile_fname_ptr);
    115115    }
    116     log_msg(2, command_ptr);
     116    mr_msg(2, command_ptr);
    117117    paranoid_system
    118118        ("cat /tmp/errors >> /tmp/mondo-restore.log 2> /dev/null");
     
    123123    } else {
    124124        if (!(fin = fopen("/tmp/md5sum.txt", "r"))) {
    125             log_msg(2,
     125            mr_msg(2,
    126126                    "Unable to open /tmp/md5sum.txt; can't get live checksum");
    127127            original_cksum[0] = '\0';
     
    147147        retval++;
    148148    }
    149     log_msg(1, tmp_ptr);
     149    mr_msg(1, tmp_ptr);
    150150    if (retval) {
    151151        if (!(fout = fopen("/tmp/changed.txt", "a"))) {
     
    188188
    189189    assert(bkpinfo != NULL);
    190     log_msg(1, "Comparing biggiefiles");
     190    mr_msg(1, "Comparing biggiefiles");
    191191
    192192    if (length_of_file(BIGGIELIST) < 6) {
    193         log_msg(1,
     193        mr_msg(1,
    194194                "OK, really teeny-tiny biggielist; not comparing biggiefiles");
    195195        return (0);
     
    197197    noof_biggiefiles = count_lines_in_file(BIGGIELIST);
    198198    if (noof_biggiefiles <= 0) {
    199         log_msg(1, "OK, no biggiefiles; not comparing biggiefiles");
     199        mr_msg(1, "OK, no biggiefiles; not comparing biggiefiles");
    200200        return (0);
    201201    }
     
    208208    for (bigfileno = 0; bigfileno < noof_biggiefiles; bigfileno++) {
    209209        sprintf(tmp, "Comparing big file #%ld", bigfileno + 1);
    210         log_msg(1, tmp);
     210        mr_msg(1, tmp);
    211211        update_progress_form(tmp);
    212212        res = compare_a_biggiefile(bkpinfo, bigfileno);
     
    341341                "Differences found while processing fileset #%d       ",
    342342                current_tarball_number);
    343         log_msg(1, tmp);
     343        mr_msg(1, tmp);
    344344    }
    345345    unlink(logfile);
     
    421421                       "/archives/slice* > /dev/null 2> /dev/null")
    422422                == 0) {
    423                 log_msg(2, "OK, I think I'm done with tarballs...");
     423                mr_msg(2, "OK, I think I'm done with tarballs...");
    424424                break;
    425425            }
    426             log_msg(2, "OK, I think it's time for another CD...");
     426            mr_msg(2, "OK, I think it's time for another CD...");
    427427            g_current_media_number++;
    428428            sprintf(progress_str, "Comparing with %s #%d ",
     
    603603            log_to_screen(tmp);
    604604
    605             log_msg(2, "calling popup_changelist_from_file()");
     605            mr_msg(2, "calling popup_changelist_from_file()");
    606606            popup_changelist_from_file("/tmp/changed.files");
    607             log_msg(2, "Returning from popup_changelist_from_file()");
     607            mr_msg(2, "Returning from popup_changelist_from_file()");
    608608        }
    609609    } else {
     
    658658    if (length_of_file("/tmp/changed.txt") > 2
    659659        && length_of_file("/tmp/changed.files") > 2) {
    660         log_msg(0,
     660        mr_msg(0,
    661661                "Type 'less /tmp/changed.files' to see which files don't match the archives");
    662         log_msg(2, "Calling popup_changelist_from_file()");
     662        mr_msg(2, "Calling popup_changelist_from_file()");
    663663        popup_changelist_from_file("/tmp/changed.files");
    664         log_msg(2, "Returned from popup_changelist_from_file()");
     664        mr_msg(2, "Returned from popup_changelist_from_file()");
    665665    }
    666666
Note: See TracChangeset for help on using the changeset viewer.