From 1044e5b3e1039b0a862232566dc834ee8985033a Mon Sep 17 00:00:00 2001
From: "Fred L. Drake, Jr." <fdrake@users.sourceforge.net>
Date: Thu, 15 Jul 2004 22:54:19 +0000
Subject: [PATCH] - 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

---
 expat/tests/minicheck.c | 10 +++-------
 expat/tests/minicheck.h |  3 +--
 expat/tests/runtests.c  |  1 -
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/expat/tests/minicheck.c b/expat/tests/minicheck.c
index 6efd7c7b..58a38e2e 100644
--- a/expat/tests/minicheck.c
+++ b/expat/tests/minicheck.c
@@ -5,6 +5,7 @@
  * check library being used.
  */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <setjmp.h>
 #include <assert.h>
@@ -138,7 +139,7 @@ srunner_run_all(SRunner *runner, int verbosity)
 }
 
 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 @@ srunner_ntests_failed(SRunner *runner)
 void
 srunner_free(SRunner *runner)
 {
+    free(runner->suite);
     free(runner);
 }
-
-void
-suite_free(Suite *suite)
-{
-    free(suite);
-}
diff --git a/expat/tests/minicheck.h b/expat/tests/minicheck.h
index 6239fa33..94cd6c08 100644
--- a/expat/tests/minicheck.h
+++ b/expat/tests/minicheck.h
@@ -54,7 +54,7 @@ struct TCase {
  * 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_set_fork_status(SRunner *runner, int forking);
 void srunner_run_all(SRunner *runner, int verbosity);
 int srunner_ntests_failed(SRunner *runner);
 void srunner_free(SRunner *runner);
-void suite_free(Suite *suite);
diff --git a/expat/tests/runtests.c b/expat/tests/runtests.c
index 5c5d7845..aabd3361 100644
--- a/expat/tests/runtests.c
+++ b/expat/tests/runtests.c
@@ -1428,7 +1428,6 @@ main(int argc, char *argv[])
     srunner_run_all(sr, verbosity);
     nf = srunner_ntests_failed(sr);
     srunner_free(sr);
-    suite_free(s);
 
     return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
 }
-- 
2.40.0