[Expat-checkins] expat/tests minicheck.c, 1.1, 1.2 minicheck.h, 1.1, 1.2 runtests.c, 1.56, 1.57

[Fred L. Drake]

Update of /cvsroot/expat/expat/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12942/tests

Modified Files:
	minicheck.c minicheck.h runtests.c 
Log Message:
- avoid using the "check" library's suite_free() function; it is not
  available in all versions of the library, and srunner_free() is
  sufficient
  (closes SF bug #985192)
- avoid some compiler warnings


Index: minicheck.c
===================================================================
RCS file: /cvsroot/expat/expat/tests/minicheck.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- minicheck.c	30 Apr 2004 03:18:10 -0000	1.1
+++ minicheck.c	15 Jul 2004 22:54:18 -0000	1.2
@@ -5,6 +5,7 @@
  * check library being used.
  */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <setjmp.h>
 #include <assert.h>
@@ -138,7 +139,7 @@
 }
 
 void
-_fail_unless(int condition, char *const file, int line, char *msg)
+_fail_unless(int condition, const char *file, int line, char *msg)
 {
     longjmp(env, 1);
 }
@@ -153,11 +154,6 @@
 void
 srunner_free(SRunner *runner)
 {
+    free(runner->suite);
     free(runner);
 }
-
-void
-suite_free(Suite *suite)
-{
-    free(suite);
-}

Index: minicheck.h
===================================================================
RCS file: /cvsroot/expat/expat/tests/minicheck.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- minicheck.h	30 Apr 2004 03:18:11 -0000	1.1
+++ minicheck.h	15 Jul 2004 22:54:19 -0000	1.2
@@ -54,7 +54,7 @@
  * Prototypes for the actual implementation.
  */
 
-void _fail_unless(int condition, char *const file, int line, char *msg);
+void _fail_unless(int condition, const char *file, int line, char *msg);
 Suite *suite_create(char *name);
 TCase *tcase_create(char *name);
 void suite_add_tcase(Suite *suite, TCase *tc);
@@ -67,4 +67,3 @@
 void srunner_run_all(SRunner *runner, int verbosity);
 int srunner_ntests_failed(SRunner *runner);
 void srunner_free(SRunner *runner);
-void suite_free(Suite *suite);

Index: runtests.c
===================================================================
RCS file: /cvsroot/expat/expat/tests/runtests.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- runtests.c	30 Apr 2004 03:18:11 -0000	1.56
+++ runtests.c	15 Jul 2004 22:54:19 -0000	1.57
@@ -1428,7 +1428,6 @@
     srunner_run_all(sr, verbosity);
     nf = srunner_ntests_failed(sr);
     srunner_free(sr);
-    suite_free(s);
 
     return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
 }