change private struct name

diff --git a/src/ccunit/CCUnitMakeSuite.c b/src/ccunit/CCUnitMakeSuite.c
index 0e81022..755cf0f 100644 (file)
--- a/src/ccunit/CCUnitMakeSuite.c
+++ b/src/ccunit/CCUnitMakeSuite.c
@@ -96,7 +96,7 @@ static void usage (const char* progname)
 
 int ccunit_makeSuite (int ac, char** av)
 {
-  CCUnitTestSuiteDef* suite;
+  _CCUnitTestSuiteDef* suite;
   char* outputFile = "-";
   const char* functionName = "ccunit_suite";
   FILE* ofp = stdout;

diff --git a/src/ccunit/CCUnitMakeSuite.h b/src/ccunit/CCUnitMakeSuite.h
index 3c20f1b..bcfc4ad 100644 (file)
--- a/src/ccunit/CCUnitMakeSuite.h
+++ b/src/ccunit/CCUnitMakeSuite.h
@@ -62,7 +62,7 @@
  * @{
  */
 
-/*
+/**
  * @defgroup CCUnitTestDef TestDef
  * Test definition
  * @{
@@ -71,111 +71,111 @@
 /**
  * Test definition information.
  */
-typedef struct CCUnitTestDef
+typedef struct _CCUnitTestDef
 {
   CCUnitTestType_t type;                       /**< test type */
   char* name;                                  /**< test name */
   char* idname;                                        /**< id name */
-  void (*dtor) (struct CCUnitTestDef*);                /**< test destcuctor  */
-} CCUnitTestDef;
+  void (*dtor) (struct _CCUnitTestDef*);       /**< test destcuctor  */
+} _CCUnitTestDef;
 
 /** @} */
 
-/*
+/**
  * @defgroup CCUnitTestSuiteDef TestSuiteDef
  * Test suite definition
  * @{
  */
 
-/*
+/**
  * Test suite definition information.
  */
-typedef struct CCUnitTestSuiteDef
+typedef struct _CCUnitTestSuiteDef
 {
-  CCUnitTestDef testdef;                       /**< super class */
+  _CCUnitTestDef testdef;                      /**< super class */
   CCUnitList testdefs;                         /**< test defs list */
-} CCUnitTestSuiteDef;
+} _CCUnitTestSuiteDef;
 
-/*
+/**
  * create new test suite def.
  *
  * @param name suite name.
  * @return created testdef.
  */
-extern CCUnitTestSuiteDef* ccunit_newTestSuiteDef (const char* name);
+extern _CCUnitTestSuiteDef* ccunit_newTestSuiteDef (const char* name);
 
-/*
+/**
  * delete test suite def.
  *
  * @param suite test suite def.
  */
-extern inline void ccunit_deleteTestSuiteDef (CCUnitTestSuiteDef* suite);
+extern inline void ccunit_deleteTestSuiteDef (_CCUnitTestSuiteDef* suite);
 
 /** @} */
 
-/*
+/**
  * @defgroup CCUnitTestCaseDef TestCaseDef
  * Test case definition.
  * @{
  */
 
-/*
+/**
  * Test case definition information.
  */
-typedef struct CCUnitFuncDef
+typedef struct _CCUnitFuncDef
 {
   char* scope;                                 /**< scope */
   char* type;                                  /**< return type */
   char* name;                                  /**< function name */
   char* desc;                                  /**< description */
-} CCUnitFuncDef;
+} _CCUnitFuncDef;
 
-/* @} */
+/** @} */
 
-/*
+/**
  * @defgroup CCUnitTestFixtureDef TestFixtureDef
  * Test fixture definition.
  * @{
  */
 
-/*
+/**
  * Test fixture definition information.
  */
-typedef struct CCUnitTestFixtureDef
+typedef struct _CCUnitTestFixtureDef
 {
-  CCUnitTestDef testdef;                       /**< super class */
-  CCUnitFuncDef* ctor;                         /**< constructor */
-  CCUnitFuncDef* dtor;                         /**< destructor */
-  CCUnitFuncDef* setUp;                                /**< test setup function */
-  CCUnitFuncDef* tearDown;                     /**< test tearDown function */
+  _CCUnitTestDef testdef;                      /**< super class */
+  _CCUnitFuncDef* ctor;                                /**< constructor */
+  _CCUnitFuncDef* dtor;                                /**< destructor */
+  _CCUnitFuncDef* setUp;                       /**< test setup function */
+  _CCUnitFuncDef* tearDown;                    /**< test tearDown function */
   CCUnitList testCases;                                /**< test case list */
-} CCUnitTestFixtureDef;
+} _CCUnitTestFixtureDef;
 
