Ignore:
Timestamp:
Feb 2, 2007, 11:21:27 PM (12 years ago)
Author:
bruno
Message:

log_msg => mr_msg in trunk

File:
1 edited

Legend:

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

    r1081 r1086  
    5757            insist_on_this_cd_number(bkpinfo, (++g_current_media_number));
    5858        } else {
    59             log_msg(2, "No CD's left. No biggiefiles left. No problem.");
     59            mr_msg(2, "No CD's left. No biggiefiles left. No problem.");
    6060            return (0);
    6161        }
     
    7777    mr_asprintf(&bigfile_fname, biggiestruct.filename);
    7878
    79     log_msg(2, "biggiestruct.filename = %s", bigfile_fname);
    80     log_msg(2, "biggiestruct.checksum = %s", checksum);
     79    mr_msg(2, "biggiestruct.filename = %s", bigfile_fname);
     80    mr_msg(2, "biggiestruct.checksum = %s", checksum);
    8181
    8282    if (!g_text_mode) {
     
    8888    /* BERLIOS: Useless ?
    8989    if (!checksum[0]) {
    90         log_msg(2, "Warning - %s has no checksum", bigfile_fname_ptr);
     90        mr_msg(2, "Warning - %s has no checksum", bigfile_fname_ptr);
    9191    } */
    9292    if (!strncmp(bigfile_fname, "/dev/", 5)) {
    93         log_msg(2, _("Ignoring device %s"), bigfile_fname);
     93        mr_msg(2, _("Ignoring device %s"), bigfile_fname);
    9494        return(0);
    9595    } else {
     
    9898                MNT_RESTORING, bigfile_fname);
    9999    }
    100     log_msg(2, command);
     100    mr_msg(2, command);
    101101    paranoid_system("cat /tmp/errors >> /tmp/mondo-restore.log 2> /dev/null");
    102102    if (system(command)) {
     
    108108        mr_free(command);
    109109        if (!(fin = fopen("/tmp/md5sum.txt", "r"))) {
    110             log_msg(2, "Unable to open /tmp/md5sum.txt; can't get live checksum");
     110            mr_msg(2, "Unable to open /tmp/md5sum.txt; can't get live checksum");
    111111            mr_free(bigfile_fname);
    112112            return (1);
     
    124124    }
    125125    if (!strcmp(checksum, original_cksum) != 0) {
    126         log_msg(1, "bigfile #%ld ('%s') ... OK", bigfileno + 1, bigfile_fname);
    127     } else {
    128         log_msg(1, "bigfile #%ld ('%s') ... changed", bigfileno + 1, bigfile_fname);
     126        mr_msg(1, "bigfile #%ld ('%s') ... OK", bigfileno + 1, bigfile_fname);
     127    } else {
     128        mr_msg(1, "bigfile #%ld ('%s') ... changed", bigfileno + 1, bigfile_fname);
    129129        retval++;
    130130    }
     
    162162
    163163    assert(bkpinfo != NULL);
    164     log_msg(1, "Comparing biggiefiles");
     164    mr_msg(1, "Comparing biggiefiles");
    165165
    166166    if (length_of_file(BIGGIELIST) < 6) {
    167         log_msg(1,
     167        mr_msg(1,
    168168                "OK, really teeny-tiny biggielist; not comparing biggiefiles");
    169169        return (0);
     
    171171    noof_biggiefiles = count_lines_in_file(BIGGIELIST);
    172172    if (noof_biggiefiles <= 0) {
    173         log_msg(1, "OK, no biggiefiles; not comparing biggiefiles");
     173        mr_msg(1, "OK, no biggiefiles; not comparing biggiefiles");
    174174        return (0);
    175175    }
     
    183183    for (bigfileno = 0; bigfileno < noof_biggiefiles; bigfileno++) {
    184184        mr_asprintf(&tmp, "Comparing big file #%ld", bigfileno + 1);
    185         log_msg(1, tmp);
     185        mr_msg(1, tmp);
    186186        update_progress_form(tmp);
    187187        mr_free(tmp);
     
    322322                "Differences found while processing fileset #%d       ",
    323323                current_tarball_number);
    324         log_msg(1, tmp);
     324        mr_msg(1, tmp);
    325325        mr_free(tmp);
    326326    }
     
    402402                       "/archives/slice* > /dev/null 2> /dev/null")
    403403                == 0) {
    404                 log_msg(2, "OK, I think I'm done with tarballs...");
     404                mr_msg(2, "OK, I think I'm done with tarballs...");
    405405                mr_free(tarball_fname);
    406406                break;
    407407            }
    408             log_msg(2, "OK, I think it's time for another CD...");
     408            mr_msg(2, "OK, I think it's time for another CD...");
    409409            g_current_media_number++;
    410410            mr_free(progress_str);
     
    590590            mr_free(tmp);
    591591
    592             log_msg(2, "calling popup_changelist_from_file()");
     592            mr_msg(2, "calling popup_changelist_from_file()");
    593593            popup_changelist_from_file("/tmp/changed.files");
    594             log_msg(2, "Returning from popup_changelist_from_file()");
     594            mr_msg(2, "Returning from popup_changelist_from_file()");
    595595        }
    596596    } else {
     
    650650    if (length_of_file("/tmp/changed.txt") > 2
    651651        && length_of_file("/tmp/changed.files") > 2) {
    652         log_msg(0,
     652        mr_msg(0,
    653653                "Type 'less /tmp/changed.files' to see which files don't match the archives");
    654         log_msg(2, "Calling popup_changelist_from_file()");
     654        mr_msg(2, "Calling popup_changelist_from_file()");
    655655        popup_changelist_from_file("/tmp/changed.files");
    656         log_msg(2, "Returned from popup_changelist_from_file()");
     656        mr_msg(2, "Returned from popup_changelist_from_file()");
    657657    }
    658658
Note: See TracChangeset for help on using the changeset viewer.