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

Error handling: obidebug() with message for all errors, and removed

Browse Source 
commands closing directories when an error occurred (creating more
errors).
This commit is contained in:
celinemercier
2015-08-03 15:10:39 +02:00
parent 1e01c9059c
commit 41f627091f
4 changed files with 108 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/obidmscolumndir.c
View File

@@ -22,6 +22,10 @@
#include "obidms.h"
#include "private_at_functions.h"
#include "obierrno.h"
#include "obidebug.h"
#define DEBUG_LEVEL 0
/**************************************************************************
@@ -69,6 +73,7 @@ static char* build_column_directory_name(const char* column_name)
if (asprintf(&column_directory_name, "%s.obicol", column_name) < 0)
{
obi_set_errno(OBICOLDIR_MEMORY_ERROR);
obidebug(1, "\nError building a column directory name");
return NULL;
}
@@ -76,6 +81,7 @@ static char* build_column_directory_name(const char* column_name)
if (strlen(column_directory_name) >= OBIDMS_COLUMN_DIR_MAX_NAME)
{
obi_set_errno(OBICOLDIR_LONG_NAME_ERROR);
obidebug(1, "\nError building a column directory name");
free(column_directory_name);
return NULL;
}
@@ -101,16 +107,14 @@ int obi_column_directory_exists(OBIDMS_p dms, const char* column_name)
// Build and check the directory name
column_directory_name = build_column_directory_name(column_name);
if (column_directory_name == NULL)
{
obi_set_errno(OBICOLDIR_UNKNOWN_ERROR);
return -1;
}
// Get the file descriptor for the dms
dms_file_descriptor = dirfd(dms->directory);
if (dms_file_descriptor < 0)
{
obi_set_errno(OBIDMS_UNKNOWN_ERROR);
obidebug(1, "\nError getting a file descriptor for an OBIDMS directory");
free(column_directory_name);
return -1;
}
@@ -120,6 +124,7 @@ int obi_column_directory_exists(OBIDMS_p dms, const char* column_name)
if (full_path == NULL)
{
obi_set_errno(OBICOLDIR_UNKNOWN_ERROR);
obidebug(1, "\nError getting path for an OBIDMS directory");
free(column_directory_name);
return -1;
}
@@ -154,6 +159,7 @@ OBIDMS_column_directory_p obi_create_column_directory(OBIDMS_p dms, const char*
if (dms_file_descriptor < 0)
{
obi_set_errno(OBIDMS_UNKNOWN_ERROR);
obidebug(1, "\nError getting a file descriptor for an OBIDMS directory");
free(column_directory_name);
return NULL;
}
@@ -165,8 +171,8 @@ OBIDMS_column_directory_p obi_create_column_directory(OBIDMS_p dms, const char*
obi_set_errno(OBICOLDIR_EXIST_ERROR);
else
obi_set_errno(OBICOLDIR_UNKNOWN_ERROR);
obidebug(1, "\nError creating a column directory");
free(column_directory_name);
close(dms_file_descriptor);
return NULL;
}
@@ -179,9 +185,9 @@ OBIDMS_column_directory_p obi_create_column_directory(OBIDMS_p dms, const char*
OBIDMS_column_directory_p obi_open_column_directory(OBIDMS_p dms, const char* column_name)
{
OBIDMS_column_directory_p column_directory;
char* column_directory_name;
DIR* directory;
int dms_file_descriptor;
char* column_directory_name;
DIR* directory;
int dms_file_descriptor;
column_directory = NULL;
@@ -195,6 +201,7 @@ OBIDMS_column_directory_p obi_open_column_directory(OBIDMS_p dms, const char* co
if (dms_file_descriptor < 0)
{
obi_set_errno(OBIDMS_UNKNOWN_ERROR);
obidebug(1, "\nError getting a file descriptor for an OBIDMS directory");
free(column_directory_name);
return NULL;
}
@@ -219,8 +226,8 @@ OBIDMS_column_directory_p obi_open_column_directory(OBIDMS_p dms, const char* co
default:
obi_set_errno(OBICOLDIR_UNKNOWN_ERROR);
}
obidebug(1, "\nError opening a column directory");
free(column_directory_name);
close(dms_file_descriptor);
return NULL;
}
@@ -229,8 +236,8 @@ OBIDMS_column_directory_p obi_open_column_directory(OBIDMS_p dms, const char* co
if (column_directory == NULL)
{
obi_set_errno(OBICOLDIR_MEMORY_ERROR);
obidebug(1, "\nError allocating the memory for an OBIDMS column directory structure");
free(column_directory_name);
close(dms_file_descriptor);
return NULL;
}
@@ -258,6 +265,7 @@ OBIDMS_column_directory_p obi_column_directory(OBIDMS_p dms, const char* column_
return obi_open_column_directory(dms, column_name);
};
obidebug(1, "\nError checking if a column directory exists");
return NULL;
}
@@ -270,6 +278,7 @@ int obi_close_column_directory(OBIDMS_column_directory_p column_directory)
if (closedir(column_directory->directory) < 0)
{
obi_set_errno(OBICOLDIR_MEMORY_ERROR);
obidebug(1, "\nError closing a column directory");
free(column_directory);
return -1;
}