From 936be64c3468a71d9fbafac96cf2ca68fd8daae1 Mon Sep 17 00:00:00 2001 From: Celine Mercier Date: Mon, 5 Dec 2016 11:18:29 +0100 Subject: [PATCH] Goes with 5e0c9f87 (missing ';' and fixed compilation warnings) --- python/obitools3/obidms/capi/obiview.pxd | 2 +- src/obidmscolumn.c | 8 ++++---- src/obidmscolumn.h | 16 ++++++++-------- src/obiview.c | 20 ++++++++++---------- src/obiview.h | 22 +++++++++++----------- 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/python/obitools3/obidms/capi/obiview.pxd b/python/obitools3/obidms/capi/obiview.pxd index 408d6db..34521ca 100644 --- a/python/obitools3/obidms/capi/obiview.pxd +++ b/python/obitools3/obidms/capi/obiview.pxd @@ -81,7 +81,7 @@ cdef extern from "obiview.h" nogil: OBIType_t data_type, index_t nb_lines, index_t nb_elements_per_line, - const_char_p elements_names, + char* elements_names, const_char_p indexer_name, const_char_p associated_column_name, obiversion_t associated_column_version, diff --git a/src/obidmscolumn.c b/src/obidmscolumn.c index 8168276..a704ab1 100644 --- a/src/obidmscolumn.c +++ b/src/obidmscolumn.c @@ -131,7 +131,7 @@ static obiversion_t create_version_file(OBIDMS_column_directory_p column_directo * @since December 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -static char* build_default_elements_names(index_t nb_elements_per_line) +static char* build_default_elements_names(index_t nb_elements_per_line); /** @@ -147,7 +147,7 @@ static char* build_default_elements_names(index_t nb_elements_per_line) * @since July 2015 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -static int obi_column_set_elements_names(OBIDMS_column_p column, const char* elements_names); +static int obi_column_set_elements_names(OBIDMS_column_p column, char* elements_names); /** @@ -467,7 +467,7 @@ static char* build_default_elements_names(index_t nb_elements_per_line) } -int obi_column_set_elements_names(OBIDMS_column_p column, const char* elements_names) +int obi_column_set_elements_names(OBIDMS_column_p column, char* elements_names) { if (strlen(elements_names) > ELEMENTS_NAMES_MAX) { @@ -603,7 +603,7 @@ OBIDMS_column_p obi_create_column(OBIDMS_p dms, OBIType_t data_type, index_t nb_lines, index_t nb_elements_per_line, - const char* elements_names, + char* elements_names, const char* indexer_name, const char* associated_column_name, obiversion_t associated_column_version, diff --git a/src/obidmscolumn.h b/src/obidmscolumn.h index 05a5db9..9e5e348 100644 --- a/src/obidmscolumn.h +++ b/src/obidmscolumn.h @@ -197,16 +197,16 @@ size_t obi_get_platform_header_size(); * @since May 2015 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -OBIDMS_column_p obi_create_column(OBIDMS_p dms, - const char* column_name, - OBIType_t data_type, - index_t nb_lines, - index_t nb_elements_per_line, - const char* elements_names, - const char* indexer_name, +OBIDMS_column_p obi_create_column(OBIDMS_p dms, + const char* column_name, + OBIType_t data_type, + index_t nb_lines, + index_t nb_elements_per_line, + char* elements_names, + const char* indexer_name, const char* associated_column_name, obiversion_t associated_column_version, - const char* comments + const char* comments ); diff --git a/src/obiview.c b/src/obiview.c index 4014a1e..e371ba8 100644 --- a/src/obiview.c +++ b/src/obiview.c @@ -1721,19 +1721,19 @@ Obiview_p obi_open_view(OBIDMS_p dms, const char* view_name) } -int obi_view_add_column(Obiview_p view, - const char* column_name, +int obi_view_add_column(Obiview_p view, + const char* column_name, obiversion_t version_number, - const char* alias, - OBIType_t data_type, - index_t nb_lines, - index_t nb_elements_per_line, - const char* elements_names, - const char* indexer_name, - const char* associated_column_name, + const char* alias, + OBIType_t data_type, + index_t nb_lines, + index_t nb_elements_per_line, + char* elements_names, + const char* indexer_name, + const char* associated_column_name, obiversion_t associated_column_version, const char* comments, - bool create) // all infos for creation or open + bool create) // all infos for creation or open { int i; OBIDMS_column_p column; diff --git a/src/obiview.h b/src/obiview.h index eb4df57..641b856 100644 --- a/src/obiview.h +++ b/src/obiview.h @@ -313,19 +313,19 @@ Obiview_p obi_open_view(OBIDMS_p dms, const char* view_name); * @since February 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -int obi_view_add_column(Obiview_p view, - const char* column_name, +int obi_view_add_column(Obiview_p view, + const char* column_name, obiversion_t version_number, - const char* alias, - OBIType_t data_type, - index_t nb_lines, - index_t nb_elements_per_line, - const char* elements_names, - const char* indexer_name, - const char* associated_column_name, + const char* alias, + OBIType_t data_type, + index_t nb_lines, + index_t nb_elements_per_line, + char* elements_names, + const char* indexer_name, + const char* associated_column_name, obiversion_t associated_column_version, - const char* comments, - bool create); + const char* comments, + bool create); /**