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

Minor changes in code to improve readability and fix C compilation

Browse Source 
warnings
This commit is contained in:
Celine Mercier
2015-11-10 14:37:58 +01:00
parent 410e2e02a0
commit 6579566c6e
5 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/obidmscolumn.c
View File

@ -252,7 +252,7 @@ static obiversion_t obi_get_new_version_number(OBIDMS_column_directory_p column_
}
// Read the current version number
if (read(version_file_descriptor, &new_version_number, sizeof(obiversion_t)) < sizeof(obiversion_t))
if (read(version_file_descriptor, &new_version_number, sizeof(obiversion_t)) < ((ssize_t) sizeof(obiversion_t)))
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obidebug(1, "\nError reading a version file");
@ -263,7 +263,7 @@ static obiversion_t obi_get_new_version_number(OBIDMS_column_directory_p column_
new_version_number++;
// Write the new version number
if (write(version_file_descriptor, &new_version_number, sizeof(obiversion_t)) < sizeof(obiversion_t))
if (write(version_file_descriptor, &new_version_number, sizeof(obiversion_t)) < ((ssize_t) sizeof(obiversion_t)))
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obidebug(1, "\nError writing a new version number in a version file");
@ -349,7 +349,7 @@ static obiversion_t create_version_file(OBIDMS_column_directory_p column_directo
}
// Write version number
if (write(version_file_descriptor, &version_number, sizeof(obiversion_t)) < sizeof(obiversion_t))
if (write(version_file_descriptor, &version_number, sizeof(obiversion_t)) < ((ssize_t) sizeof(obiversion_t)))
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obidebug(1, "\nError writing version number in a version file");
@ -444,7 +444,7 @@ obiversion_t obi_get_latest_version_number(OBIDMS_column_directory_p column_dire
}
// Read the latest version number
if (read(version_file_descriptor, &latest_version_number, sizeof(obiversion_t)) < sizeof(obiversion_t))
if (read(version_file_descriptor, &latest_version_number, sizeof(obiversion_t)) < ((ssize_t) sizeof(obiversion_t)))
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obidebug(1, "\nError reading the latest version number in a version file");
@ -788,7 +788,7 @@ OBIDMS_column_p obi_open_column(OBIDMS_p dms,
}
// Read the header size
if (read(column_file_descriptor, &header_size, sizeof(size_t)) < sizeof(size_t))
if (read(column_file_descriptor, &header_size, sizeof(size_t)) < ((ssize_t) sizeof(size_t)))
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obidebug(1, "\nError reading the header size to open a column");
@ -1044,7 +1044,6 @@ int obi_enlarge_column(OBIDMS_column_p column)
index_t new_line_count;
int column_file_descriptor;
char* column_file_name;
void* new_data;
// Get the column file name
column_file_name = build_column_file_name((column->header)->name, (column->header)->version);
@ -1232,7 +1231,7 @@ OBIDMS_column_header_p obi_column_get_header_from_name(OBIDMS_p dms, const char*
free(column_file_name);
// Read the header size
if (read(column_file_descriptor, &header_size, sizeof(size_t)) < sizeof(size_t))
if (read(column_file_descriptor, &header_size, sizeof(size_t)) < ((ssize_t) sizeof(size_t)))
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obidebug(1, "\nError reading the header size to read a header");