summaryrefslogtreecommitdiff
path: root/cleopatre/application/libspid
diff options
context:
space:
mode:
authorJean-Philippe SAVE2011-12-02 16:48:09 +0100
committerCyril Jourdan2011-12-20 15:52:38 +0100
commit2a834548fa4e7923aa6670bcae0f09a40b7fe67f (patch)
treead0df7df0d3df8f274c5ab71c898d17842315ab6 /cleopatre/application/libspid
parent62f12ae27b92ece205760b2c868f15b21aa2ac40 (diff)
cleo/app/libspid: fix compilation warnings, no refs
Diffstat (limited to 'cleopatre/application/libspid')
-rw-r--r--cleopatre/application/libspid/src/config_line.c5
-rw-r--r--cleopatre/application/libspid/src/image.c8
-rw-r--r--cleopatre/application/libspid/src/misc.c4
-rw-r--r--cleopatre/application/libspid/src/secu.c2
-rw-r--r--cleopatre/application/libspid/src/system.c6
5 files changed, 13 insertions, 12 deletions
diff --git a/cleopatre/application/libspid/src/config_line.c b/cleopatre/application/libspid/src/config_line.c
index e2e676f9e3..a34205545b 100644
--- a/cleopatre/application/libspid/src/config_line.c
+++ b/cleopatre/application/libspid/src/config_line.c
@@ -68,7 +68,7 @@ libspid_error_t libspid_config_read_line(const char *filename, const char* delim
#ifdef USE_LOCK
struct flock lock;
#endif /* USE_LOCK */
- int max_elt_number;
+ unsigned int max_elt_number;
int is_key_found;
/* check input parameters */
@@ -245,7 +245,8 @@ libspid_error_t libspid_config_write_line(const char *filename, const char delim
char out_filename[64];
char *ptr, *strtok_ctx;
FILE *fp_in, *fp_out;
- int fd_in, index = 0;
+ int fd_in;
+ unsigned int index = 0;
int is_key_found = LIBSPID_FALSE;
char delimiters[8] = LIBSPID_CONFIG_DELIMITER " \t";
#ifdef USE_LOCK
diff --git a/cleopatre/application/libspid/src/image.c b/cleopatre/application/libspid/src/image.c
index 6a3fd9051d..9994c53619 100644
--- a/cleopatre/application/libspid/src/image.c
+++ b/cleopatre/application/libspid/src/image.c
@@ -64,7 +64,7 @@ libspid_error_t libspid_image_get_desc(libspid_image_desc_type_t type, spidcom_i
return LIBSPID_ERROR_PARAM;
}
- if ( (type < 0) || (type >= LIBSPID_IMAGE_DESC_TYPE_NB) )
+ if ( (type >= LIBSPID_IMAGE_DESC_TYPE_NB) )
{
return LIBSPID_ERROR_PARAM;
}
@@ -121,8 +121,8 @@ libspid_error_t libspid_image_get_desc(libspid_image_desc_type_t type, spidcom_i
}
/* get image descriptor infos from both MTD */
- if ( (read(fd0, &image_desc_temp[0], sizeof(spidcom_image_desc_t)) < sizeof(spidcom_image_desc_t))
- || ( nvram.nb_images > 1 && ( read(fd1, &image_desc_temp[1], sizeof(spidcom_image_desc_t)) < sizeof(spidcom_image_desc_t) ) ) )
+ if ( (read(fd0, &image_desc_temp[0], sizeof(spidcom_image_desc_t)) < (int)sizeof(spidcom_image_desc_t))
+ || ( nvram.nb_images > 1 && ( read(fd1, &image_desc_temp[1], sizeof(spidcom_image_desc_t)) < (int)sizeof(spidcom_image_desc_t) ) ) )
{
close(fd0);
if (nvram.nb_images > 1)
@@ -297,7 +297,7 @@ libspid_error_t libspid_image_select(libspid_image_select_t select)
} meminfo;
#endif /* __UTESTS__ */
- if ( (select < LIBSPID_IMAGE_SELECT_0) || (select >= LIBSPID_IMAGE_SELECT_NB) )
+ if ( (select >= LIBSPID_IMAGE_SELECT_NB) )
{
return LIBSPID_ERROR_PARAM;
}
diff --git a/cleopatre/application/libspid/src/misc.c b/cleopatre/application/libspid/src/misc.c
index ec3183c659..78ed360dce 100644
--- a/cleopatre/application/libspid/src/misc.c
+++ b/cleopatre/application/libspid/src/misc.c
@@ -92,7 +92,7 @@ libspid_error_t libspid_mac_bin_to_str(const unsigned char *bin, char *str)
libspid_error_t
libspid_hexstring_to_binary (const char* hex_string, unsigned char *binary, unsigned int binary_length)
{
- int i;
+ unsigned int i;
char hexa[binary_length / 2];
/* Check input parameters */
@@ -126,7 +126,7 @@ libspid_hexstring_to_binary (const char* hex_string, unsigned char *binary, unsi
libspid_error_t
libspid_binary_to_hexstring (const unsigned char *binary, unsigned int binary_length, char *hex_string)
{
- int i;
+ unsigned int i;
/* Check input parameters */
if ((NULL == binary) || (NULL == hex_string))
diff --git a/cleopatre/application/libspid/src/secu.c b/cleopatre/application/libspid/src/secu.c
index 397e359704..d2be8eb2b8 100644
--- a/cleopatre/application/libspid/src/secu.c
+++ b/cleopatre/application/libspid/src/secu.c
@@ -97,7 +97,7 @@ libspid_error_t libspid_secu_pbkdf1 (const unsigned char input[], const unsigned
/* Check parameters. */
if((NULL == input) || (0 == input_length)
- || (salt_type < 0) || (salt_type >= LIBSPID_SECU_SALT_TYPE_NB)
+ || (salt_type >= LIBSPID_SECU_SALT_TYPE_NB)
|| (0 == it_count) || (NULL == output) || (0 == output_length))
{
return LIBSPID_ERROR_PARAM;
diff --git a/cleopatre/application/libspid/src/system.c b/cleopatre/application/libspid/src/system.c
index ee5752bffa..5c0c8a83ee 100644
--- a/cleopatre/application/libspid/src/system.c
+++ b/cleopatre/application/libspid/src/system.c
@@ -167,7 +167,7 @@ libspid_error_t libspid_system_get_kernel_version(char *buffer, int buffer_len)
/* check for buffer overload */
len = strlen(line_buffer);
total += len;
- if (total > buffer_len)
+ if (total > (unsigned int)buffer_len)
return LIBSPID_ERROR_NO_SPACE;
strcat(buffer, line_buffer);
@@ -304,7 +304,7 @@ libspid_error_t libspid_system_get_meminfo(char *buffer, int buffer_len)
/* check for buffer overload */
len = strlen(line_buffer);
total += len;
- if (total > buffer_len)
+ if (total > (unsigned int)buffer_len)
return LIBSPID_ERROR_NO_SPACE;
strcat(buffer, line_buffer);
@@ -503,7 +503,7 @@ libspid_error_t libspid_system_get_nvram(spc300_nvram_t *nvram)
return LIBSPID_ERROR_SYSTEM;
}
- if( read(fd, nvram, sizeof(spc300_nvram_t)) < sizeof(spc300_nvram_t) )
+ if( read(fd, nvram, sizeof(spc300_nvram_t)) < (int)sizeof(spc300_nvram_t) )
{
close(fd);
return LIBSPID_ERROR_SYSTEM;