X-Git-Url: http://developer.intra2net.com/git/?a=blobdiff_plain;f=examples%2Ffind_all.c;h=2f3b4e2f902d0fed86f13ce90ca40f41a16c5f36;hb=de40c606f2a72bbcb27444c6e3c40debb58c8723;hp=0ee1aa6ea60775207354da803b09a3132c8b38d5;hpb=bf956a005199e0cf446bc39827cd43a3e7aba5fc;p=libftdi

diff --git a/examples/find_all.c b/examples/find_all.c
index 0ee1aa6..2f3b4e2 100644
--- a/examples/find_all.c
+++ b/examples/find_all.c
@@ -6,37 +6,49 @@
 */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <ftdi.h>
 
-int main(int argc, char **argv)
+int main(void)
 {
     int ret, i;
     struct ftdi_context ftdic;
     struct ftdi_device_list *devlist, *curdev;
     char manufacturer[128], description[128];
+    int retval = EXIT_SUCCESS;
 
-    ftdi_init(&ftdic);
+    if (ftdi_init(&ftdic) < 0)
+    {
+        fprintf(stderr, "ftdi_init failed\n");
+        return EXIT_FAILURE;
+    }
 
-    if((ret = ftdi_usb_find_all(&ftdic, &devlist, 0x0403, 0x6001)) < 0) {
+    if ((ret = ftdi_usb_find_all(&ftdic, &devlist, 0x0403, 0x6010)) < 0)
+    {
         fprintf(stderr, "ftdi_usb_find_all failed: %d (%s)\n", ret, ftdi_get_error_string(&ftdic));
-        return EXIT_FAILURE;
+        retval =  EXIT_FAILURE;
+        goto do_deinit;
     }
 
     printf("Number of FTDI devices found: %d\n", ret);
 
     i = 0;
-    for (curdev = devlist; curdev != NULL; i++) {
+    for (curdev = devlist; curdev != NULL; i++)
+    {
         printf("Checking device: %d\n", i);
-        if((ret = ftdi_usb_get_strings(&ftdic, curdev->dev, &manufacturer, 128, description, 128, NULL, 0)) < 0) {
+        if ((ret = ftdi_usb_get_strings(&ftdic, curdev->dev, manufacturer, 128, description, 128, NULL, 0)) < 0)
+        {
             fprintf(stderr, "ftdi_usb_get_strings failed: %d (%s)\n", ret, ftdi_get_error_string(&ftdic));
-            return EXIT_FAILURE;
+            retval = EXIT_FAILURE;
+            goto done;
         }
         printf("Manufacturer: %s, Description: %s\n\n", manufacturer, description);
         curdev = curdev->next;
     }
-
+done:
     ftdi_list_free(&devlist);
+do_deinit:
     ftdi_deinit(&ftdic);
 
-    return EXIT_SUCCESS;
+    return retval;
 }