From 73d64e5aff8b5164f1c7d36f3d5e49dc6e3b8491 Mon Sep 17 00:00:00 2001 From: Celine Mercier Date: Thu, 14 Apr 2016 15:19:27 +0200 Subject: [PATCH] Renamed 'unmap_header' function to 'close_header' --- python/obitools3/obidms/capi/obidmscolumn.pxd | 2 +- src/obidmscolumn.c | 6 +++--- src/obidmscolumn.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/python/obitools3/obidms/capi/obidmscolumn.pxd b/python/obitools3/obidms/capi/obidmscolumn.pxd index 6249831..73f682e 100644 --- a/python/obitools3/obidms/capi/obidmscolumn.pxd +++ b/python/obitools3/obidms/capi/obidmscolumn.pxd @@ -69,7 +69,7 @@ cdef extern from "obidmscolumn.h" nogil: const_char_p column_name, obiversion_t version_number) - int obi_unmap_header(OBIDMS_column_header_p header) + int obi_close_header(OBIDMS_column_header_p header) char* obi_column_format_date(time_t date) diff --git a/src/obidmscolumn.c b/src/obidmscolumn.c index 2b463d6..c9bcb9d 100644 --- a/src/obidmscolumn.c +++ b/src/obidmscolumn.c @@ -1358,7 +1358,7 @@ OBIDMS_column_header_p obi_column_get_header_from_name(OBIDMS_p dms, const char* } -int obi_unmap_header(OBIDMS_column_header_p header) +int obi_close_header(OBIDMS_column_header_p header) { if (munmap(header, header->header_size) < 0) { @@ -1386,7 +1386,7 @@ index_t obi_column_get_element_index_from_name(OBIDMS_column_p column, const cha element_index = 0; - name = strtok (elements_names, ";"); // TODO not thread safe, see strtok_r maybe + name = strtok(elements_names, ";"); // TODO not thread safe, see strtok_r maybe if (strcmp(element_name, name) == 0) { free(elements_names); @@ -1396,7 +1396,7 @@ index_t obi_column_get_element_index_from_name(OBIDMS_column_p column, const cha while (name != NULL) { - name = strtok (NULL, ";"); // TODO not thread safe, see strtok_r maybe + name = strtok(NULL, ";"); // TODO not thread safe, see strtok_r maybe if (strcmp(element_name, name) == 0) { free(elements_names); diff --git a/src/obidmscolumn.h b/src/obidmscolumn.h index 14f1d74..614211f 100644 --- a/src/obidmscolumn.h +++ b/src/obidmscolumn.h @@ -311,7 +311,7 @@ OBIDMS_column_header_p obi_column_get_header_from_name(OBIDMS_p dms, const char* * @since October 2015 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -int obi_unmap_header(OBIDMS_column_header_p header); +int obi_close_header(OBIDMS_column_header_p header); /**