Merge branch 'warning_fixes_v5' into sensor_drivers

This commit is contained in:
Lorenz Meier 2014-07-08 13:55:52 +02:00
commit 02ad0f2b91
3 changed files with 4 additions and 3 deletions

@ -1 +1 @@
Subproject commit 3711190d23d9928ea0687e00621c8d9ecf145f50
Subproject commit d1ebe85eb6bb06d0078f3e0b8144adb131263628

View File

@ -161,6 +161,7 @@ static ssize_t at24c_bwrite(FAR struct mtd_dev_s *dev, off_t startblock,
static int at24c_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg);
void at24c_test(void);
int at24c_nuke(void);
/************************************************************************************
* Private Data

View File

@ -63,7 +63,7 @@ static void do_import(const char* param_file_name);
static void do_show(const char* search_string);
static void do_show_print(void *arg, param_t param);
static void do_set(const char* name, const char* val, bool fail_on_not_found);
static void do_compare(const char* name, const char* vals[], unsigned comparisons);
static void do_compare(const char* name, char* vals[], unsigned comparisons);
static void do_reset(void);
static void do_reset_nostart(void);
@ -351,7 +351,7 @@ do_set(const char* name, const char* val, bool fail_on_not_found)
}
static void
do_compare(const char* name, const char* vals[], unsigned comparisons)
do_compare(const char* name, char* vals[], unsigned comparisons)
{
int32_t i;
float f;