From 193e173765f9ef1b417df0e696704df94fa5aec0 Mon Sep 17 00:00:00 2001 From: Tzafrir Cohen Date: Tue, 20 Mar 2012 06:27:21 +0000 Subject: xpp: fix build warnings Unlike original: also fixed fpga_load. Signed-off-by: Tzafrir Cohen Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=10543 git-svn-id: http://svn.asterisk.org/svn/dahdi/tools/branches/2.6@10548 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- xpp/astribank_allow.c | 2 +- xpp/astribank_license.c | 3 ++- xpp/echo_loader.c | 4 +--- xpp/fpga_load.c | 11 ++++------- xpp/xtalk/xtalk.c | 5 +++-- 5 files changed, 11 insertions(+), 14 deletions(-) diff --git a/xpp/astribank_allow.c b/xpp/astribank_allow.c index 39b7521..8f1ea92 100644 --- a/xpp/astribank_allow.c +++ b/xpp/astribank_allow.c @@ -142,7 +142,7 @@ int main(int argc, char *argv[]) return 1; } if (do_write) { - int used_marker; + unsigned int used_marker; /* update capabilities based on input file */ file = stdin; if (filename) { diff --git a/xpp/astribank_license.c b/xpp/astribank_license.c index 8eeb7c2..93c0d26 100644 --- a/xpp/astribank_license.c +++ b/xpp/astribank_license.c @@ -22,6 +22,7 @@ #include #include +#include #include #include #include "astribank_license.h" @@ -230,7 +231,7 @@ int read_from_file( char buf[256]; char *line, *key, *value; int lineno = 0; - unsigned int license_marker_begin; + unsigned int license_marker_begin = 0; unsigned int license_marker_end; struct table { struct eeprom_table eeprom_table; diff --git a/xpp/echo_loader.c b/xpp/echo_loader.c index 8077b0a..17ab108 100644 --- a/xpp/echo_loader.c +++ b/xpp/echo_loader.c @@ -123,7 +123,7 @@ static void usb_buffer_showstatistics(struct astribank_device *astribank, struct long usec; usec = usb_buffer_usec(ub); - AB_INFO(astribank, "Octasic statistics: packet_size=[%d, %ld, %d] packets=%d, bytes=%ld msec=%ld usec/packet=%d\n", + AB_INFO(astribank, "Octasic statistics: packet_size=[%d, %ld, %d] packets=%d, bytes=%ld msec=%ld usec/packet=%ld\n", ub->min_send, ub->total_bytes / ub->num_sends, ub->max_send, @@ -801,9 +801,7 @@ UINT32 init_octasic(char *filename, struct astribank_device *astribank, int is_a int load_echo(struct astribank_device *astribank, char *filename, int is_alaw) { - int iLen; int ret; - unsigned char *pbyFileData = NULL; UINT32 octasic_status; AB_INFO(astribank, "Loading ECHOCAN Firmware: %s (%s)\n", diff --git a/xpp/fpga_load.c b/xpp/fpga_load.c index e120b26..650ff00 100644 --- a/xpp/fpga_load.c +++ b/xpp/fpga_load.c @@ -557,7 +557,6 @@ int match_usb_device_identity(const struct usb_config_descriptor *config_desc, const struct astribank_type *my_usb_device_identify(const char devpath[], struct my_usb_device *mydev) { - struct usb_device_descriptor *dev_desc; struct usb_config_descriptor *config_desc; int i; @@ -570,7 +569,6 @@ const struct astribank_type *my_usb_device_identify(const char devpath[], struct ERR("Bailing out\n"); return 0; } - dev_desc = &mydev->dev->descriptor; config_desc = mydev->dev->config; for(i = 0; i < sizeof(astribank_types)/sizeof(astribank_types[0]); i++) { if(match_usb_device_identity(config_desc, &astribank_types[i])) { @@ -592,7 +590,6 @@ int my_usb_device_init(const char devpath[], struct my_usb_device *mydev, const struct usb_interface *interface; struct usb_interface_descriptor *iface_desc; struct usb_endpoint_descriptor *endpoint; - int ret; int i; assert(mydev != NULL); @@ -638,10 +635,10 @@ int my_usb_device_init(const char devpath[], struct my_usb_device *mydev, const mydev->abtype = abtype; mydev->my_ep_in = abtype->my_ep_in; mydev->my_ep_out = abtype->my_ep_out; - ret = get_usb_string(mydev->iManufacturer, BUFSIZ, dev_desc->iManufacturer, mydev->handle); - ret = get_usb_string(mydev->iProduct, BUFSIZ, dev_desc->iProduct, mydev->handle); - ret = get_usb_string(mydev->iSerialNumber, BUFSIZ, dev_desc->iSerialNumber, mydev->handle); - ret = get_usb_string(mydev->iInterface, BUFSIZ, iface_desc->iInterface, mydev->handle); + get_usb_string(mydev->iManufacturer, BUFSIZ, dev_desc->iManufacturer, mydev->handle); + get_usb_string(mydev->iProduct, BUFSIZ, dev_desc->iProduct, mydev->handle); + get_usb_string(mydev->iSerialNumber, BUFSIZ, dev_desc->iSerialNumber, mydev->handle); + get_usb_string(mydev->iInterface, BUFSIZ, iface_desc->iInterface, mydev->handle); INFO("ID=%04X:%04X Manufacturer=[%s] Product=[%s] SerialNumber=[%s] Interface=[%s]\n", dev_desc->idVendor, dev_desc->idProduct, diff --git a/xpp/xtalk/xtalk.c b/xpp/xtalk/xtalk.c index d3da5e0..7bfd359 100644 --- a/xpp/xtalk/xtalk.c +++ b/xpp/xtalk/xtalk.c @@ -243,16 +243,17 @@ static int send_command(struct xtalk_device *xtalk_dev, struct xtalk_command *cm { int ret; int len; - char *buf; void *priv = xtalk_dev->transport_priv; len = cmd->header.len; cmd->header.seq = xtalk_dev->tx_sequenceno; - buf = (char *)cmd; //printf("%s: len=%d\n", __FUNCTION__, len); #if 0 extern FILE *fp; + char *buf; + + buf = (char *)cmd; if(fp) { int i; -- cgit v1.2.3