From 242887bc5698ac84261625013cc39112d2ce38eb Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Thu, 13 Sep 2018 06:19:05 +0200
Subject: Rename files to make them unique within cpukit

This allows to build librtemscpu.a in one rush in the future.
---
 cpukit/sapi/Makefile.am            |  2 +-
 cpukit/sapi/src/rbtreeinsert.c     | 58 --------------------------------------
 cpukit/sapi/src/sapirbtreeinsert.c | 58 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 59 deletions(-)
 delete mode 100644 cpukit/sapi/src/rbtreeinsert.c
 create mode 100644 cpukit/sapi/src/sapirbtreeinsert.c

(limited to 'cpukit/sapi')

diff --git a/cpukit/sapi/Makefile.am b/cpukit/sapi/Makefile.am
index 4848e64f3b..0fef05de7d 100644
--- a/cpukit/sapi/Makefile.am
+++ b/cpukit/sapi/Makefile.am
@@ -18,7 +18,7 @@ libsapi_a_SOURCES += src/delayticks.c
 libsapi_a_SOURCES += src/delaynano.c
 libsapi_a_SOURCES += src/rbtree.c
 libsapi_a_SOURCES += src/rbtreefind.c
-libsapi_a_SOURCES += src/rbtreeinsert.c
+libsapi_a_SOURCES += src/sapirbtreeinsert.c
 libsapi_a_SOURCES += src/panic.c
 libsapi_a_SOURCES += src/profilingiterate.c
 libsapi_a_SOURCES += src/profilingreportxml.c
diff --git a/cpukit/sapi/src/rbtreeinsert.c b/cpukit/sapi/src/rbtreeinsert.c
deleted file mode 100644
index db55e4358b..0000000000
--- a/cpukit/sapi/src/rbtreeinsert.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *  Copyright (c) 2010-2012 Gedare Bloom.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
-
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <rtems/rbtree.h>
-#include <rtems/score/rbtreeimpl.h>
-
-RTEMS_STATIC_ASSERT(
-  sizeof( rtems_rbtree_compare_result ) >= sizeof( intptr_t ),
-  rtems_rbtree_compare_result_intptr_t
-);
-
-RTEMS_STATIC_ASSERT(
-  sizeof( rtems_rbtree_compare_result ) >= sizeof( int32_t ),
-  rtems_rbtree_compare_result_int32_t
-);
-
-rtems_rbtree_node *rtems_rbtree_insert(
-  rtems_rbtree_control *the_rbtree,
-  rtems_rbtree_node    *the_node,
-  rtems_rbtree_compare  compare,
-  bool                  is_unique
-)
-{
-  rtems_rbtree_node **which = _RBTree_Root_reference( the_rbtree );
-  rtems_rbtree_node  *parent = NULL;
-
-  while ( *which != NULL ) {
-    rtems_rbtree_compare_result compare_result;
-
-    parent = *which;
-    compare_result = ( *compare )( the_node, parent );
-
-    if ( is_unique && rtems_rbtree_is_equal( compare_result ) ) {
-      return parent;
-    }
-
-    if ( rtems_rbtree_is_lesser( compare_result ) ) {
-      which = _RBTree_Left_reference( parent );
-    } else {
-      which = _RBTree_Right_reference( parent );
-    }
-  }
-
-  _RBTree_Initialize_node( the_node );
-  _RBTree_Add_child( the_node, parent, which );
-  _RBTree_Insert_color( the_rbtree, the_node );
-
-  return NULL;
-}
diff --git a/cpukit/sapi/src/sapirbtreeinsert.c b/cpukit/sapi/src/sapirbtreeinsert.c
new file mode 100644
index 0000000000..db55e4358b
--- /dev/null
+++ b/cpukit/sapi/src/sapirbtreeinsert.c
@@ -0,0 +1,58 @@
+/*
+ *  Copyright (c) 2010-2012 Gedare Bloom.
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.org/license/LICENSE.
+ */
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <rtems/rbtree.h>
+#include <rtems/score/rbtreeimpl.h>
+
+RTEMS_STATIC_ASSERT(
+  sizeof( rtems_rbtree_compare_result ) >= sizeof( intptr_t ),
+  rtems_rbtree_compare_result_intptr_t
+);
+
+RTEMS_STATIC_ASSERT(
+  sizeof( rtems_rbtree_compare_result ) >= sizeof( int32_t ),
+  rtems_rbtree_compare_result_int32_t
+);
+
+rtems_rbtree_node *rtems_rbtree_insert(
+  rtems_rbtree_control *the_rbtree,
+  rtems_rbtree_node    *the_node,
+  rtems_rbtree_compare  compare,
+  bool                  is_unique
+)
+{
+  rtems_rbtree_node **which = _RBTree_Root_reference( the_rbtree );
+  rtems_rbtree_node  *parent = NULL;
+
+  while ( *which != NULL ) {
+    rtems_rbtree_compare_result compare_result;
+
+    parent = *which;
+    compare_result = ( *compare )( the_node, parent );
+
+    if ( is_unique && rtems_rbtree_is_equal( compare_result ) ) {
+      return parent;
+    }
+
+    if ( rtems_rbtree_is_lesser( compare_result ) ) {
+      which = _RBTree_Left_reference( parent );
+    } else {
+      which = _RBTree_Right_reference( parent );
+    }
+  }
+
+  _RBTree_Initialize_node( the_node );
+  _RBTree_Add_child( the_node, parent, which );
+  _RBTree_Insert_color( the_rbtree, the_node );
+
+  return NULL;
+}
-- 
cgit v1.2.3