summaryrefslogtreecommitdiff
path: root/cleopatre/application/libspid/src/image.c
diff options
context:
space:
mode:
authorCeline Buret2011-12-23 18:51:12 +0100
committerCeline Buret2011-12-23 18:51:12 +0100
commit4a195dc3b04f8a9c67ea6a0c1902dd31e23355d7 (patch)
tree2b69b5393e7b8167ee78dad624449650008a588a /cleopatre/application/libspid/src/image.c
parent112636d5a37f4024bd954b922a46e887c3d47635 (diff)
parentf5c6b799cdce5b4bb1618f4789bb683efa7967ab (diff)
Merge branch 'master' of pessac:/git/cesar into eoc
Conflicts: cesar/cl/src/cl.c cesar/cp/sta/action/Config cesar/mac/pbproc/src/prep_mpdu.c cesar/test_general/station/cco0/s2/Config cleopatre/Makefile cleopatre/application/libspid/src/config_line.c cleopatre/application/libspid/src/image.c cleopatre/application/libspid/src/misc.c cleopatre/application/libspid/src/system.c cleopatre/application/managerd/inc/vs_mme.h cleopatre/application/managerd/src/managerd.c cleopatre/application/managerd/src/vs_mme.c cleopatre/devkit/plcdrv/arm/src/linux_drv.c cleopatre/devkit/tests/libmme/utests/src/mme_utests.c cleopatre/devkit/tests/libspid/utests/Makefile cleopatre/devkit/tests/libspid/utests/inc/system_utests.h cleopatre/devkit/tests/libspid/utests/src/config_line_utests.c cleopatre/devkit/tests/libspid/utests/src/image_utests.c cleopatre/devkit/tests/libspid/utests/src/system_utests.c cleopatre/devkit/tests/libspid/utests/testfiles/nvram1.tst cleopatre/devkit/tests/libspid/utests/testfiles/nvram2.tst cleopatre/devkit/tests/managerd/ftests/Makefile cleopatre/devkit/tests/managerd/utests/Makefile cleopatre/devkit/tests/managerd/utests/override/src/libmme_stub.c cleopatre/devkit/tests/managerd/utests/override/src/libspid_stub.c cleopatre/devkit/tests/managerd/utests/src/vs_mme_utests.c cleopatre/devkit/tests/plcd/Makefile cleopatre/devkit/tests/utests_makerules cleopatre/linux-2.6.25.10-spc300/arch/arm/boot/Makefile common/tests/tests
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;