The patch below fixes the warnings in the zwave_work_branch. Bug link:
https://sourceforge.net/tracker/?func=detail&aid=3511155&group_id=201579&atid=978127
Fix warnings in the zwave_work_branch. Changes were removing some unused code
and initializing the callback stage (a uint32_t) with 0 instead of NULL.
Signed-off-by: Scott Talbert <s...@techie.net>
Index: concordance/concordance.c
===================================================================
RCS file: /cvsroot/concordance/concordance/concordance/concordance.c,v
retrieving revision 1.41.2.21
diff -u -p -r1.41.2.21 concordance.c
--- concordance/concordance.c 22 Mar 2012 08:50:19 -0000 1.41.2.21
+++ concordance/concordance.c 26 Mar 2012 01:30:34 -0000
@@ -966,9 +966,7 @@ int main(int argc, char *argv[])
{
struct options_t options;
char *file_name;
- int mode, file_mode, err, is_zipfile;
- uint8_t *data, *xml;
- uint32_t data_size, xml_size;
+ int mode, file_mode, err;
#ifdef WIN32
con=GetStdHandle(STD_OUTPUT_HANDLE);
@@ -1016,15 +1014,6 @@ int main(int argc, char *argv[])
}
/*
- * OK, if we have a filename go ahead and read the file...
- */
- data = NULL;
- data_size = 0;
- xml = NULL;
- xml_size = 0;
- is_zipfile = 0;
-
- /*
* Alright, at this point, if there's going to be a filename,
* we have one, so lets read the file.
*/
@@ -1218,9 +1207,6 @@ int main(int argc, char *argv[])
cleanup:
- if (data) {
- delete_blob(data);
- }
delete_opfile_obj();
deinit_concord();
Index: libconcord/libconcord.cpp
===================================================================
RCS file: /cvsroot/concordance/concordance/libconcord/libconcord.cpp,v
retrieving revision 1.42.2.19
diff -u -p -r1.42.2.19 libconcord.cpp
--- libconcord/libconcord.cpp 22 Mar 2012 08:50:20 -0000 1.42.2.19
+++ libconcord/libconcord.cpp 26 Mar 2012 01:30:34 -0000
@@ -589,7 +589,7 @@ int is_fw_update_supported(int direct)
}
void _report_number_of_stages(lc_callback cb, void *cb_arg, int num) {
- cb(LC_CB_STAGE_NUM_STAGES, num, NULL, NULL, NULL, cb_arg);
+ cb(LC_CB_STAGE_NUM_STAGES, num, 0, 0, 0, cb_arg);
}
@@ -700,7 +700,7 @@ int reset_remote(lc_callback cb, void *c
sleep(WAIT_FOR_BOOT_SLEEP);
err = init_concord();
if (err == 0) {
- err = _get_identity(NULL, NULL, NULL);
+ err = _get_identity(NULL, NULL, 0);
if (err == 0) {
break;
}
@@ -1026,7 +1026,7 @@ int _update_configuration_zwave(lc_callb
{
int err;
- if ((err = _write_config_to_remote(cb, cb_arg, NULL))) {
+ if ((err = _write_config_to_remote(cb, cb_arg, 0))) {
return err;
}
Index: libconcord/remote.cpp
===================================================================
RCS file: /cvsroot/concordance/concordance/libconcord/remote.cpp,v
retrieving revision 1.40.2.8
diff -u -p -r1.40.2.8 remote.cpp
--- libconcord/remote.cpp 22 Mar 2012 08:50:20 -0000 1.40.2.8
+++ libconcord/remote.cpp 26 Mar 2012 01:30:34 -0000
@@ -403,7 +403,7 @@ int CRemote::PrepFirmware(const TRemoteI
cb(cb_stage, 1, 1, 2, LC_CB_COUNTER_TYPE_STEPS, cb_arg);
if ((err = WriteFlash(0x200000, 1, data, ri.protocol, NULL,
- NULL, NULL)))
+ NULL, 0)))
return LC_ERROR;
} else {
/*
@@ -440,7 +440,7 @@ int CRemote::FinishFirmware(const TRemot
if (ri.arch->firmware_update_base == ri.arch->firmware_base) {
data[0] = 0x02;
if ((err = WriteFlash(0x200000, 1, data, ri.protocol, NULL,
- NULL, NULL)))
+ NULL, 0)))
return LC_ERROR;
if (cb)
cb(cb_stage, 1, 1, 3, LC_CB_COUNTER_TYPE_STEPS, cb_arg);
Index: libconcord/remote.h
===================================================================
RCS file: /cvsroot/concordance/concordance/libconcord/remote.h,v
retrieving revision 1.20.2.9
diff -u -p -r1.20.2.9 remote.h
--- libconcord/remote.h 22 Mar 2012 08:50:20 -0000 1.20.2.9
+++ libconcord/remote.h 26 Mar 2012 01:30:34 -0000
@@ -158,39 +158,39 @@ public:
virtual int Reset(uint8_t kind)=0;
virtual int GetIdentity(TRemoteInfo &ri, struct THIDINFO &hid,
lc_callback cb=NULL, void *cb_arg=NULL,
- uint32_t cb_stage=NULL)=0;
+ uint32_t cb_stage=0)=0;
virtual int ReadFlash(uint32_t addr, const uint32_t len, uint8_t *rd,
unsigned int protocol, bool verify=false,
- lc_callback cb=NULL, void *cb_arg=NULL, uint32_t
cb_stage=NULL)=0;
+ lc_callback cb=NULL, void *cb_arg=NULL, uint32_t cb_stage=0)=0;
virtual int InvalidateFlash(lc_callback cb=NULL, void *cb_arg=NULL,
- uint32_t cb_stage=NULL)=0;
+ uint32_t cb_stage=0)=0;
virtual int EraseFlash(uint32_t addr, uint32_t len,
const TRemoteInfo &ri, lc_callback cb=NULL,
- void *cb_arg=NULL, uint32_t cb_stage=NULL)=0;
+ void *cb_arg=NULL, uint32_t cb_stage=0)=0;
virtual int WriteFlash(uint32_t addr, const uint32_t len,
const uint8_t *wr, unsigned int protocol, lc_callback cb=NULL,
- void *cb_arg=NULL, uint32_t cb_stage=NULL)=0;
+ void *cb_arg=NULL, uint32_t cb_stage=0)=0;
virtual int WriteRam(uint32_t addr, const uint32_t len, uint8_t *wr)=0;
virtual int ReadRam(uint32_t addr, const uint32_t len, uint8_t *rd)=0;
virtual int PrepFirmware(const TRemoteInfo &ri, lc_callback cb=NULL,
- void *cb_arg=NULL, uint32_t cb_stage=NULL) = 0;
+ void *cb_arg=NULL, uint32_t cb_stage=0) = 0;
virtual int FinishFirmware(const TRemoteInfo &ri, lc_callback cb=NULL,
- void *cb_arg=NULL, uint32_t cb_stage=NULL) = 0;
+ void *cb_arg=NULL, uint32_t cb_stage=0) = 0;
virtual int PrepConfig(const TRemoteInfo &ri, lc_callback cb=NULL,
- void *cb_arg=NULL, uint32_t cb_stage=NULL)=0;
+ void *cb_arg=NULL, uint32_t cb_stage=0)=0;
virtual int FinishConfig(const TRemoteInfo &ri, lc_callback cb=NULL,
- void *cb_arg=NULL, uint32_t cb_stage=NULL)=0;
+ void *cb_arg=NULL, uint32_t cb_stage=0)=0;
virtual int UpdateConfig(const uint32_t len,
const uint8_t *wr, lc_callback cb, void *cb_arg,
uint32_t cb_stage)=0;
virtual int GetTime(const TRemoteInfo &ri, THarmonyTime &ht)=0;
virtual int SetTime(const TRemoteInfo &ri, const THarmonyTime &ht,
lc_callback cb=NULL, void *cb_arg=NULL,
- uint32_t cb_stage=NULL)=0;
+ uint32_t cb_stage=0)=0;
virtual int LearnIR(uint32_t *freq, uint32_t **ir_signal,
uint32_t *ir_signal_length, lc_callback cb=NULL,
- void *cb_arg=NULL, uint32_t cb_stage=NULL)=0;
+ void *cb_arg=NULL, uint32_t cb_stage=0)=0;
virtual int IsZRemote()=0;
virtual int IsUSBNet()=0;
};
@@ -212,39 +212,39 @@ public:
virtual ~CRemote() {};
int Reset(uint8_t kind);
int GetIdentity(struct TRemoteInfo &ri, struct THIDINFO &hid,
- lc_callback cb=NULL, void *cb_arg=NULL, uint32_t cb_stage=NULL);
+ lc_callback cb=NULL, void *cb_arg=NULL, uint32_t cb_stage=0);
int ReadFlash(uint32_t addr, const uint32_t len, uint8_t *rd,
unsigned int protocol, bool verify=false,
- lc_callback cb=NULL, void *cb_arg=NULL, uint32_t cb_stage=NULL);
+ lc_callback cb=NULL, void *cb_arg=NULL, uint32_t cb_stage=0);
int InvalidateFlash(lc_callback cb=NULL, void *cb_arg=NULL,
- uint32_t cb_stage=NULL);
+ uint32_t cb_stage=0);
int EraseFlash(uint32_t addr, uint32_t len, const TRemoteInfo &ri,
- lc_callback cb=NULL, void *cb_arg=NULL, uint32_t cb_stage=NULL);
+ lc_callback cb=NULL, void *cb_arg=NULL, uint32_t cb_stage=0);
int WriteFlash(uint32_t addr, const uint32_t len, const uint8_t *wr,
unsigned int protocol, lc_callback cb=NULL, void *cb_arg=NULL,
- uint32_t cb_stage=NULL);
+ uint32_t cb_stage=0);
int WriteRam(uint32_t addr, const uint32_t len, uint8_t *wr);
int ReadRam(uint32_t addr, const uint32_t len, uint8_t *rd);
int PrepFirmware(const TRemoteInfo &ri, lc_callback cb=NULL,
- void *cb_arg=NULL, uint32_t cb_stage=NULL);
+ void *cb_arg=NULL, uint32_t cb_stage=0);
int FinishFirmware(const TRemoteInfo &ri, lc_callback cb=NULL,
- void *cb_arg=NULL, uint32_t cb_stage=NULL);
+ void *cb_arg=NULL, uint32_t cb_stage=0);
int PrepConfig(const TRemoteInfo &ri, lc_callback cb=NULL,
- void *cb_arg=NULL, uint32_t cb_stage=NULL);
+ void *cb_arg=NULL, uint32_t cb_stage=0);
int FinishConfig(const TRemoteInfo &ri, lc_callback cb=NULL,
- void *cb_arg=NULL, uint32_t cb_stage=NULL);
+ void *cb_arg=NULL, uint32_t cb_stage=0);
virtual int UpdateConfig(const uint32_t len,
const uint8_t *wr, lc_callback cb, void *cb_arg,
- uint32_t cb_stage=NULL) {};
+ uint32_t cb_stage=0) {};
int GetTime(const TRemoteInfo &ri, THarmonyTime &ht);
int SetTime(const TRemoteInfo &ri, const THarmonyTime &ht,
- lc_callback cb=NULL, void *cb_arg=NULL, uint32_t cb_stage=NULL);
+ lc_callback cb=NULL, void *cb_arg=NULL, uint32_t cb_stage=0);
int LearnIR(uint32_t *freq, uint32_t **ir_signal,
uint32_t *ir_signal_length, lc_callback cb=NULL,
- void *cb_arg=NULL, uint32_t cb_stage=NULL);
+ void *cb_arg=NULL, uint32_t cb_stage=0);
int IsZRemote() {return false;}
int IsUSBNet() {return false;}
};
@@ -269,36 +269,36 @@ public:
virtual ~CRemoteZ_Base() {};
int Reset(uint8_t kind);
int GetIdentity(struct TRemoteInfo &ri, struct THIDINFO &hid,
- lc_callback cb=NULL, void *cb_arg=NULL, uint32_t cb_stage=NULL);
+ lc_callback cb=NULL, void *cb_arg=NULL, uint32_t cb_stage=0);
int ReadFlash(uint32_t addr, const uint32_t len, uint8_t *rd,
unsigned int protocol, bool verify=false,
- lc_callback cb=NULL, void *cb_arg=NULL, uint32_t cb_stage=NULL);
+ lc_callback cb=NULL, void *cb_arg=NULL, uint32_t cb_stage=0);
int InvalidateFlash(lc_callback cb=NULL, void *cb_arg=NULL,
- uint32_t cb_stage=NULL);
+ uint32_t cb_stage=0);
int EraseFlash(uint32_t addr, uint32_t len, const TRemoteInfo &ri,
- lc_callback cb=NULL, void *cb_arg=NULL, uint32_t cb_stage=NULL);
+ lc_callback cb=NULL, void *cb_arg=NULL, uint32_t cb_stage=0);
int WriteFlash(uint32_t addr, const uint32_t len, const uint8_t *wr,
unsigned int protocol, lc_callback cb=NULL, void *cb_arg=NULL,
- uint32_t cb_stage=NULL);
+ uint32_t cb_stage=0);
int WriteRam(uint32_t addr, const uint32_t len, uint8_t *wr);
int ReadRam(uint32_t addr, const uint32_t len, uint8_t *rd);
int PrepFirmware(const TRemoteInfo &ri, lc_callback cb=NULL,
- void *cb_arg=NULL, uint32_t cb_stage=NULL);
+ void *cb_arg=NULL, uint32_t cb_stage=0);
int FinishFirmware(const TRemoteInfo &ri, lc_callback cb=NULL,
- void *cb_arg=NULL, uint32_t cb_stage=NULL);
+ void *cb_arg=NULL, uint32_t cb_stage=0);
int PrepConfig(const TRemoteInfo &ri, lc_callback cb=NULL,
- void *cb_arg=NULL, uint32_t cb_stage=NULL);
+ void *cb_arg=NULL, uint32_t cb_stage=0);
int FinishConfig(const TRemoteInfo &ri, lc_callback cb=NULL,
- void *cb_arg=NULL, uint32_t cb_stage=NULL);
+ void *cb_arg=NULL, uint32_t cb_stage=0);
int GetTime(const TRemoteInfo &ri, THarmonyTime &ht);
int SetTime(const TRemoteInfo &ri, const THarmonyTime &ht,
- lc_callback cb=NULL, void *cb_arg=NULL, uint32_t cb_stage=NULL);
+ lc_callback cb=NULL, void *cb_arg=NULL, uint32_t cb_stage=0);
int LearnIR(uint32_t *freq, uint32_t **ir_signal,
uint32_t *ir_signal_length, lc_callback cb=NULL,
- void *cb_arg=NULL, uint32_t cb_stage=NULL);
+ void *cb_arg=NULL, uint32_t cb_stage=0);
int IsZRemote() {return true;}
};
@@ -352,7 +352,7 @@ public:
lc_callback cb, void *cb_arg, uint32_t cb_stage);
int GetTime(const TRemoteInfo &ri, THarmonyTime &ht);
int SetTime(const TRemoteInfo &ri, const THarmonyTime &ht,
- lc_callback cb=NULL, void *cb_arg=NULL, uint32_t cb_stage=NULL);
+ lc_callback cb=NULL, void *cb_arg=NULL, uint32_t cb_stage=0);
int IsUSBNet() {return true;}
};
------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
concordance-devel mailing list
concordance-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/concordance-devel
