changed output to be non-cascarding when using -n switch

[yaz-moved-to-github.git] / test / tstsoap1.c

diff --git a/test/tstsoap1.c b/test/tstsoap1.c
index 6e6833a..11ad088 100644 (file)
--- a/test/tstsoap1.c
+++ b/test/tstsoap1.c
@@ -1,42 +1,55 @@
 /*
- * Copyright (C) 1995-2005, Index Data ApS
+ * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: tstsoap1.c,v 1.4 2005-08-22 20:34:23 adam Exp $
+ * $Id: tstsoap1.c,v 1.9 2007-01-03 08:42:16 adam Exp $
  */
 
 #include <stdlib.h>
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
 #include <libxml/parser.h>
 #endif
+#include <yaz/test.h>
 
-int main(int argc, char **argv)
+void tst(void)
 {
-#if HAVE_XML2
-    LIBXML_TEST_VERSION;
-
-    if (argc <= 1)
-    {
-        xmlChar *buf_out;
-        int len_out;
-        xmlDocPtr doc = xmlNewDoc(BAD_CAST "1.0");
+#if YAZ_HAVE_XML2
+    xmlChar *buf_out;
+    int len_out;
+    xmlDocPtr doc;
+    xmlNodePtr top;
 #if 0
-        const char *val = "jordbær"; /* makes xmlDocDumpMemory hang .. */
+    const char *val = "jordbær"; /* makes xmlDocDumpMemory hang .. */
 #else
-        const char *val = "jordbaer"; /* OK */
+    const char *val = "jordbaer"; /* OK */
 #endif
-        xmlNodePtr top = xmlNewNode(0, BAD_CAST "top");
-        
-        xmlNewTextChild(top, 0, BAD_CAST "sub", BAD_CAST val);
-        xmlDocSetRootElement(doc, top);
-        
-        xmlDocDumpMemory(doc, &buf_out, &len_out);
+    doc = xmlNewDoc(BAD_CAST "1.0");
+    YAZ_CHECK(doc);
+
+    top = xmlNewNode(0, BAD_CAST "top");
+    YAZ_CHECK(top);
+    
+    xmlNewTextChild(top, 0, BAD_CAST "sub", BAD_CAST val);
+    xmlDocSetRootElement(doc, top);
+    
+    xmlDocDumpMemory(doc, &buf_out, &len_out);
 #if 0
-        printf("%*s", len_out, buf_out);
+    printf("%*s", len_out, buf_out);
+#endif
+
+
+/* YAZ_HAVE_XML2 */
 #endif
-    }
+}
+
+int main(int argc, char **argv)
+{
+    YAZ_CHECK_INIT(argc, argv);
+#if YAZ_HAVE_XML2
+    LIBXML_TEST_VERSION;
 #endif
-    return 0;
+    tst();
+    YAZ_CHECK_TERM;
 }