port libftdi to libusb-1.0 branch, master, updated. v0.17-43-g36335b9

[libftdi-git@xxxxxxxxxxxxxxxxxxxxxxx]

The branch, master has been updated
       via  36335b9279fcb28e2eec4f7b6493a7e599e5fbf4 (commit)
      from  f505134f82e9f8f34009cfe76a2ea436d92e220a (commit)


- Log -----------------------------------------------------------------
commit 36335b9279fcb28e2eec4f7b6493a7e599e5fbf4
Author: Uwe Bonnes <bon@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date:   Wed Sep 8 11:58:03 2010 +0200

    stream_test.c cleanup

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

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

diff --git a/examples/stream_test.c b/examples/stream_test.c
index b404c09..cdafdbe 100644
--- a/examples/stream_test.c
+++ b/examples/stream_test.c
@@ -46,10 +46,10 @@ static void
 usage(const char *argv0)
 {
    fprintf(stderr,
-           "Usage: %s [tions...] \n"
+           "Usage: %s [options...] \n"
            "Test streaming read from FT2232H\n"
-           "[-P string] only look for product with given string"
-           "[-n] don't check for special block structure"
+           "[-P string] only look for product with given string\n"
+           "[-n] don't check for special block structure\n"
            "\n"
            "If some filename is given, write data read to that file\n"
            "Progess information is printed each second\n"
@@ -57,7 +57,7 @@ usage(const char *argv0)
            "\n"
            "Options:\n"
            "\n"
-           "Copyright (C) 2009 Micah Dowty <micah@xxxxxxx>\n",
+           "Copyright (C) 2009 Micah Dowty <micah@xxxxxxx>\n"
            "Adapted for use with libftdi (C) 2010 Uwe Bonnes 
<bon@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>\n",
            argv0);
    exit(1);
@@ -83,7 +83,7 @@ readCallback(uint8_t *buffer, int length, FTDIProgressInfo 
*progress, void *user
                if (start && (num != start +0x4000))
                {
                    uint32_t delta = ((num-start)/0x4000)-1;
-                   fprintf(stderr, "Skip %7d blocks from 0x%08x to 0x%08x at 
blocks %10lld \n",
+                   fprintf(stderr, "Skip %7d blocks from 0x%08x to 0x%08x at 
blocks %10ld \n",
                            delta, start -0x4000, num, blocks);
                    n_err++;
                    skips += delta;
@@ -98,7 +98,7 @@ readCallback(uint8_t *buffer, int length, FTDIProgressInfo 
*progress, void *user
                if (start && (num != start +0x4000))
                {
                    uint32_t delta = ((num-start)/0x4000)-1;
-                   fprintf(stderr, "Skip %7d blocks from 0x%08x to 0x%08x at 
blocks %10lld \n",
+                   fprintf(stderr, "Skip %7d blocks from 0x%08x to 0x%08x at 
blocks %10ld \n",
                            delta, start -0x4000, num, blocks);
                    n_err++;
                    skips += delta;
@@ -239,7 +239,7 @@ int main(int argc, char **argv)
        fclose(outputFile);
    }
    else if (check)
-       fprintf(stderr,"%d errors of %lld blocks (%Le), %d (%Le) blocks 
skipped\n",
+       fprintf(stderr,"%d errors of %ld blocks (%Le), %d (%Le) blocks 
skipped\n",
                n_err, blocks, (long double)n_err/(long double) blocks,
                skips, (long double)skips/(long double) blocks);
    exit (0);
@@ -328,7 +328,7 @@ void check_outfile(char *descstring)
             {
                 if(n_shown < 30)
                 {
-                    fprintf(stderr, "Skip %7d blocks from 0x%08x to 0x%08x at 
blocks %10lld \n",
+                    fprintf(stderr, "Skip %7d blocks from 0x%08x to 0x%08x at 
blocks %10ld \n",
                             (nread-start)/0x4000, start -0x4000, nread, 
blocks);
                     n_shown ++;
                 }
@@ -342,9 +342,9 @@ void check_outfile(char *descstring)
             pc = pa;
         }
         if(n_errors)
-            fprintf(stderr, "%d blocks wrong from %lld blocks read\n",
+            fprintf(stderr, "%d blocks wrong from %ld blocks read\n",
                     n_errors, blocks);
         else
-            fprintf(stderr, "%lld blocks all fine\n",blocks);
+            fprintf(stderr, "%ld blocks all fine\n",blocks);
     }
 }


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