Changed name on function list_create to check_list_create to avoid name clash

git-svn-id: svn+ssh://svn.code.sf.net/p/check/code/trunk@193 64e312b2-a51f-0410-8e61-82d0ca0eb02a

diff --git a/check/ChangeLog b/check/ChangeLog
index 4a8416e89668e8ce7b39be12e892a2aa162d4310..6f9a66cf832c1afb6383901d799f9c8900962014 100644 (file)
--- a/check/ChangeLog
+++ b/check/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-04 hugo303
+
+        * src/check.c, src/check_list.c, src/check_list.h, src/check_log.c,
+       src/check_msg.c, tests/check_list.c:
+       Changed name on function list_create to check_list_create to avoid
+       name clash.
+
 2004-11-04 hugo303
 
        * src/check.c, src/check.h.in, tests/check_check_master.c,

diff --git a/check/src/check.c b/check/src/check.c
index be64765334b437cd62cda5fc9df92b6ecdac3569..57939c78c630dbb40a7274fb77339046a8caeb9a 100644 (file)
--- a/check/src/check.c
+++ b/check/src/check.c
@@ -51,7 +51,7 @@ Suite *suite_create (const char *name)
     s->name = "";
   else
     s->name = name;
-  s->tclst = list_create();
+  s->tclst = check_list_create();
   return s;
 }
 
@@ -75,11 +75,11 @@ TCase *tcase_create (const char *name)
     tc->name = "";
   else
     tc->name = name;
-  tc->tflst = list_create();
-  tc->unch_sflst = list_create();
-  tc->ch_sflst = list_create();
-  tc->unch_tflst = list_create();
-  tc->ch_tflst = list_create();
+  tc->tflst = check_list_create();
+  tc->unch_sflst = check_list_create();
+  tc->ch_sflst = check_list_create();
+  tc->unch_tflst = check_list_create();
+  tc->ch_tflst = check_list_create();
 
   return tc;
 }
@@ -194,12 +194,12 @@ void _fail_unless (int result, const char *file,
 SRunner *srunner_create (Suite *s)
 {
   SRunner *sr = emalloc (sizeof(SRunner)); /* freed in srunner_free */
-  sr->slst = list_create();
+  sr->slst = check_list_create();
   if (s != NULL)
     list_add_end(sr->slst, s);
   sr->stats = emalloc (sizeof(TestStats)); /* freed in srunner_free */
   sr->stats->n_checked = sr->stats->n_failed = sr->stats->n_errors = 0;
-  sr->resultlst = list_create();
+  sr->resultlst = check_list_create();
   sr->log_fname = NULL;
   sr->xml_fname = NULL;
   sr->loglst = NULL;

diff --git a/check/src/check_list.c b/check/src/check_list.c
index 16ad2e746570e7a6ac4999fada8a4edf6d92bf62..63535d858c20bff9dfc20747c224043cb5d64bc0 100644 (file)
--- a/check/src/check_list.c
+++ b/check/src/check_list.c
@@ -47,7 +47,7 @@ static void maybe_grow (List *lp)
   }
 }
 
-List *list_create (void)
+List *check_list_create (void)
 {
   List *lp;
   lp = emalloc (sizeof(List));

diff --git a/check/src/check_list.h b/check/src/check_list.h
index 306ccfe9664e94ac13b333f718f8e62c186a68d6..e40f4f821d5c969695565d8020d0d1e0bc5e3093 100644 (file)
--- a/check/src/check_list.h
+++ b/check/src/check_list.h
@@ -24,7 +24,7 @@
 typedef struct List List;
 
 /* Create an empty list */
-List * list_create (void);
+List * check_list_create (void);
 
 /* Is list at end? */
 int list_at_end (List * lp);

diff --git a/check/src/check_log.c b/check/src/check_log.c
index 7b1457bbd16cdee8610df569fd906d99ebd6636b..73eef4ed096f019353c9fe76644e186f3bad968c 100644 (file)
--- a/check/src/check_log.c
+++ b/check/src/check_log.c
@@ -287,7 +287,7 @@ FILE *srunner_open_xmlfile (SRunner *sr)
 void srunner_init_logging (SRunner *sr, enum print_output print_mode)
 {
   FILE *f;
-  sr->loglst = list_create();
+  sr->loglst = check_list_create();
   srunner_register_lfun (sr, stdout, 0, stdout_lfun, print_mode);
   f = srunner_open_lfile (sr);
   if (f) {

diff --git a/check/src/check_msg.c b/check/src/check_msg.c
index cbeefda9a0088a94637a90f93403a947a9d91dfb..a530d18c039b00dd18037369870131ae6e988086 100644 (file)
--- a/check/src/check_msg.c
+++ b/check/src/check_msg.c
@@ -273,7 +273,7 @@ static void setup_messaging_with_key (MsgKey key)
   PipeEntry *pe;
 
   if (plst == NULL)
-    plst = list_create();
+    plst = check_list_create();
 
   pe = get_pe_by_key (key);
   if (pe == NULL) {

diff --git a/check/tests/check_list.c b/check/tests/check_list.c
index 70c0f05fefb28b3f9be67ef824f6dea96f5350fd..9120b828ac3c5cad9acb013b421c82fd18715094 100644 (file)
--- a/check/tests/check_list.c
+++ b/check/tests/check_list.c
@@ -9,7 +9,7 @@ START_TEST(test_create)
 {
   List *lp;
 
-  lp = list_create();
+  lp = check_list_create();
 
   fail_unless (list_val(lp) == NULL,
               "Current list value should be NULL for newly created list");
@@ -25,7 +25,7 @@ END_TEST
 
 START_TEST(test_free)
 {
-  List *lp = list_create();
+  List *lp = check_list_create();
   list_add_end (lp, "abc");
   list_add_end (lp, "123");
   list_add_end (lp, NULL);
@@ -35,7 +35,7 @@ END_TEST
 
 START_TEST(test_add_end)
 {
-  List * lp = list_create();
+  List * lp = check_list_create();
   const char * tval = "abc";
   
   list_add_end (lp, tval);
@@ -54,7 +54,7 @@ START_TEST(test_add_a_bunch)
   List *lp;
   int i, j;
   for (i = 0; i < 3; i++) {
-    lp = list_create();
+    lp = check_list_create();
     for (j = 0; j < 1000; j++)
       list_add_end (lp, "abc");
     list_free(lp);
@@ -64,7 +64,7 @@ END_TEST
 
 START_TEST(test_add_end_and_next)
 {
-  List *lp = list_create();
+  List *lp = check_list_create();
   const char *tval1 = "abc";
   const char *tval2 = "123";