Moved ansel conversion code to iconv/glibc directory.

[gedcom-parse.git] / t / src / update.c

diff --git a/t/src/update.c b/t/src/update.c
index bc2e0f6f614c65cbe12b202a418a98fd54a02ded..cc983768e6fef906efe39661fac83cd8d42b1642 100644 (file)
--- a/t/src/update.c
+++ b/t/src/update.c
@@ -22,26 +22,10 @@
 /* $Name$ */
 
 #include "gedcom.h"
+#include "output.h"
 #include <locale.h>
 #include <stdio.h>
 
-#define OUTFILE "testgedcom.out"
-FILE* outfile = NULL;
-int quiet = 0;
-
-void output(int to_stdout_too, char* format, ...)
-{
-  va_list ap;
-  va_start(ap, format);
-  if (outfile) {
-    vfprintf(outfile, format, ap);
-  }
-  if (to_stdout_too && !quiet) {
-    vprintf(format, ap);
-  }
-  va_end(ap);
-}
-
 void gedcom_message_handler(Gedcom_msg_type type, char *msg)
 {
   if (type == MESSAGE)
@@ -160,7 +144,7 @@ int main(int argc, char* argv[])
        exit(1);
       }
       else if (!strncmp(argv[i], "-q", 3)) {
-       quiet = 1;
+       output_set_quiet(1);
       }
       else {
        printf ("Unrecognized option: %s\n", argv[i]);
@@ -173,11 +157,8 @@ int main(int argc, char* argv[])
   gedcom_init();
   setlocale(LC_ALL, "");
   gedcom_set_message_handler(gedcom_message_handler);
-  
-  outfile = fopen(OUTFILE, "a");
-  if (!outfile) {
-    printf("Could not open %s for appending\n", OUTFILE);
-  }
+
+  output_open();
   
   result = gedcom_new_model();
   result |= test_xref_functions();
@@ -187,7 +168,7 @@ int main(int argc, char* argv[])
   else {
     output(1, "Test failed: %d\n", result);
   }
-  
-  fclose(outfile);
+
+  output_close();
   return result;
 }