From 2b049549c4951665e5efb682a47449e41451f574 Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Thu, 26 Oct 2017 21:19:01 +0200
Subject: [PATCH 1/1] cunit: remove unused functions.

---
 include/xbt/cunit.h |  2 --
 src/xbt/cunit.cpp   | 43 +++++++++++++------------------------------
 2 files changed, 13 insertions(+), 32 deletions(-)

diff --git a/include/xbt/cunit.h b/include/xbt/cunit.h
index c0064534dc..24b4449f54 100644
--- a/include/xbt/cunit.h
+++ b/include/xbt/cunit.h
@@ -27,9 +27,7 @@ typedef struct s_xbt_test_unit *xbt_test_unit_t;
 typedef void (*ts_test_cb_t) ();
 
 /* test suite operations */
-XBT_PUBLIC(xbt_test_suite_t) xbt_test_suite_new(const char *name, const char *fmt, ...);
 XBT_PUBLIC(xbt_test_suite_t) xbt_test_suite_by_name(const char *name, const char *fmt, ...);
-XBT_PUBLIC(void) xbt_test_suite_dump(xbt_test_suite_t suite);
 XBT_PUBLIC(void) xbt_test_suite_push(xbt_test_suite_t suite, const char *name, ts_test_cb_t func, const char *fmt, ...);
 
 /* Run all the specified tests. what_to_do allows to disable some tests.
diff --git a/src/xbt/cunit.cpp b/src/xbt/cunit.cpp
index cde26d96a9..15257bf719 100644
--- a/src/xbt/cunit.cpp
+++ b/src/xbt/cunit.cpp
@@ -164,51 +164,34 @@ static void xbt_test_log_free(void *log)
   free(l);
 }
 
-/** @brief create test suite */
-xbt_test_suite_t xbt_test_suite_new(const char *name, const char *fmt, ...)
-{
-  xbt_test_suite_t suite = xbt_new0(s_xbt_test_suite, 1);
-  va_list ap;
-
-  if (_xbt_test_suites == nullptr)
-    _xbt_test_suites = xbt_dynar_new(sizeof(xbt_test_suite_t), xbt_test_suite_free);
-
-  va_start(ap, fmt);
-  suite->title = bvprintf(fmt, ap);
-  suite->units = xbt_dynar_new(sizeof(xbt_test_unit_t), &xbt_test_unit_free);
-  va_end(ap);
-  suite->name = name;
-  suite->enabled = 1;
-
-  xbt_dynar_push(_xbt_test_suites, &suite);
-
-  return suite;
-}
-
 /** @brief retrieve a testsuite from name, or create a new one */
 xbt_test_suite_t xbt_test_suite_by_name(const char *name, const char *fmt, ...)
 {
-  xbt_test_suite_t suite;
-  char *bufname;
-  va_list ap;
-
-  if (_xbt_test_suites) {
+  if (_xbt_test_suites == nullptr) {
+    _xbt_test_suites = xbt_dynar_new(sizeof(xbt_test_suite_t), xbt_test_suite_free);
+  } else {
+    xbt_test_suite_t suite;
     unsigned int it_suite;
     xbt_dynar_foreach(_xbt_test_suites, it_suite, suite)
       if (not strcmp(suite->name, name))
         return suite;
   }
 
+  xbt_test_suite_t suite = xbt_new0(s_xbt_test_suite, 1);
+  va_list ap;
   va_start(ap, fmt);
-  bufname = bvprintf(fmt, ap);
+  suite->title = bvprintf(fmt, ap);
+  suite->units = xbt_dynar_new(sizeof(xbt_test_unit_t), &xbt_test_unit_free);
   va_end(ap);
-  suite = xbt_test_suite_new(name, bufname, nullptr);
-  free(bufname);
+  suite->name    = name;
+  suite->enabled = 1;
+
+  xbt_dynar_push(_xbt_test_suites, &suite);
 
   return suite;
 }
 
-void xbt_test_suite_dump(xbt_test_suite_t suite)
+static void xbt_test_suite_dump(xbt_test_suite_t suite)
 {
   if (suite) {
     fprintf(stderr, "TESTSUITE %s: %s (%s)\n", suite->name, suite->title, suite->enabled ? "enabled" : "disabled");
-- 
2.20.1