Changed the variable name 'nb_elements' to 'nb_lines' for better clarity
This commit is contained in:
@ -586,7 +586,7 @@ size_t obi_get_platform_header_size()
|
||||
OBIDMS_column_p obi_create_column(OBIDMS_p dms,
|
||||
const char *column_name,
|
||||
OBIType_t type,
|
||||
size_t nb_elements,
|
||||
size_t nb_lines,
|
||||
size_t nb_elements_per_line,
|
||||
const char* elements_names)
|
||||
{
|
||||
@ -625,7 +625,7 @@ OBIDMS_column_p obi_create_column(OBIDMS_p dms,
|
||||
|
||||
// Calculate the size needed
|
||||
header_size = obi_get_platform_header_size();
|
||||
data_size = obi_array_sizeof(type, nb_elements, nb_elements_per_line);
|
||||
data_size = obi_array_sizeof(type, nb_lines, nb_elements_per_line);
|
||||
file_size = header_size + data_size;
|
||||
|
||||
// Get the latest version number
|
||||
@ -717,7 +717,7 @@ OBIDMS_column_p obi_create_column(OBIDMS_p dms,
|
||||
header = new_column->header;
|
||||
header->little_endian = obi_is_little_endian();
|
||||
header->header_size = header_size;
|
||||
header->line_count = nb_elements;
|
||||
header->line_count = nb_lines;
|
||||
header->lines_used = 0;
|
||||
header->nb_elements_per_line = nb_elements_per_line;
|
||||
header->data_type = type;
|
||||
|
@ -133,7 +133,7 @@ size_t obi_get_platform_header_size();
|
||||
* @param dms a pointer on an OBIDMS
|
||||
* @param column_name the name of the new column
|
||||
* @param type the OBIType code used to create the column
|
||||
* @param nb_elements the number of elements to be stored
|
||||
* @param nb_lines the number of lines to be stored
|
||||
*
|
||||
* @since May 2015
|
||||
* @author Eric Coissac (eric.coissac@metabarcoding.org)
|
||||
@ -141,7 +141,7 @@ size_t obi_get_platform_header_size();
|
||||
OBIDMS_column_p obi_create_column(OBIDMS_p dms,
|
||||
const char* column_name,
|
||||
OBIType_t type,
|
||||
size_t nb_elements,
|
||||
size_t nb_lines,
|
||||
size_t nb_elements_per_line,
|
||||
const char* elements_names);
|
||||
|
||||
|
@ -46,13 +46,13 @@ size_t obi_sizeof(OBIType_t type)
|
||||
}
|
||||
|
||||
|
||||
size_t obi_array_sizeof(OBIType_t type, size_t nb_elements, size_t nb_elements_per_line)
|
||||
size_t obi_array_sizeof(OBIType_t type, size_t nb_lines, size_t nb_elements_per_line)
|
||||
{
|
||||
size_t size;
|
||||
size_t rsize;
|
||||
size_t psize;
|
||||
|
||||
size = obi_sizeof(type) * nb_elements * nb_elements_per_line;
|
||||
size = obi_sizeof(type) * nb_lines * nb_elements_per_line;
|
||||
|
||||
psize = getpagesize();
|
||||
rsize = size % psize;
|
||||
|
Reference in New Issue
Block a user