X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Ftest-compress-benchmark.c;h=c8e5b76c6ce29e234d8a8d2b2e6c7602e6ed9864;hb=c85770ad84af4bcaace5055147d53da6fe28ef9a;hp=0a23bd1e131d5e9c161c90576471e271cabe5bb8;hpb=fd53fee04b1f1c1ca1e30e8d470d7416900a35dc;p=elogind.git

diff --git a/src/journal/test-compress-benchmark.c b/src/journal/test-compress-benchmark.c
index 0a23bd1e1..c8e5b76c6 100644
--- a/src/journal/test-compress-benchmark.c
+++ b/src/journal/test-compress-benchmark.c
@@ -21,9 +21,9 @@
 #include "util.h"
 #include "macro.h"
 
-typedef int (compress_t)(const void *src, uint64_t src_size, void *dst, uint64_t *dst_size);
+typedef int (compress_t)(const void *src, uint64_t src_size, void *dst, size_t *dst_size);
 typedef int (decompress_t)(const void *src, uint64_t src_size,
-                           void **dst, uint64_t *dst_alloc_size, uint64_t* dst_size, uint64_t dst_max);
+                           void **dst, size_t *dst_alloc_size, size_t* dst_size, size_t dst_max);
 
 #define MAX_SIZE (1024*1024LU)
 
@@ -32,7 +32,7 @@ static char* make_buf(size_t count) {
         size_t i;
 
         buf = malloc(count);
-        assert(buf);
+        assert_se(buf);
 
         for (i = 0; i < count; i++)
                 buf[i] = 'a' + i % ('z' - 'a' + 1);
@@ -42,7 +42,7 @@ static char* make_buf(size_t count) {
 
 static void test_compress_decompress(const char* label,
                                      compress_t compress, decompress_t decompress) {
-        usec_t n, n2;
+        usec_t n, n2 = 0;
         float dt;
 
         _cleanup_free_ char *text, *buf;
@@ -52,7 +52,7 @@ static void test_compress_decompress(const char* label,
 
         text = make_buf(MAX_SIZE);
         buf = calloc(MAX_SIZE + 1, 1);
-        assert(text && buf);
+        assert_se(text && buf);
 
         n = now(CLOCK_MONOTONIC);
 
@@ -61,25 +61,25 @@ static void test_compress_decompress(const char* label,
                 int r;
 
                 r = compress(text, i, buf, &j);
-                /* assume compresion must be succesful except for small inputs */
-                assert(r == 0 || (i < 2048 && r == -ENOBUFS));
+                /* assume compression must be successful except for small inputs */
+                assert_se(r == 0 || (i < 2048 && r == -ENOBUFS));
                 /* check for overwrites */
-                assert(buf[i] == 0);
+                assert_se(buf[i] == 0);
                 if (r != 0) {
                         skipped += i;
                         continue;
                 }
 
-                assert(j > 0);
+                assert_se(j > 0);
                 if (j >= i)
                         log_error("%s \"compressed\" %zu -> %zu", label, i, j);
 
                 r = decompress(buf, j, &buf2, &buf2_allocated, &k, 0);
-                assert(r == 0);
-                assert(buf2_allocated >= k);
-                assert(k == i);
+                assert_se(r == 0);
+                assert_se(buf2_allocated >= k);
+                assert_se(k == i);
 
-                assert(memcmp(text, buf2, i) == 0);
+                assert_se(memcmp(text, buf2, i) == 0);
 
                 total += i;
                 compressed += j;