tests: modify rtpoll-test to use 'check' framework

[pulseaudio] / src / tests / stripnul.c

diff --git a/src/tests/stripnul.c b/src/tests/stripnul.c
index 2f87e877631bbf6a48c2f16b28e49a8609cd01d6..d677ad2029a500cb96a533cbee1e2924f89bfc13 100644 (file)
--- a/src/tests/stripnul.c
+++ b/src/tests/stripnul.c
@@ -1,11 +1,9 @@
-/* $Id$ */
-

 /***
   This file is part of PulseAudio.
 
   PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
 /***
   This file is part of PulseAudio.
 
   PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published

-  by the Free Software Foundation; either version 2 of the License,
+  by the Free Software Foundation; either version 2.1 of the License,

   or (at your option) any later version.
 
   PulseAudio is distributed in the hope that it will be useful, but
   or (at your option) any later version.
 
   PulseAudio is distributed in the hope that it will be useful, but


@@ -33,11 +31,11 @@
 int main(int argc, char *argv[]) {
     FILE *i, *o;
     size_t granularity;
 int main(int argc, char *argv[]) {
     FILE *i, *o;
     size_t granularity;

-    pa_bool_t found;
+    pa_bool_t found = FALSE;

     uint8_t *zero;
 
     pa_assert_se(argc >= 2);
     uint8_t *zero;
 
     pa_assert_se(argc >= 2);

-    pa_assert_se((granularity = atoi(argv[1])) >= 1);
+    pa_assert_se((granularity = (size_t) atoi(argv[1])) >= 1);

     pa_assert_se((i = (argc >= 3) ? fopen(argv[2], "r") : stdin));
     pa_assert_se((o = (argc >= 4) ? fopen(argv[3], "w") : stdout));
 
     pa_assert_se((i = (argc >= 3) ? fopen(argv[2], "r") : stdin));
     pa_assert_se((o = (argc >= 4) ? fopen(argv[3], "w") : stdout));
 


@@ -55,11 +53,11 @@ int main(int argc, char *argv[]) {
         if (found)
             pa_assert_se(fwrite(buffer, granularity, k, o) == k);
         else {
         if (found)
             pa_assert_se(fwrite(buffer, granularity, k, o) == k);
         else {

-            for (p = buffer; (p-buffer)/granularity < k; p += granularity)
+            for (p = buffer; ((size_t) (p-buffer)/granularity) < k; p += granularity)

                 if (memcmp(p, zero, granularity)) {
                     size_t left;
                     found = TRUE;
                 if (memcmp(p, zero, granularity)) {
                     size_t left;
                     found = TRUE;

-                    left = k - (p-buffer)/granularity;
+                    left = (size_t) (k - (size_t) (p-buffer)/granularity);

                     pa_assert_se(fwrite(p, granularity, left, o) == left);
                     break;
                 }
                     pa_assert_se(fwrite(p, granularity, left, o) == left);
                     break;
                 }