X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=test%2Ftstnmem.c;h=72677443be0dfeed9677bb9c33b00e72dd193fca;hp=0949749e4063839332e5c554cddaee01648f6678;hb=88d3bedf772316f87e1996f655ccf8d1e2589755;hpb=fb6d99a0c7e07d9cc4a315c447deaf6564a85505

diff --git a/test/tstnmem.c b/test/tstnmem.c
index 0949749..7267744 100644
--- a/test/tstnmem.c
+++ b/test/tstnmem.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2010 Index Data
  * See the file LICENSE for details.
- *
- * $Id: tstnmem.c,v 1.5 2005-06-25 15:46:07 adam Exp $
  */
 
 #if HAVE_CONFIG_H
@@ -15,22 +13,21 @@
 #include <ctype.h>
 
 #include <yaz/nmem.h>
+#include <yaz/test.h>
 
-int main (int argc, char **argv)
+void tst(void)
 {
-    void *cp;
     NMEM n;
     int j;
+    char *cp;
 
-    nmem_init();
     n = nmem_create();
-    if (!n)
-        exit (1);
+    YAZ_CHECK(n);
+
     for (j = 1; j<500; j++)
     {
-        cp = nmem_malloc(n, j);
-        if (!cp)
-            exit(2);
+        cp = (char *) nmem_malloc(n, j);
+        YAZ_CHECK(cp);
         if (sizeof(long) >= j)
             *(long*) cp = 123L;
 #if HAVE_LONG_LONG
@@ -43,17 +40,22 @@ int main (int argc, char **argv)
     
     for (j = 2000; j<20000; j+= 2000)
     {
-        cp = nmem_malloc(n, j);
-        if (!cp)
-            exit(3);
+        cp = (char *) nmem_malloc(n, j);
+        YAZ_CHECK(cp);
     }
     nmem_destroy(n);
-    nmem_exit();
-    exit(0);
+}
+
+int main (int argc, char **argv)
+{
+    YAZ_CHECK_INIT(argc, argv);
+    tst();
+    YAZ_CHECK_TERM;
 }
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab