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

log_msg => mr_msg for common files

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mondo/src/common/libmondo-stream.c

    r1080 r1107  
    376376            wrong_marker(BLK_STOP_EXAT_FILE, *pctrl_chr);
    377377        }
    378         log_msg(1, "Got xattr");
     378        mr_msg(1, "Got xattr");
    379379    }
    380380// acl
     
    396396            wrong_marker(BLK_STOP_EXTENDED_ATTRIBUTES, *pctrl_chr);
    397397        }
    398         log_msg(1, "Got acl");
     398        mr_msg(1, "Got acl");
    399399    }
    400400// tarball itself
    401401    res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
    402     log_msg(1, "now looking for afioball");
     402    mr_msg(1, "now looking for afioball");
    403403    return (retval);
    404404}
     
    590590
    591591    if (strncmp(tapedev, "/dev/", 5)) {
    592         log_msg(1,
     592        mr_msg(1,
    593593                "Not using 'mt setblk'. This isn't an actual /dev entry.");
    594594        return (0);
     
    933933//    crctt=crc16=0;
    934934            where_I_was_before_tape_change = size;
    935             log_msg(4, "where_I_was_... = %lld",
     935            mr_msg(4, "where_I_was_... = %lld",
    936936                    where_I_was_before_tape_change);
    937937            start_to_read_from_next_tape(bkpinfo);
    938             log_msg(4, "Started reading from next tape.");
     938            mr_msg(4, "Started reading from next tape.");
    939939            skip_incoming_files_until_we_find_this_one(temp_fname);
    940             log_msg(4, "Skipped irrelevant files OK.");
     940            mr_msg(4, "Skipped irrelevant files OK.");
    941941            for (size = orig_size; size > where_I_was_before_tape_change;
    942942                 size -= bytes_to_write) {
     
    944944                    fread(datablock, 1, bytes_to_read, g_tape_stream);
    945945            }
    946             log_msg(4, "'size' is now %lld (should be %lld)", size,
     946            mr_msg(4, "'size' is now %lld (should be %lld)", size,
    947947                    where_I_was_before_tape_change);
    948948            log_to_screen("Successfully re-sync'd tape");
     
    961961#endif
    962962    }
    963     log_msg(6, "Total read from tape for this file = %lld",
     963    mr_msg(6, "Total read from tape for this file = %lld",
    964964            total_read_from_tape_for_this_file);
    965     log_msg(6, ".......................... Should be %lld", orig_size);
     965    mr_msg(6, ".......................... Should be %lld", orig_size);
    966966    g_tape_posK += total_read_from_tape_for_this_file / 1024;
    967967    sprintf(actual_cksum, "%04x%04x", crc16, crctt);
     
    10541054    }
    10551055    tempblock[i] = '\0';
    1056     log_msg(6, "%s (fname=%s, size=%ld K)",
     1056    mr_msg(6, "%s (fname=%s, size=%ld K)",
    10571057            marker_to_string(*pcontrol_char), tempblock + 1000,
    10581058            (long) (*plen) >> 10);
     
    11721172        pB = the_file_I_was_reading;
    11731173    }
    1174     log_msg(1, "skip_incoming_..(%s)", pB);
    1175     log_msg(2, "Looking for initial START_AN_AFIO_OR_SLICE");
     1174    mr_msg(1, "skip_incoming_..(%s)", pB);
     1175    mr_msg(2, "Looking for initial START_AN_AFIO_OR_SLICE");
    11761176    ctrl_chr = -1;
    11771177    while (ctrl_chr != BLK_START_AN_AFIO_OR_SLICE) {
     
    11821182            break;
    11831183        }
    1184         log_msg(1, "%lld %s %c", temp_size, temp_fname, ctrl_chr);
     1184        mr_msg(1, "%lld %s %c", temp_size, temp_fname, ctrl_chr);
    11851185        wrong_marker(BLK_START_AN_AFIO_OR_SLICE, ctrl_chr);
    1186         log_msg(3, "Still trying to re-sync w/ tape");
     1186        mr_msg(3, "Still trying to re-sync w/ tape");
    11871187    }
    11881188    while (ctrl_chr != BLK_START_FILE) {
     
    11931193            break;
    11941194        }
    1195         log_msg(1, "%lld %s %c", temp_size, temp_fname, ctrl_chr);
     1195        mr_msg(1, "%lld %s %c", temp_size, temp_fname, ctrl_chr);
    11961196        wrong_marker(BLK_START_FILE, ctrl_chr);
    1197         log_msg(3, "Still trying to re-sync w/ tape");
     1197        mr_msg(3, "Still trying to re-sync w/ tape");
    11981198    }
    11991199    pA = strrchr(temp_fname, '/');
     
    12101210    }
    12111211    while (strcmp(pA, pB)) {
    1212         log_msg(6, "Skipping %s (it's not %s)", temp_fname,
     1212        mr_msg(6, "Skipping %s (it's not %s)", temp_fname,
    12131213                the_file_I_was_reading);
    12141214        for (size = temp_size; size > 0; size -= bytes_to_write) {
     
    12551255        }
    12561256    }
    1257     log_msg(2, "Reading %s (it matches %s)", temp_fname,
     1257    mr_msg(2, "Reading %s (it matches %s)", temp_fname,
    12581258            the_file_I_was_reading);
    12591259    mr_free(temp_fname);
     
    13031303        wrong_marker(BLK_START_OF_BACKUP, ctrlchr);
    13041304    } else {
    1305         log_msg(3, "Next tape opened OK. Whoopee!");
     1305        mr_msg(3, "Next tape opened OK. Whoopee!");
    13061306    }
    13071307    mr_free(sz_msg);
     
    13811381    char *fname;
    13821382
    1383     log_msg(2, "I am now writing back catalog to tape");
     1383    mr_msg(2, "I am now writing back catalog to tape");
    13841384    malloc_string(fname);
    13851385    last = g_tapecatalog->entries - 1;
     
    13881388                g_tapecatalog->el[i].fname);
    13891389        if (!does_file_exist(fname)) {
    1390             log_msg(6, "Can't write %s - it doesn't exist.", fname);
     1390            mr_msg(6, "Can't write %s - it doesn't exist.", fname);
    13911391        } else {
    13921392            write_header_block_to_stream(length_of_file(fname),
    13931393                                         "start-backcatalog-afio-or-slice",
    13941394                                         BLK_START_AN_AFIO_OR_SLICE);
    1395             log_msg(2, "Writing %s", fname);
     1395            mr_msg(2, "Writing %s", fname);
    13961396            if (write_file_to_stream_from_file(bkpinfo, fname)) {
    13971397                res++;
    1398                 log_msg(2, "%s failed", fname);
     1398                mr_msg(2, "%s failed", fname);
    13991399            }
    14001400            if (i != last) {
     
    14061406    }
    14071407    mr_free(fname);
    1408     log_msg(2, "Finished writing back catalog to tape");
     1408    mr_msg(2, "Finished writing back catalog to tape");
    14091409    return (res);
    14101410}
     
    16461646            marker_to_string(control_char), p,
    16471647            (long) length_of_incoming_file >> 10);
    1648     log_msg(6, tmp);
     1648    mr_msg(6, tmp);
    16491649/*  log_tape_pos(); */
    16501650    return (0);
Note: See TracChangeset for help on using the changeset viewer.