port libftdi to libusb-1.0 branch, master, updated. v0.17-215-gae6585f

[libftdi-git@xxxxxxxxxxxxxxxxxxxxxxx]

The branch, master has been updated
       via  ae6585f123e199bf57cff9074e46211e16f57cd4 (commit)
      from  6e10ece95e23c0a46efeeac556374bc32b73b4f5 (commit)


- Log -----------------------------------------------------------------
commit ae6585f123e199bf57cff9074e46211e16f57cd4
Author: Uwe Bonnes <bon@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date:   Tue Jun 21 16:14:01 2011 +0200

    1.0/examples/stream_test: Fix memory leakage pathes

-----------------------------------------------------------------------

Summary of changes:
 examples/stream_test.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/examples/stream_test.c b/examples/stream_test.c
index f8d024e..c510b74 100644
--- a/examples/stream_test.c
+++ b/examples/stream_test.c
@@ -181,12 +181,14 @@ int main(int argc, char **argv)
    if (ftdi_set_interface(&ftdic, INTERFACE_A) < 0)
    {
        fprintf(stderr, "ftdi_set_interface failed\n");
+       ftdi_deinit(&ftdic);
        return EXIT_FAILURE;
    }
    
    if (ftdi_usb_open_desc(&ftdic, 0x0403, 0x6010, descstring, NULL) < 0)
    {
        fprintf(stderr,"Can't open ftdi device: 
%s\n",ftdi_get_error_string(&ftdic));
+       ftdi_deinit(&ftdic);
        return EXIT_FAILURE;
    }
    
@@ -194,6 +196,8 @@ int main(int argc, char **argv)
    if(ftdi_set_latency_timer(&ftdic, 2))
    {
        fprintf(stderr,"Can't set latency, Error 
%s\n",ftdi_get_error_string(&ftdic));
+       ftdi_usb_close(&ftdic);
+       ftdi_deinit(&ftdic);
        return EXIT_FAILURE;
    }
    
@@ -223,6 +227,8 @@ int main(int argc, char **argv)
    if (ftdi_set_bitmode(&ftdic,  0xff, BITMODE_RESET) < 0)
    {
        fprintf(stderr,"Can't set synchronous fifo mode, Error 
%s\n",ftdi_get_error_string(&ftdic));
+       ftdi_usb_close(&ftdic);
+       ftdi_deinit(&ftdic);
        return EXIT_FAILURE;
    }
    ftdi_usb_close(&ftdic);
@@ -233,6 +239,8 @@ int main(int argc, char **argv)
        if ((outputFile = fopen(outfile,"r")) == 0)
        {
            fprintf(stderr,"Can't open logfile %s, Error %s\n", outfile, 
strerror(errno));
+           ftdi_usb_close(&ftdic);
+           ftdi_deinit(&ftdic);
            return EXIT_FAILURE;
        }
        check_outfile(descstring);


hooks/post-receive
-- 
port libftdi to libusb-1.0

--
libftdi-git - see http://www.intra2net.com/en/developer/libftdi for details.
To unsubscribe send a mail to libftdi-git+unsubscribe@xxxxxxxxxxxxxxxxxxxxxxx