summaryrefslogtreecommitdiff
path: root/cleopatre/application/libspid/src/image.c
diff options
context:
space:
mode:
Diffstat (limited to 'cleopatre/application/libspid/src/image.c')
-rw-r--r--cleopatre/application/libspid/src/image.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/cleopatre/application/libspid/src/image.c b/cleopatre/application/libspid/src/image.c
index 970aeafd66..3d42d43ea2 100644
--- a/cleopatre/application/libspid/src/image.c
+++ b/cleopatre/application/libspid/src/image.c
@@ -70,7 +70,7 @@ libspid_image_get_desc (libspid_image_desc_type_t type, spidcom_image_desc_t *im
return LIBSPID_ERROR_PARAM;
}
- if ((type < 0) || (type >= LIBSPID_IMAGE_DESC_TYPE_NB))
+ if (type >= LIBSPID_IMAGE_DESC_TYPE_NB)
{
syslog (LOG_ERR, "%s: type is out-of-range", __FUNCTION__);
return LIBSPID_ERROR_PARAM;
@@ -137,7 +137,8 @@ libspid_image_get_desc (libspid_image_desc_type_t type, spidcom_image_desc_t *im
}
/* 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)
@@ -380,7 +381,7 @@ 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)
{
syslog (LOG_ERR, "%s: argument is out-of-range", __FUNCTION__);
return LIBSPID_ERROR_PARAM;