Ignore:
Timestamp:
Nov 19, 2005, 2:27:31 AM (14 years ago)
Author:
bcornec
Message:

merge -r 125:126 $SVN_M/branches/2.05

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/mondo/mondo/common/libmondo-verify.c

    r122 r127  
    608608    char *orig_cksum;
    609609    char *tmp;
    610     char *slice_fnam = (char *)&res;
     610    char *slice_fnam = (char *) &res;
    611611
    612612    /*@ pointers ******************************************************** */
     
    627627    asprintf(&test_file, "%s/temporary-%s", bkpinfo->tmpdir, p);
    628628    asprintf(&tmp,
    629     "Temporarily copying biggiefile %s's slices from tape to '%s'",
    630     p, test_file);
    631     log_it(tmp); 
     629             "Temporarily copying biggiefile %s's slices from tape to '%s'",
     630             p, test_file);
     631    log_it(tmp);
    632632    paranoid_free(tmp);
    633633    for (res =
     
    643643        unlink(test_file);
    644644        paranoid_free(slice_fnam);
    645         slice_fnam = (char *)&res;
     645        slice_fnam = (char *) &res;
    646646        res =
    647647            read_header_block_from_stream(&slice_siz, slice_fnam,
     
    654654        retval += res;
    655655        paranoid_free(slice_fnam);
    656         slice_fnam = (char *)&res;
     656        slice_fnam = (char *) &res;
    657657    }
    658658    paranoid_free(test_file);
     
    706706    /*@ buffers ***************************************************** */
    707707    char *tmp;
    708     char *fname = (char *)&res;             /* Should NOT be NULL */
     708    char *fname = (char *) &res;    /* Should NOT be NULL */
    709709    char *curr_xattr_list_fname;
    710710    char *curr_acl_list_fname;
     
    744744    for (res = read_header_block_from_stream(&size, fname, &ctrl_chr);
    745745         ctrl_chr != BLK_STOP_AFIOBALLS;
    746          res =
    747          read_header_block_from_stream(&size, fname, &ctrl_chr)) {
     746         res = read_header_block_from_stream(&size, fname, &ctrl_chr)) {
    748747        asprintf(&curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
    749748                 bkpinfo->tmpdir, current_afioball_number);
     
    753752            iamhere("Reading EXAT files from tape");
    754753            paranoid_free(fname);
    755             fname = (char *)&res;
     754            fname = (char *) &res;
    756755            res =
    757756                read_EXAT_files_from_tape(bkpinfo, &size, fname, &ctrl_chr,
     
    781780        g_current_progress++;
    782781        paranoid_free(fname);
    783         fname = (char *)&res;
     782        fname = (char *) &res;
    784783        res = read_header_block_from_stream(&size, fname, &ctrl_chr);
    785784        if (ctrl_chr != BLK_STOP_AN_AFIO_OR_SLICE) {
     
    787786        }
    788787        paranoid_free(fname);
    789         fname = (char *)&res;
     788        fname = (char *) &res;
    790789    }
    791790    log_msg(1, "All done with afioballs");
     
    817816
    818817    /*@ buffers ******************************************************** */
    819     char *orig_fname = (char *)&ctrl_chr;   /* Should NOT be NULL */
     818    char *orig_fname = (char *) &ctrl_chr;  /* Should NOT be NULL */
    820819    char *logical_fname;
    821820    char *comment;
     
    841840            iamhere("Grabbing the EXAT biggiefiles");
    842841            paranoid_free(orig_fname);
    843             orig_fname = (char *)&ctrl_chr;
     842            orig_fname = (char *) &ctrl_chr;
    844843            res =
    845844                read_EXAT_files_from_tape(bkpinfo, &size, orig_fname,
     
    851850    paranoid_free(curr_acl_list_fname);
    852851    paranoid_free(orig_fname);
    853     orig_fname = (char *)&ctrl_chr;
     852    orig_fname = (char *) &ctrl_chr;
    854853
    855854    if (ctrl_chr != BLK_START_BIGGIEFILES) {
     
    891890        g_current_progress++;
    892891        paranoid_free(orig_fname);
    893         orig_fname = (char *)&ctrl_chr;
     892        orig_fname = (char *) &ctrl_chr;
    894893    }
    895894    close_progress_form();
Note: See TracChangeset for help on using the changeset viewer.