-/* @} */
+/** @} */
 
-/*
+/**
  * @defgroup CCUnitReadSuite ReadSuite
  * Read test case definitions from test source code.
  * @{
  */
 
-/*
+/**
  * read test unit suite from specified stream.
  *
  * @param fname test unit source code file.
  * @param parent [out] test suite to adding read test.
  */
-extern void ccunit_readSuite (const char* fname, CCUnitTestSuiteDef* parent);
+extern void ccunit_readSuite (const char* fname, _CCUnitTestSuiteDef* parent);
 
-/* @} */
+/** @} */
 
-/*
+/**
  * @defgroup CCUnitWriteSuite WriteSuite
  * Write the source code to making the test suite.
  * @{
  */
 
-/*
+/**
  * output test suite making function code.
  *
  * @param ofp output stream.
@@ -184,9 +184,9 @@ extern void ccunit_readSuite (const char* fname, CCUnitTestSuiteDef* parent);
  */
 extern void ccunit_writeSuite (FILE* ofp,
                               const char* name,
-                              CCUnitTestSuiteDef* suite);
+                              _CCUnitTestSuiteDef* suite);
 
-/*
+/**
  * output test suite making function code.
  *
  * @param ofp output stream.
@@ -195,9 +195,9 @@ extern void ccunit_writeSuite (FILE* ofp,
  */
 extern void ccunit_printSuite (FILE* ofp,
                               const char* name,
-                              CCUnitTestSuiteDef* suite);
+                              _CCUnitTestSuiteDef* suite);
 
-/* @} */
+/** @} */
 
 /**
  * Generate a code to creating test suite code from the test case

diff --git a/src/ccunit/CCUnitPrintSuite.c b/src/ccunit/CCUnitPrintSuite.c
index 8d1c840..39a2c26 100644 (file)
--- a/src/ccunit/CCUnitPrintSuite.c
+++ b/src/ccunit/CCUnitPrintSuite.c
@@ -28,7 +28,8 @@
 #include <stdio.h>
 
 /**
- * @addtogroup CCUnitWriteSuite
+ * @ingroup CCunitMakeSuite
+ * @addtogroup CCUnitPrintSuite
  * @{
  */
 
