From e82808ea1d4849ecf859a52d5822a2a254593e0e Mon Sep 17 00:00:00 2001 From: Armin Burgmeier Date: Sat, 13 Dec 2008 23:02:23 +0100 Subject: [PATCH] inf-test-text-replay: Allow multiple record files 2008-12-13 Armin Burgmeier * test/inf-test-text-replay.c: Allow multiple record files to be passed. --- ChangeLog | 5 ++++ test/inf-test-text-replay.c | 47 +++++++++++++++++++++---------------- 2 files changed, 32 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index b24d0ba..1e69ea4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-12-13 Armin Burgmeier + + * test/inf-test-text-replay.c: Allow multiple record files to be + passed. + 2008-12-07 Armin Burgmeier * infinoted/infinoted-run.c: Record sessions into diff --git a/test/inf-test-text-replay.c b/test/inf-test-text-replay.c index 2eba934..fdff8ba 100644 --- a/test/inf-test-text-replay.c +++ b/test/inf-test-text-replay.c @@ -701,9 +701,8 @@ inf_test_text_replay_process(xmlTextReaderPtr reader) } else { - inf_test_util_print_buffer(buffer); - /*inf_test_text_replay_print_buffer(buffer);*/ - printf("Replayed record successfully\n"); + /*inf_test_util_print_buffer(buffer);*/ + fprintf(stderr, "Replayed record successfully\n"); } g_object_unref(buffer); @@ -712,6 +711,7 @@ inf_test_text_replay_process(xmlTextReaderPtr reader) int main(int argc, char* argv[]) { xmlTextReaderPtr reader; + int i; g_type_init(); inf_test_text_replay_error_quark = @@ -719,31 +719,38 @@ int main(int argc, char* argv[]) if(argc < 2) { - fprintf(stderr, "Usage: %s \n", argv[0]); + fprintf(stderr, "Usage: %s ...\n", argv[0]); return -1; } - reader = xmlReaderForFile( - argv[1], - NULL, - XML_PARSE_NOERROR | XML_PARSE_NOWARNING - ); - - if(!reader) + for(i = 1; i < argc; ++ i) { - fprintf(stderr, "%s\n", xmlGetLastError()->message); - return -1; - } + fprintf(stderr, "%s...", argv[i]); + fflush(stderr); - inf_test_text_replay_process(reader); + reader = xmlReaderForFile( + argv[i], + NULL, + XML_PARSE_NOERROR | XML_PARSE_NOWARNING + ); - if(xmlTextReaderClose(reader) == -1) - { - fprintf(stderr, "%s\n", xmlGetLastError()->message); - return -1; + if(!reader) + { + fprintf(stderr, "%s\n", xmlGetLastError()->message); + return -1; + } + + inf_test_text_replay_process(reader); + + if(xmlTextReaderClose(reader) == -1) + { + fprintf(stderr, "%s\n", xmlGetLastError()->message); + return -1; + } + + xmlFreeTextReader(reader); } - xmlFreeTextReader(reader); return 0; } /* vim:set et sw=2 ts=2: */