X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Ftstwrbuf.c;h=af06e40d800b407c2d0cc254717121ea29815b55;hb=055f23ee3692349a03f681ef1a0d5fd70c0cc770;hp=8ac3d0bf8a45698ad699ad94460ef08c8af14299;hpb=c6e47cbbff56f39f6d81b079ebaeac41d793d4d9;p=yaz-moved-to-github.git

diff --git a/test/tstwrbuf.c b/test/tstwrbuf.c
index 8ac3d0b..af06e40 100644
--- a/test/tstwrbuf.c
+++ b/test/tstwrbuf.c
@@ -1,23 +1,30 @@
-/*
- * Copyright (c) 2002-2003, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2010 Index Data
  * See the file LICENSE for details.
- *
- * $Id: tstwrbuf.c,v 1.1 2003-10-27 12:21:38 adam Exp $
  */
 
+#include <stdlib.h>
 #include <stdio.h>
 
 #include <yaz/wrbuf.h>
+#include <yaz/test.h>
 
-int main (int argc, char **argv)
+static void tstwrbuf(void)
 {
     int step;
-    WRBUF wr = wrbuf_alloc();
+    WRBUF wr;
 
-    wrbuf_free(wr, 1);
+    wr = 0;
+    wrbuf_destroy(wr);
+
+    wr = wrbuf_alloc();
+    YAZ_CHECK(wr);
+    wrbuf_destroy(wr);
 
     wr = wrbuf_alloc();
 
+    YAZ_CHECK(wr);
+
     for (step = 1; step < 65; step++)
     {
         int i, j, k;
@@ -34,25 +41,32 @@ int main (int argc, char **argv)
         
         cp = wrbuf_buf(wr);
         len = wrbuf_len(wr);
-        if (len != step * (step-1) / 2)
-        {
-            printf ("tstwrbuf 1 %d len=%d\n", step, len);
-            exit(1);
-        }
+        YAZ_CHECK(len == step * (step-1) / 2);
         k = 0;
         for (j = 1; j<step; j++)
             for (i = 0; i<j; i++)
             {
-                if (cp[k] != i+1)
-                {
-                    printf ("tstwrbuf 2 %d k=%d\n", step, k);
-                    exit(1);
-                }
+                YAZ_CHECK(cp[k] == i+1);
                 k++;
             }
         wrbuf_rewind(wr);
     }
-    wrbuf_free(wr, 1);
-    exit(0);
+    wrbuf_destroy(wr);
 }
 
+int main (int argc, char **argv)
+{
+    YAZ_CHECK_INIT(argc, argv);
+    tstwrbuf();
+    YAZ_CHECK_TERM;
+}
+
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+