From dd67555f8425ff5fa3cb9b807224ab5199614394 Mon Sep 17 00:00:00 2001 From: Kota Tsuyuzaki Date: Thu, 5 Mar 2015 13:43:19 +0900 Subject: Rename frag_adder_size This patch renames following variables and functions: - frag_adder_size -> frag_backend_metadata_size - set_fragment_adder_size() -> set_fragment_backend_metadata_size() - get_fragment_adder_size() -> get_fragment_backend_metadata_size() --- README.md | 5 +++-- include/erasurecode/erasurecode.h | 5 +++-- include/erasurecode/erasurecode_helpers.h | 4 ++-- src/erasurecode_helpers.c | 14 +++++++------- src/erasurecode_postprocessing.c | 2 +- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 0ced36d..0fd1575 100644 --- a/README.md +++ b/README.md @@ -278,7 +278,7 @@ fragment_metadata { uint32_t idx; /* 4 */ uint32_t size; /* 4 (raw data bytes size of each fragment used for encode/fragment_to_string) */ - uint32_t frag_adder_size; /* 4 (extra metadata_adder bytes size of backend specification) */ + uint32_t frag_backend_metadata_size; /* 4 (extra metadata bytes size of backend specification) */ uint64_t orig_data_size; /* 8 */ uint8_t chksum_type; /* 1 */ uint32_t chksum[LIBERASURECODE_MAX_CHECKSUM_LEN]; /* 16 */ @@ -349,7 +349,8 @@ int liberasurecode_get_minimum_encode_size(int desc); * from liberasurecode_instance_create() * @param data_len - original data length in bytes * - * @return fragment size - sizeof(fragment_header) + size + frag_adder_size + * @return fragment size - sizeof(fragment_header) + size + * + frag_backend_metadata_size */ int liberasurecode_get_fragment_size(int desc, int data_len); diff --git a/include/erasurecode/erasurecode.h b/include/erasurecode/erasurecode.h index 7f78b55..4604c2a 100644 --- a/include/erasurecode/erasurecode.h +++ b/include/erasurecode/erasurecode.h @@ -247,7 +247,7 @@ fragment_metadata { uint32_t idx; /* 4 */ uint32_t size; /* 4 */ - uint32_t frag_adder_size; /* 4 */ + uint32_t frag_backend_metadata_size; /* 4 */ uint64_t orig_data_size; /* 8 */ uint8_t chksum_type; /* 1 */ uint32_t chksum[LIBERASURECODE_MAX_CHECKSUM_LEN]; /* 32 */ @@ -336,7 +336,8 @@ int liberasurecode_get_minimum_encode_size(int desc); * from liberasurecode_instance_create() * @param data_len - original data length in bytes * - * @return fragment size - sizeof(fragment_header) + size + frag_adder_size + * @return fragment size - sizeof(fragment_header) + size + * + frag_backend_metadata_size */ int liberasurecode_get_fragment_size(int desc, int data_len); diff --git a/include/erasurecode/erasurecode_helpers.h b/include/erasurecode/erasurecode_helpers.h index f7eefd7..33b26bd 100644 --- a/include/erasurecode/erasurecode_helpers.h +++ b/include/erasurecode/erasurecode_helpers.h @@ -135,8 +135,8 @@ int set_fragment_idx(char *buf, int idx); int get_fragment_idx(char *buf); int set_fragment_payload_size(char *buf, int size); int get_fragment_payload_size(char *buf); -int set_fragment_adder_size(char *buf, int size); -int get_fragment_adder_size(char *buf); +int set_fragment_backend_metadata_size(char *buf, int size); +int get_fragment_backend_metadata_size(char *buf); int get_fragment_buffer_size(char *buf); int set_orig_data_size(char *buf, int orig_data_size); int get_orig_data_size(char *buf); diff --git a/src/erasurecode_helpers.c b/src/erasurecode_helpers.c index 05bc838..522766e 100644 --- a/src/erasurecode_helpers.c +++ b/src/erasurecode_helpers.c @@ -324,32 +324,32 @@ int get_fragment_payload_size(char *buf) return header->meta.size; } -int set_fragment_adder_size(char *buf, int size) +int set_fragment_backend_metadata_size(char *buf, int size) { fragment_header_t *header = (fragment_header_t *) buf; assert(NULL != header); if (header->magic != LIBERASURECODE_FRAG_HEADER_MAGIC) { - log_error("Invalid fragment header (set adder size)!"); + log_error("Invalid fragment header (set fragment backend metadata size)!"); return -1; } - header->meta.frag_adder_size = size; + header->meta.frag_backend_metadata_size = size; return 0; } -int get_fragment_adder_size(char *buf) +int get_fragment_backend_metadata_size(char *buf) { fragment_header_t *header = (fragment_header_t *) buf; assert(NULL != header); if (header->magic != LIBERASURECODE_FRAG_HEADER_MAGIC) { - log_error("Invalid fragment header (get adder size)!"); + log_error("Invalid fragment header (get fragment backend metadata size)!"); return -1; } - return header->meta.frag_adder_size; + return header->meta.frag_backend_metadata_size; } int get_fragment_buffer_size(char *buf) @@ -362,7 +362,7 @@ int get_fragment_buffer_size(char *buf) return -1; } - return header->meta.size + header->meta.frag_adder_size; + return header->meta.size + header->meta.frag_backend_metadata_size; } int set_orig_data_size(char *buf, int orig_data_size) diff --git a/src/erasurecode_postprocessing.c b/src/erasurecode_postprocessing.c index 435325e..b1627f7 100644 --- a/src/erasurecode_postprocessing.c +++ b/src/erasurecode_postprocessing.c @@ -41,7 +41,7 @@ void add_fragment_metadata(ec_backend_t be, char *fragment, set_fragment_payload_size(fragment, blocksize); set_backend_id(fragment, be->common.id); set_backend_version(fragment, be->common.ec_backend_version); - set_fragment_adder_size(fragment, be->common.metadata_adder); + set_fragment_backend_metadata_size(fragment, be->common.metadata_adder); if (add_chksum) { set_checksum(ct, fragment, blocksize); -- cgit v1.2.1