Changeset 3116 in MondoRescue


Ignore:
Timestamp:
May 7, 2013, 5:42:54 AM (11 years ago)
Author:
Bruno Cornec
Message:

r5277@localhost: bruno | 2013-05-07 01:22:17 +0200

  • Fix a compiler issue with the new test-mrstresc and also most compiler warnings
Location:
branches/3.0/mondo
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/3.0/mondo/src/common/libmondo-stream.c

    r3080 r3116  
    373373    int res = 0;
    374374    char fname_buf[PATH_MAX];
    375     char *fname = (char *)fname_buf;                    /* Should NOT be NULL */
     375    char *fname = (char *)fname_buf;        /* Should NOT be NULL */
    376376    char *tmp = NULL;
    377377
    … …  
    430430    res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
    431431    log_msg(1, "End of extended attributes, now looking for afioball");
    432     return (0);
     432    return (res);
    433433}
    434434

  • branches/3.0/mondo/src/common/libmondo-verify.c

    r3060 r3116  
    787787        log_it("Grabbing the EXAT files");
    788788        if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
    789             res =
    790                 read_EXAT_files_from_tape(&size, fname, &ctrl_chr,
     789            res = read_EXAT_files_from_tape(&size, fname, &ctrl_chr,
    791790                                          curr_xattr_list_fname,
    792791                                          curr_acl_list_fname);
    … …  
    810809        if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
    811810            log_it("Reading EXAT files from tape");
    812             res =
    813                 read_EXAT_files_from_tape(&size, fname, &ctrl_chr,
     811            res = read_EXAT_files_from_tape(&size, fname, &ctrl_chr,
    814812                                          curr_xattr_list_fname,
    815813                                          curr_acl_list_fname);
    … …  
    900898        if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
    901899            log_it("Grabbing the EXAT biggiefiles");
    902             res =
    903                 read_EXAT_files_from_tape(&size, orig_fname,
     900            res = read_EXAT_files_from_tape(&size, orig_fname,
    904901                                          &ctrl_chr, curr_xattr_list_fname,
    905902                                          curr_acl_list_fname);

  • branches/3.0/mondo/src/mondorestore/mondo-rstr-tools.c

    r3076 r3116  
    281281char *mds = NULL;
    282282int retval = 0, i;
    283 bool already_mounted = FALSE;
    284283
    285284assert(bkpinfo != NULL);
    … …  
    307306if (is_this_device_mounted(g_isodir_device)) {
    308307    log_to_screen("WARNING - isodir is already mounted");
    309     already_mounted = TRUE;
    310308} else {
    311309    mr_asprintf(&mount_isodir_command, "mount %s", g_isodir_device);
    … …  
    10271025        "Filelist and biggielist already recovered from media. Yay!");
    10281026} else {
    1029     getcwd(tmp, MAX_STR_LEN);
     1027    if (getcwd(tmp, MAX_STR_LEN) == NULL) {
     1028        // FIXME
     1029    }
    10301030    if (chdir(bkpinfo->tmpdir)) {
    10311031        // FIXME

  • branches/3.0/mondo/src/mondorestore/mondorestore.c

    r3111 r3116  
    24212421                                      &ctrl_chr);
    24222422    if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
    2423         res =
    2424             read_EXAT_files_from_tape(&biggie_size, biggie_fname,
     2423        res = read_EXAT_files_from_tape(&biggie_size, biggie_fname,
    24252424                                      &ctrl_chr, xattr_fname, acl_fname);
    24262425    }
    … …  
    26132612        if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
    26142613            log_it("Reading EXAT files from tape");
    2615             res =
    2616                 read_EXAT_files_from_tape(&tmp_size, tmp_fname,
     2614            res = read_EXAT_files_from_tape(&tmp_size, tmp_fname,
    26172615                                          &ctrl_chr, xattr_fname,
    26182616                                          acl_fname);

  • branches/3.0/mondo/test/test-mr_stresc.c

    r3111 r3116  
    66 */
    77#include <stdio.h>
     8#include <stdlib.h>
    89#include "mr_str.h"
    910
    10 const char **strl = {
     11void (*mr_cleanup)(void) = NULL;
     12
     13char **strl = {
    1114        "test with space",
    1215        "test with \ backslash",
    … …  
    2326const int MAX = 10;
    2427
    25 void main() {
     28int main() {
    2629
    2730        char *p;

  • branches/3.0/mondo/test/test-truncname.c

    r3042 r3116  
    4747}
    4848
    49 void main() {
     49int main() {
    5050
    5151char *part = NULL;
Note: See TracChangeset for help on using the changeset viewer.