obitools/obitools3
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 66 Wiki Activity

If an error occurs when cloning a column, the new cloned file is now

Browse Source 
deleted
This commit is contained in:
Celine Mercier
2015-09-02 13:06:21 +02:00
parent 52e3f2ce4a
commit f2231770f1
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/obidmscolumn.c
View File

@ -835,7 +835,7 @@ OBIDMS_column_p obi_open_column(OBIDMS_p dms, const char* column_name, obiversio
// Check endianness? // Check endianness?
// Compute data size from the informations in the header // Compute data size from the informations in the header
data_size = ((column->header)->line_count) * sizeof((column->header)->data_type); // TODO line_count for tests, change to lines_used later data_size = ((column->header)->line_count) * sizeof((column->header)->data_type);
column->data = mmap(NULL, column->data = mmap(NULL,
data_size, data_size,
@ -900,8 +900,10 @@ OBIDMS_column_p obi_clone_column(OBIDMS_p dms, const char* column_name, obiversi
{ {
obi_set_errno(OBICOL_UNKNOWN_ERROR); obi_set_errno(OBICOL_UNKNOWN_ERROR);
obidebug(1, "\nError creating the new column when cloning a column"); obidebug(1, "\nError creating the new column when cloning a column");
// TODO the new file should be deleted // The new file is deleted
return NULL; const char* column_file_name = build_column_file_name(column_name, version_number);
if (remove(column_file_name) < 0)
obidebug(1, "\nError deleting a bad cloned file");
} }
(new_column->header)->cloned_from = version_number; (new_column->header)->cloned_from = version_number;