port libftdi to libusb-1.0 branch, master, updated. v0.17-31-g604ec22

[libftdi-git@xxxxxxxxxxxxxxxxxxxxxxx]

The branch, master has been updated
       via  604ec22bb3844196da13a3dca71d930c3623d8e7 (commit)
      from  02212d8e84cccd393a95612d4c4a5ec495fa3e2e (commit)


- Log -----------------------------------------------------------------
commit 604ec22bb3844196da13a3dca71d930c3623d8e7
Author: Emmanuel Blot <eblot@xxxxxxxxxxxxxxxxxx>
Date:   Sat Jun 19 22:43:48 2010 +0200

    Fix up string formatting for long long integers (64 bits)

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

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

diff --git a/examples/stream_test.c b/examples/stream_test.c
index 2c552e6..b404c09 100644
--- a/examples/stream_test.c
+++ b/examples/stream_test.c
@@ -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 %10ld \n",
+                   fprintf(stderr, "Skip %7d blocks from 0x%08x to 0x%08x at 
blocks %10lld \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 %10ld \n",
+                   fprintf(stderr, "Skip %7d blocks from 0x%08x to 0x%08x at 
blocks %10lld \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 %ld blocks (%Le), %d (%Le) blocks 
skipped\n",
+       fprintf(stderr,"%d errors of %lld 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 %10ld \n",
+                    fprintf(stderr, "Skip %7d blocks from 0x%08x to 0x%08x at 
blocks %10lld \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 %ld blocks read\n",
+            fprintf(stderr, "%d blocks wrong from %lld blocks read\n",
                     n_errors, blocks);
         else
-            fprintf(stderr, "%ld blocks all fine\n",blocks);
+            fprintf(stderr, "%lld 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