@@ -49,7 +50,7 @@ static const char* ccunitTypeNames[] = {
  * @param type function type; ctor, dtor, setUp, tearDown, testCase.
  * @param fdef funcdef object to print.
  */
-static void printPrototype (FILE* ofp, const char* type, CCUnitFuncDef* fdef)
+static void printPrototype (FILE* ofp, const char* type, _CCUnitFuncDef* fdef)
 {
   fprintf (ofp,
           "/* %s */\n"
@@ -60,23 +61,23 @@ static void printPrototype (FILE* ofp, const char* type, CCUnitFuncDef* fdef)
 }
 
 /**
- * print test fixture prototypes.
+ * print test suite/fixture prototypes.
  *
  * @param ofp output stream.
- * @param suite test suite object to print.
+ * @param suitedef test suite object to print.
  */
-static void printPrototypes (FILE* ofp, CCUnitTestSuiteDef* suitedef)
+static void printPrototypes (FILE* ofp, _CCUnitTestSuiteDef* suitedef)
 {
   CCUnitListIterator itor;
-  CCUnitTestDef* testdef;
+  _CCUnitTestDef* testdef;
   ccunit_initListIterator (&suitedef->testdefs, &itor);
   while ((testdef = ccunit_nextListIterator (&itor)) != NULL)
     {
       if (testdef->type == ccunitTypeSuite)
-       printPrototypes (ofp, (CCUnitTestSuiteDef*)testdef);
+       printPrototypes (ofp, (_CCUnitTestSuiteDef*)testdef);
       else if (testdef->type == ccunitTypeFixture)
        {
-         CCUnitTestFixtureDef* fdef = (CCUnitTestFixtureDef*)testdef;
+         _CCUnitTestFixtureDef* fdef = (_CCUnitTestFixtureDef*)testdef;
          ccunit_log ("fixturdef: %s", fdef->testdef.name);
          if (fdef->testdef.name)
            fprintf (ofp, "/* test fixture: %s */\n", fdef->testdef.name);
@@ -91,7 +92,7 @@ static void printPrototypes (FILE* ofp, CCUnitTestSuiteDef* suitedef)
          /* print testCase prototypes */
          {
            CCUnitListIterator fitor;
-           CCUnitFuncDef* casedef;
+           _CCUnitFuncDef* casedef;
            ccunit_initListIterator (&fdef->testCases, &fitor);
            while ((casedef = ccunit_nextListIterator (&fitor)) != NULL)
              printPrototype (ofp, "testCase", casedef);
@@ -109,7 +110,7 @@ static void printPrototypes (FILE* ofp, CCUnitTestSuiteDef* suitedef)
  * @param ofp output stream.
  * @param fxdef test suite to print.
  */
-static void printFixture  (FILE* ofp, CCUnitTestFixtureDef* fxdef)
+static void printFixture  (FILE* ofp, _CCUnitTestFixtureDef* fxdef)
 {
   static int fxid = 0;
   if (!fxdef->testdef.idname)
@@ -136,7 +137,7 @@ static void printFixture  (FILE* ofp, CCUnitTestFixtureDef* fxdef)
           GETNAME (fxdef->tearDown));
   {
     CCUnitListIterator fnitor;
-    CCUnitFuncDef* fndef;
+    _CCUnitFuncDef* fndef;
     ccunit_initListIterator (&fxdef->testCases, &fnitor);
     while ((fndef = ccunit_nextListIterator (&fnitor)) != NULL)
       {
@@ -160,10 +161,10 @@ static void printFixture  (FILE* ofp, CCUnitTestFixtureDef* fxdef)
  * @param name function name.
  * @param suite test suite to print.
  */
-static void printSuite (FILE* ofp, const char* name, CCUnitTestSuiteDef* suite)
+static void printSuite (FILE* ofp, const char* name, _CCUnitTestSuiteDef* suite)
 {
   CCUnitListIterator itor;
-  CCUnitTestDef* testdef;
+  _CCUnitTestDef* testdef;
   static int suiteid = 0;
   if (!suite->testdef.idname)
     {
@@ -175,9 +176,9 @@ static void printSuite (FILE* ofp, const char* name, CCUnitTestSuiteDef* suite)
   while ((testdef = ccunit_nextListIterator (&itor)) != NULL)
     {
       if (testdef->type == ccunitTypeSuite)
-       printSuite (ofp, testdef->name, (CCUnitTestSuiteDef*)testdef);
+       printSuite (ofp, testdef->name, (_CCUnitTestSuiteDef*)testdef);
       else if (testdef->type == ccunitTypeFixture)
-       printFixture (ofp, (CCUnitTestFixtureDef*)testdef);
+       printFixture (ofp, (_CCUnitTestFixtureDef*)testdef);
       else
        ;
     }
@@ -201,7 +202,7 @@ static void printSuite (FILE* ofp, const char* name, CCUnitTestSuiteDef* suite)
 /*
  * print test suite.
  */
-void ccunit_printSuite (FILE* ofp, const char* name, CCUnitTestSuiteDef* suite)
+void ccunit_printSuite (FILE* ofp, const char* name, _CCUnitTestSuiteDef* suite)
 {
   fprintf (ofp,
           "#include <ccunit/CCUnitTestSuite.h>\n"

diff --git a/src/ccunit/CCUnitReadSuite.c b/src/ccunit/CCUnitReadSuite.c
index 66f24f9..4e48010 100644 (file)
--- a/src/ccunit/CCUnitReadSuite.c
+++ b/src/ccunit/CCUnitReadSuite.c
@@ -29,6 +29,7 @@
 #include <errno.h>
 
 /**
+ * @ingroup CCunitMakeSuite
  * @addtogroup CCUnitReadSuite
  * @{
  */
@@ -38,7 +39,7 @@
  *
  * @param test testdef to destroy.
  */
-static void destroyTestDef (CCUnitTestDef* test)
+static void destroyTestDef (_CCUnitTestDef* test)
 {
   if (!test)
     return;
@@ -53,9 +54,9 @@ static void destroyTestDef (CCUnitTestDef* test)
  * @param type test type.
  * @param name test name.
  */
-static CCUnitTestDef* initTestDef (CCUnitTestDef* test,
-                                  CCUnitTestType_t type,
-                                  const char* name)
+static _CCUnitTestDef* initTestDef (_CCUnitTestDef* test,
+                                   CCUnitTestType_t type,
+                                   const char* name)
 {
   test->type = type;
   test->name = safe_strdup (name);
@@ -68,7 +69,7 @@ static CCUnitTestDef* initTestDef (CCUnitTestDef* test,
  *
  * @param test testdef to delete.
  */
-static void deleteTestDef (CCUnitTestDef* test)
+static void deleteTestDef (_CCUnitTestDef* test)
 {
   if (!test)
     return;
@@ -84,24 +85,24 @@ static void deleteTestDef (CCUnitTestDef* test)
  *
  * @param suite test suite def.
  */
-static void destroyTestSuiteDef (CCUnitTestSuiteDef* suite)
+static void destroyTestSuiteDef (_CCUnitTestSuiteDef* suite)
 {
   ccunit_deleteList (&suite->testdefs, (void(*)(void*))deleteTestDef);
   destroyTestDef (&suite->testdef);
 }
 
-CCUnitTestSuiteDef* ccunit_newTestSuiteDef (const char* name)
+_CCUnitTestSuiteDef* ccunit_newTestSuiteDef (const char* name)
 {
-  CCUnitTestSuiteDef* suite = calloc (1, sizeof (*suite));
+  _CCUnitTestSuiteDef* suite = calloc (1, sizeof (*suite));
   if (!suite)
     return suite;
   initTestDef (&suite->testdef, ccunitTypeSuite, name);
-  suite->testdef.dtor = (void(*)(CCUnitTestDef*))destroyTestSuiteDef;
+  suite->testdef.dtor = (void(*)(_CCUnitTestDef*))destroyTestSuiteDef;
   ccunit_initList (&suite->testdefs);
   return suite;
 }
 
-inline void ccunit_deleteTestSuiteDef (CCUnitTestSuiteDef* suite)
+inline void ccunit_deleteTestSuiteDef (_CCUnitTestSuiteDef* suite)
 {
   deleteTestDef (&suite->testdef);
 }
@@ -113,8 +114,8 @@ inline void ccunit_deleteTestSuiteDef (CCUnitTestSuiteDef* suite)
  * @param test test group.
  * @return added test.
  */
-static CCUnitTestDef* addTestDef (CCUnitTestSuiteDef* suite,
-                                 CCUnitTestDef* test)
+static _CCUnitTestDef* addTestDef (_CCUnitTestSuiteDef* suite,
+                                  _CCUnitTestDef* test)
 {
   if (!suite || !test)
     return NULL;
@@ -129,8 +130,8 @@ static CCUnitTestDef* addTestDef (CCUnitTestSuiteDef* suite,
  * @param test test suite.
  * @return added test.
  */
-static inline CCUnitTestDef* addTestSuiteDef (CCUnitTestSuiteDef* suite,
-                                             CCUnitTestSuiteDef* test)
+static inline _CCUnitTestDef* addTestSuiteDef (_CCUnitTestSuiteDef* suite,
+                                              _CCUnitTestSuiteDef* test)
 {
   if (!suite || !test)
     return NULL;
@@ -148,8 +149,8 @@ static inline CCUnitTestDef* addTestSuiteDef (CCUnitTestSuiteDef* suite,
  * @param test test fixture.
  * @return added test.
  */
-static inline CCUnitTestDef* addTestFixtureDef (CCUnitTestSuiteDef* suite,
-                                            CCUnitTestFixtureDef* test)
+static inline _CCUnitTestDef* addTestFixtureDef (_CCUnitTestSuiteDef* suite,
+                                                _CCUnitTestFixtureDef* test)
 {
   if (!suite || !test)
     return NULL;
@@ -168,12 +169,12 @@ static inline CCUnitTestDef* addTestFixtureDef (CCUnitTestSuiteDef* suite,
  * @param desc description.
  * @return new test case def.
  */
-static CCUnitFuncDef* newFuncDef (const char* scope,
-                                 const char* type,
-                                 const char* name,
-                                 const char* desc)
+static _CCUnitFuncDef* newFuncDef (const char* scope,
+                                  const char* type,
+                                  const char* name,
+                                  const char* desc)
 {
-  struct CCUnitFuncDef* f = calloc (1, sizeof (*f));
+  struct _CCUnitFuncDef* f = calloc (1, sizeof (*f));
   ccunit_log ("create new test func: %s %s", type, name);
   if (!f)
     return f;
@@ -188,7 +189,7 @@ static CCUnitFuncDef* newFuncDef (const char* scope,
  * delete test func def.
  * @param func test func def to delete.
  */
-static void deleteFuncDef (CCUnitFuncDef* func)
+static void deleteFuncDef (_CCUnitFuncDef* func)
 {
   if (!func)
     return;
@@ -203,7 +204,7 @@ static void deleteFuncDef (CCUnitFuncDef* func)
  * destroy test fixture def.
  * @param fixture test fixture def to destroy.
  */
-static void destroyTestFixtureDef (CCUnitTestFixtureDef* fixture)
+static void destroyTestFixtureDef (_CCUnitTestFixtureDef* fixture)
 {
   ccunit_deleteList (&fixture->testCases, (void(*)(void*))deleteFuncDef);
   deleteFuncDef (fixture->setUp);
@@ -215,17 +216,15 @@ static void destroyTestFixtureDef (CCUnitTestFixtureDef* fixture)
  * create new test fixture def.
  *
  * @param name test fixture name.
- * @param setUp test fixture setup func def.
- * @param tearDown test fixture tearDown func def.
  */
-static CCUnitTestFixtureDef* newTestFixtureDef (const char* name)
+static _CCUnitTestFixtureDef* newTestFixtureDef (const char* name)
 {
-  CCUnitTestFixtureDef* fixture = calloc (1, sizeof (*fixture));
+  _CCUnitTestFixtureDef* fixture = calloc (1, sizeof (*fixture));
   ccunit_log ("create new test fixture: %s", name);
   if (!fixture)
     return NULL;
   initTestDef (&fixture->testdef, ccunitTypeFixture, name);
-  fixture->testdef.dtor = (void(*)(CCUnitTestDef*))destroyTestFixtureDef;
+  fixture->testdef.dtor = (void(*)(_CCUnitTestDef*))destroyTestFixtureDef;
   ccunit_initList (&fixture->testCases);
   return fixture;
 }
@@ -494,7 +493,7 @@ static const char* getEndOfFixture (const char* str)
  * @param desc description.
  * @return funcdef object.
  */
-static CCUnitFuncDef* readTestCase (const char* type,
+static _CCUnitFuncDef* readTestCase (const char* type,
                                    const char* prefix,
                                    const char* desc)
 {
@@ -574,13 +573,13 @@ static CCUnitFuncDef* readTestCase (const char* type,
 /**
  * read test fixture function.
  *
- * @param parent parent suite.
+ * @param suite parent suite.
  * @param cname test fixture name to read.
  */
-static void readTestFixture (CCUnitTestSuiteDef* suite, const char* cname)
+static void readTestFixture (_CCUnitTestSuiteDef* suite, const char* cname)
 {
-  CCUnitTestFixtureDef* fixture;
-  CCUnitFuncDef* f = NULL;
+  _CCUnitTestFixtureDef* fixture;
+  _CCUnitFuncDef* f = NULL;
   const char* name;
   char* doc;
   char* desc = NULL;
@@ -655,9 +654,9 @@ static void readTestFixture (CCUnitTestSuiteDef* suite, const char* cname)
  *
  * @param suite test suitedef.
  */
-static void readSuite (CCUnitTestSuiteDef* suite)
+static void readSuite (_CCUnitTestSuiteDef* suite)
 {
-  CCUnitFuncDef* f;
+  _CCUnitFuncDef* f;
   const char* name;
   char* doc;
   char* desc = NULL;
@@ -698,7 +697,7 @@ static void readSuite (CCUnitTestSuiteDef* suite)
 
 /** @} */
 
-void ccunit_readSuite (const char* fname, CCUnitTestSuiteDef* suite)
+void ccunit_readSuite (const char* fname, _CCUnitTestSuiteDef* suite)
 {
   if (strcmp (fname, "-") == 0) /* special file name '-' as stdin  */
     {

diff --git a/src/ccunit/CCUnitWriteSuite.c b/src/ccunit/CCUnitWriteSuite.c
index ee9c931..50e248a 100644 (file)
--- a/src/ccunit/CCUnitWriteSuite.c
+++ b/src/ccunit/CCUnitWriteSuite.c
@@ -28,6 +28,7 @@
 #include <stdio.h>
 
 /**
+ * @ingroup CCunitMakeSuite
  * @addtogroup CCUnitWriteSuite
  * @{
  */
@@ -38,26 +39,26 @@
  * @param ofp output stream.
  * @param suite test suite object to print.
  */
-static void printPrototypes (FILE* ofp, CCUnitTestSuiteDef* suite)
+static void writePrototypes (FILE* ofp, _CCUnitTestSuiteDef* suite)
 {
   CCUnitListIterator itor;
-  CCUnitTestDef* test;
-  CCUnitFuncDef* testCase;
+  _CCUnitTestDef* test;
+  _CCUnitFuncDef* testCase;
   static unsigned suiteid = 0;
   char sname[32];
   sprintf (sname, "newSuite_%03u", ++ suiteid);
   fprintf (ofp, "static CCUnitTestSuite* %s (const char* name);\n", sname);
   ccunit_log ("testSuite: '%s'", sname);
   ccunit_initListIterator (&suite->testdefs, &itor);
-  while ((test = (CCUnitTestDef*)ccunit_nextListIterator (&itor)) != NULL)
+  while ((test = (_CCUnitTestDef*)ccunit_nextListIterator (&itor)) != NULL)
     {
       if (test->type == ccunitTypeSuite)
        {
-         printPrototypes (ofp, (CCUnitTestSuiteDef*)test);
+         writePrototypes (ofp, (_CCUnitTestSuiteDef*)test);
        }
       else if (test->type == ccunitTypeFixture)
        {
-         CCUnitTestFixtureDef* testFixture = (CCUnitTestFixtureDef*)test;
+         _CCUnitTestFixtureDef* testFixture = (_CCUnitTestFixtureDef*)test;
          CCUnitListIterator fitor;
          ccunit_log ("testFixture: %s", testFixture->testdef.name);
          if (testFixture->testdef.name)
@@ -107,12 +108,12 @@ static void printPrototypes (FILE* ofp, CCUnitTestSuiteDef* suite)
  * @param name function name.
  * @param suite test suite to print.
  */
-static void printSuite (FILE* ofp,
+static void writeSuite (FILE* ofp,
                        const char* name,
-                       CCUnitTestSuiteDef* suite)
+                       _CCUnitTestSuiteDef* suite)
 {
   CCUnitListIterator itor;
-  CCUnitTestDef* testdef;
+  _CCUnitTestDef* testdef;
   static unsigned int suiteid = 0;
   unsigned int callid;
   suiteid ++;
@@ -124,7 +125,7 @@ static void printSuite (FILE* ofp,
           suiteid);
   callid = suiteid;
   ccunit_initListIterator (&suite->testdefs, &itor);
-  while ((testdef = (CCUnitTestDef*)ccunit_nextListIterator (&itor)) != NULL)
+  while ((testdef = (_CCUnitTestDef*)ccunit_nextListIterator (&itor)) != NULL)
     {
       if (testdef->type == ccunitTypeSuite)
        {
@@ -141,8 +142,8 @@ static void printSuite (FILE* ofp,
       else if (testdef->type == ccunitTypeFixture)
        {
          CCUnitListIterator fitor;
-         CCUnitFuncDef* testCase;
-         CCUnitTestFixtureDef* testFixture = (CCUnitTestFixtureDef*)testdef;
+         _CCUnitFuncDef* testCase;
+         _CCUnitTestFixtureDef* testFixture = (_CCUnitTestFixtureDef*)testdef;
          fprintf (ofp,
                   "  {\n"
                   "    CCUnitTestFixture* testFixture;\n"
@@ -173,10 +174,10 @@ static void printSuite (FILE* ofp,
     }
   fprintf (ofp, "\n  return suite;\n}\n\n");
   ccunit_initListIterator (&suite->testdefs, &itor);
-  while ((testdef = (CCUnitTestDef*)ccunit_nextListIterator (&itor)) != NULL)
+  while ((testdef = (_CCUnitTestDef*)ccunit_nextListIterator (&itor)) != NULL)
     {
       if (testdef->type == ccunitTypeSuite)
-       printSuite (ofp, testdef->name, (CCUnitTestSuiteDef*)testdef);
+       writeSuite (ofp, testdef->name, (_CCUnitTestSuiteDef*)testdef);
       else
        ;
     }
@@ -185,13 +186,13 @@ static void printSuite (FILE* ofp,
 /*
  * print test suite.
  */
-void ccunit_writeSuite (FILE* ofp, const char* name, CCUnitTestSuiteDef* suite)
+void ccunit_writeSuite (FILE* ofp, const char* name, _CCUnitTestSuiteDef* suite)
 {
   fprintf (ofp,
           "#include <ccunit/CCUnitTestSuite.h>\n"
           "\n");
-  printPrototypes (ofp, suite);
-  printSuite (ofp, NULL, suite);
+  writePrototypes (ofp, suite);
+  writeSuite (ofp, NULL, suite);
   if (!name)
     name = "ccunit_suite";
   fprintf (ofp,