not to generate an extra test suite.

diff --git a/src/ccunit/CCUnitReadSuite.c b/src/ccunit/CCUnitReadSuite.c
index 9ff867d..45e82c7 100644 (file)
--- a/src/ccunit/CCUnitReadSuite.c
+++ b/src/ccunit/CCUnitReadSuite.c
@@ -545,24 +545,16 @@ static CCUnitTestCaseDef* readTestCase (const char* type,
  * @param parent parent suite.
  * @param cname test fixture name to read.
  */
-static void readTestFixture (CCUnitTestSuiteDef* parent, const char* cname)
+static void readTestFixture (CCUnitTestSuiteDef* suite, const char* cname)
 {
-  CCUnitTestSuiteDef* suite;
   CCUnitTestFixtureDef* fixture;
   CCUnitTestCaseDef* f = NULL;
   char* name;
   char* doc;
   char* desc = NULL;
-  suite = ccunit_newTestSuiteDef (NULL);
-  if (!suite)
-    return;
   fixture = newTestFixtureDef (cname);
   if (!fixture)
-    {
-      deleteTestDef (&suite->testdef);
-      return;
-    }
-  addTestSuiteDef (parent, suite);
+    return;
   addTestFixtureDef (suite, fixture);
   while (readline ())
     {
@@ -627,9 +619,9 @@ static void readTestFixture (CCUnitTestSuiteDef* parent, const char* cname)
 /**
  * read test suite def.
  *
- * @param parent parent suitedef.
+ * @param suite test suitedef.
  */
-static void readSuite (CCUnitTestSuiteDef* parent)
+static void readSuite (CCUnitTestSuiteDef* suite)
 {
   CCUnitTestCaseDef* f;
   const char* name;
@@ -642,7 +634,7 @@ static void readSuite (CCUnitTestSuiteDef* parent)
        {
          if ((name = getTestFixtureName (doc)) != NULL)
            {
-             readTestFixture (parent, name);
+             readTestFixture (suite, name);
              safe_free (doc);
            }
          else if ((name = getEndOfFixture (doc)) != NULL)
@@ -671,7 +663,7 @@ static void readSuite (CCUnitTestSuiteDef* parent)
 
 /** @} */
 
-void ccunit_readSuite (const char* fname, CCUnitTestSuiteDef* parent)
+void ccunit_readSuite (const char* fname, CCUnitTestSuiteDef* suite)
 {
   if (strcmp (fname, "-") == 0) /* special file name '-' as stdin  */
     {
@@ -689,7 +681,7 @@ void ccunit_readSuite (const char* fname, CCUnitTestSuiteDef* parent)
        }
       line.fname = fname;
     }
-  readSuite (parent);
+  readSuite (suite);
   safe_free (line.str);
   if (line.ifp != NULL && line.ifp != stdin)
     fclose (line.ifp);