From 8af729620543650ea108febc459b5a2b205dccc7 Mon Sep 17 00:00:00 2001 From: Eric Lambert Date: Mon, 6 Oct 2014 07:36:46 -0700 Subject: reorder add_fragment_metadata arg list to be consistent with rest of code --- include/erasurecode/erasurecode_postprocessing.h | 4 ++-- src/erasurecode.c | 10 +++++----- src/erasurecode_postprocessing.c | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/erasurecode/erasurecode_postprocessing.h b/include/erasurecode/erasurecode_postprocessing.h index a4ab881..395700d 100644 --- a/include/erasurecode/erasurecode_postprocessing.h +++ b/include/erasurecode/erasurecode_postprocessing.h @@ -33,8 +33,8 @@ int finalize_fragments_after_encode(ec_backend_t instance, int k, int m, int blocksize, uint64_t orig_data_size, char **encoded_data, char **encoded_parity); -void add_fragment_metadata(char *fragment, +void add_fragment_metadata(ec_backend_t instance, char *fragment, int idx, uint64_t orig_data_size, int blocksize, - ec_checksum_type_t ct, int add_chksum, ec_backend_t instance); + ec_checksum_type_t ct, int add_chksum); #endif diff --git a/src/erasurecode.c b/src/erasurecode.c index e95f28b..2071702 100644 --- a/src/erasurecode.c +++ b/src/erasurecode.c @@ -634,9 +634,9 @@ int liberasurecode_decode(int desc, /* Generate headers */ char *fragment_ptr = data[missing_idx]; init_fragment_header(fragment_ptr); - add_fragment_metadata(fragment_ptr, missing_idx, + add_fragment_metadata(instance, fragment_ptr, missing_idx, orig_data_size, blocksize, instance->args.uargs.ct, - !set_chksum, instance); + !set_chksum); } j++; } @@ -798,9 +798,9 @@ int liberasurecode_reconstruct_fragment(int desc, fragment_ptr = parity[destination_idx - k]; } init_fragment_header(fragment_ptr); - add_fragment_metadata(fragment_ptr, destination_idx, orig_data_size, - blocksize, instance->args.uargs.ct, - !set_chksum, instance); + add_fragment_metadata(instance, fragment_ptr, destination_idx, + orig_data_size, blocksize, instance->args.uargs.ct, + !set_chksum); /* * Copy the reconstructed fragment to the output buffer diff --git a/src/erasurecode_postprocessing.c b/src/erasurecode_postprocessing.c index 2029f3d..9ec68c7 100644 --- a/src/erasurecode_postprocessing.c +++ b/src/erasurecode_postprocessing.c @@ -30,9 +30,9 @@ #include "erasurecode_helpers.h" #include "erasurecode_stdinc.h" -void add_fragment_metadata(char *fragment, +void add_fragment_metadata(ec_backend_t be, char *fragment, int idx, uint64_t orig_data_size, int blocksize, - ec_checksum_type_t ct, int add_chksum, ec_backend_t be) + ec_checksum_type_t ct, int add_chksum) { //TODO EDL we are ignoring the return codes here, fix that set_libec_version(fragment); @@ -57,16 +57,16 @@ int finalize_fragments_after_encode(ec_backend_t instance, /* finalize data fragments */ for (i = 0; i < k; i++) { char *fragment = get_fragment_ptr_from_data(encoded_data[i]); - add_fragment_metadata(fragment, i, orig_data_size, - blocksize, ct, set_chksum, instance); + add_fragment_metadata(instance, fragment, i, orig_data_size, + blocksize, ct, set_chksum); encoded_data[i] = fragment; } /* finalize parity fragments */ for (i = 0; i < m; i++) { char *fragment = get_fragment_ptr_from_data(encoded_parity[i]); - add_fragment_metadata(fragment, i + k, orig_data_size, - blocksize, ct, set_chksum, instance); + add_fragment_metadata(instance, fragment, i + k, orig_data_size, + blocksize, ct, set_chksum); encoded_parity[i] = fragment; } -- cgit v1.2.1