[core-c] removed ecal_ prefix of public API header files (#1939)

eclipse-ecal · Jan 30, 2025 · a996f07 · a996f07
1 parent ee1daf3
commit a996f07
Show file tree

Hide file tree

Showing 39 changed files with 190 additions and 188 deletions.
diff --git a/lang/c/core/CMakeLists.txt b/lang/c/core/CMakeLists.txt
@@ -23,19 +23,19 @@ project(core_c VERSION ${eCAL_VERSION_STRING})
 # c interface
 ######################################
 set(ecal_c_src
-    src/ecal_client_cimpl.cpp
-    src/ecal_common_cimpl.cpp
-    src/ecal_common_cimpl.h
-    src/ecal_core_cimpl.cpp
-    src/ecal_log_cimpl.cpp
-    src/ecal_monitoring_cimpl.cpp
-    src/ecal_process_cimpl.cpp
-    src/ecal_publisher_cimpl.cpp
-    src/ecal_server_cimpl.cpp
-    src/ecal_subscriber_cimpl.cpp
-    src/ecal_time_cimpl.cpp
-    src/ecal_timer_cimpl.cpp
-    src/ecal_util_cimpl.cpp    
+    src/client.cpp
+    src/common.cpp
+    src/common.h
+    src/core.cpp
+    src/log.cpp
+    src/monitoring.cpp
+    src/process.cpp
+    src/publisher.cpp
+    src/server.cpp
+    src/subscriber.cpp
+    src/time.cpp
+    src/timer.cpp
+    src/util.cpp    
 )
 
 ######################################
@@ -51,29 +51,27 @@ endif()
 ######################################
 # public header
 ######################################
-
-
 set(ecal_header_cimpl
-    include/ecal/cimpl/ecal_callback_cimpl.h
-    include/ecal/cimpl/ecal_client_cimpl.h
-    include/ecal/cimpl/ecal_core_cimpl.h
-    include/ecal/cimpl/ecal_init_cimpl.h
-    include/ecal/cimpl/ecal_log_cimpl.h
-    include/ecal/cimpl/ecal_monitoring_cimpl.h
-    include/ecal/cimpl/ecal_process_cimpl.h
-    include/ecal/cimpl/ecal_publisher_cimpl.h
-    include/ecal/cimpl/ecal_server_cimpl.h
-    include/ecal/cimpl/ecal_service_info_cimpl.h
-    include/ecal/cimpl/ecal_subscriber_cimpl.h
-    include/ecal/cimpl/ecal_time_cimpl.h
-    include/ecal/cimpl/ecal_timer_cimpl.h
-    include/ecal/cimpl/ecal_util_cimpl.h
-    include/ecal/ecalc.h
-    include/ecal/ecalc_export.h
-    include/ecal/ecalc_types.h
+    include/ecal_c/pubsub/publisher.h
+    include/ecal_c/pubsub/subscriber.h
+    include/ecal_c/service/client.h
+    include/ecal_c/service/server.h
+    include/ecal_c/service/service_info.h
+    include/ecal_c/callback.h
+    include/ecal_c/core.h
+    include/ecal_c/ecal.h
+    include/ecal_c/export.h
+    include/ecal_c/init.h
+    include/ecal_c/log.h
+    include/ecal_c/monitoring.h
+    include/ecal_c/process.h
+    include/ecal_c/time.h
+    include/ecal_c/timer.h
+    include/ecal_c/tlayer.h
+    include/ecal_c/types.h
+    include/ecal_c/util.h
 )
 
-
 set(ecal_c_sources
     ${ecal_c_src}
     ${ecal_c_win_src}

diff --git a/.../include/ecal/cimpl/ecal_callback_cimpl.h → lang/c/core/include/ecal_c/callback.h b/.../include/ecal/cimpl/ecal_callback_cimpl.h → lang/c/core/include/ecal_c/callback.h
@@ -18,12 +18,12 @@
 */
 
 /**
- * @file   ecal_callback_cimpl.h
+ * @file   ecal_c/callback.h
  * @brief  eCAL callback interface events, structs and functions
 **/
 
-#ifndef ecal_callback_cimpl_h_included
-#define ecal_callback_cimpl_h_included
+#ifndef ecal_c_callback_h_included
+#define ecal_c_callback_h_included
 
 /**
  * @brief eCAL subscriber event callback type.
@@ -189,4 +189,4 @@ typedef void(*ClientEventCallbackCT)(const char* name_, const struct SClientEven
 **/
 typedef void(*ServerEventCallbackCT)(const char* name_, const struct SServerEventCallbackDataC* data_, void* par_);
 
-#endif /* ecal_callback_cimpl_h_included */
+#endif /* ecal_c_callback_h_included */
diff --git a/...core/include/ecal/cimpl/ecal_core_cimpl.h → lang/c/core/include/ecal_c/core.h b/...core/include/ecal/cimpl/ecal_core_cimpl.h → lang/c/core/include/ecal_c/core.h
@@ -18,17 +18,17 @@
 */
 
 /**
- * @file   ecal_core_cimpl.h
+ * @file   ecal_c/core.h
  * @brief  eCAL core function c interface
 **/
 
-#ifndef ecal_core_cimpl_h_included
-#define ecal_core_cimpl_h_included
+#ifndef ecal_c_core_h_included
+#define ecal_c_core_h_included
 
-#include <ecal/ecalc_export.h>
-#include <ecal/ecalc_types.h>
+#include <ecal_c/export.h>
+#include <ecal_c/types.h>
 
-#include <ecal/cimpl/ecal_init_cimpl.h>
+#include <ecal_c/init.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -122,4 +122,4 @@ extern "C"
 }
 #endif /*__cplusplus*/
 
-#endif /*ecal_core_cimpl_h_included*/
+#endif /*ecal_c_core_h_included*/
diff --git a/lang/c/core/include/ecal/ecalc.h → lang/c/core/include/ecal_c/ecal.h b/lang/c/core/include/ecal/ecalc.h → lang/c/core/include/ecal_c/ecal.h
@@ -18,31 +18,31 @@
 */
 
 /**
- * @file   ecalc.h
+ * @file   ecal_c/ecal.h
  * @brief  eCAL main c header file
 **/
 
-#ifndef ecalc_h_included
-#define ecalc_h_included
+#ifndef ecal_c_ecal_h_included
+#define ecal_c_ecal_h_included
 
 #ifndef _MSC_VER
   #include <string.h>
 #endif
 
 // all ecal c includes
-#include <ecal/ecalc_export.h>
-#include <ecal/ecalc_types.h>
-#include <ecal/cimpl/ecal_client_cimpl.h>
-#include <ecal/cimpl/ecal_core_cimpl.h>
-#include <ecal/cimpl/ecal_log_cimpl.h>
-#include <ecal/cimpl/ecal_monitoring_cimpl.h>
-#include <ecal/cimpl/ecal_process_cimpl.h>
-#include <ecal/cimpl/ecal_publisher_cimpl.h>
-#include <ecal/cimpl/ecal_server_cimpl.h>
-#include <ecal/cimpl/ecal_subscriber_cimpl.h>
-#include <ecal/cimpl/ecal_time_cimpl.h>
-#include <ecal/cimpl/ecal_timer_cimpl.h>
-#include <ecal/cimpl/ecal_tlayer_cimpl.h>
-#include <ecal/cimpl/ecal_util_cimpl.h>
+#include <ecal_c/pubsub/publisher.h>
+#include <ecal_c/pubsub/subscriber.h>
+#include <ecal_c/service/client.h>
+#include <ecal_c/service/server.h>
+#include <ecal_c/core.h>
+#include <ecal_c/export.h>
+#include <ecal_c/log.h>
+#include <ecal_c/monitoring.h>
+#include <ecal_c/process.h>
+#include <ecal_c/time.h>
+#include <ecal_c/timer.h>
+#include <ecal_c/tlayer.h>
+#include <ecal_c/types.h>
+#include <ecal_c/util.h>
 
-#endif /* ecalc_h_included */
+#endif /* ecal_c_ecal_h_included */
diff --git a/lang/c/core/include/ecal/ecalc_export.h → lang/c/core/include/ecal_c/export.h b/lang/c/core/include/ecal/ecalc_export.h → lang/c/core/include/ecal_c/export.h
@@ -18,12 +18,12 @@
 */
 
 /**
- * @file   ecalc_export.h
+ * @file   ecal_c/export.h
  * @brief  eCAL dll / so export commands
 **/
 
-#ifndef ecalc_export_h_included
-#define ecalc_export_h_included
+#ifndef ecal_c_export_h_included
+#define ecal_c_export_h_included
 
 #ifdef _MSC_VER
   #ifdef ECAL_CORE_C_EXPORTS
@@ -45,4 +45,4 @@
   #define ECALC_API_DEPRECATED __attribute__((deprecated)) ECALC_API 
 #endif
 
-#endif
+#endif /*ecal_c_export_h_included*/
diff --git a/...core/include/ecal/cimpl/ecal_init_cimpl.h → lang/c/core/include/ecal_c/init.h b/...core/include/ecal/cimpl/ecal_init_cimpl.h → lang/c/core/include/ecal_c/init.h
@@ -18,12 +18,12 @@
 */
 
 /**
- * @file   ecal_init_cimpl.h
+ * @file   ecal_c/init.h
  * @brief  eCAL initialize components
 **/
 
-#ifndef ecal_init_cimpl_h_included
-#define ecal_init_cimpl_h_included
+#ifndef ecal_c_init_h_included
+#define ecal_c_init_h_included
 
 #define eCAL_Init_Publisher   0x01                          /*!< Initialize Publisher API            */
 #define eCAL_Init_Subscriber  0x02                          /*!< Initialize Subscriber API           */
@@ -45,4 +45,4 @@
                             | eCAL_Init_Logging    \
                             | eCAL_Init_TimeSync)           /*!< Initialize default eCAL API          */
 
-#endif /*ecal_init_cimpl_h_included*/
+#endif /*ecal_c_init_h_included*/
diff --git a/.../core/include/ecal/cimpl/ecal_log_cimpl.h → lang/c/core/include/ecal_c/log.h b/.../core/include/ecal/cimpl/ecal_log_cimpl.h → lang/c/core/include/ecal_c/log.h
@@ -18,14 +18,14 @@
 */
 
 /**
- * @file   ecal_log_cimpl.h
+ * @file   ecal_c/log.h
  * @brief  eCAL logging c interface
 **/
 
-#ifndef ecal_log_cimpl_h_included
-#define ecal_log_cimpl_h_included
+#ifndef ecal_c_log_h_included
+#define ecal_c_log_h_included
 
-#include <ecal/ecalc_export.h>
+#include <ecal_c/export.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -69,4 +69,4 @@ extern "C"
 }
 #endif /*__cplusplus*/
 
-#endif /*ecal_log_cimpl_h_included*/
+#endif /*ecal_c_log_h_included*/
diff --git a/...nclude/ecal/cimpl/ecal_monitoring_cimpl.h → lang/c/core/include/ecal_c/monitoring.h b/...nclude/ecal/cimpl/ecal_monitoring_cimpl.h → lang/c/core/include/ecal_c/monitoring.h
@@ -18,14 +18,14 @@
 */
 
 /**
- * @file   ecal_monitoring_cimpl.h
+ * @file   ecal_c/monitoring.h
  * @brief  eCAL monitoring c interface
 **/
 
-#ifndef ecal_monitoring_cimpl_h_included
-#define ecal_monitoring_cimpl_h_included
+#ifndef ecal_c_monitoring_h_included
+#define ecal_c_monitoring_h_included
 
-#include <ecal/ecalc_export.h>
+#include <ecal_c/export.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -60,4 +60,4 @@ extern "C"
 }
 #endif /*__cplusplus*/
 
-#endif /*ecal_monitoring_cimpl_h_included*/
+#endif /*ecal_c_monitoring_h_included*/
diff --git a/...e/include/ecal/cimpl/ecal_process_cimpl.h → lang/c/core/include/ecal_c/process.h b/...e/include/ecal/cimpl/ecal_process_cimpl.h → lang/c/core/include/ecal_c/process.h
@@ -18,14 +18,14 @@
 */
 
 /**
- * @file   ecal_process_cimpl.h
+ * @file   ecal_c/process.h
  * @brief  eCAL process c interface
 **/
 
-#ifndef ecal_process_cimpl_h_included
-#define ecal_process_cimpl_h_included
+#ifndef ecal_c_process_h_included
+#define ecal_c_process_h_included
 
-#include <ecal/ecalc_export.h>
+#include <ecal_c/export.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -188,4 +188,4 @@ extern "C"
 }
 #endif /*__cplusplus*/
 
-#endif /*ecal_process_cimpl_h_included*/
+#endif /*ecal_c_process_h_included*/
diff --git a/...include/ecal/cimpl/ecal_publisher_cimpl.h → .../c/core/include/ecal_c/pubsub/publisher.h b/...include/ecal/cimpl/ecal_publisher_cimpl.h → .../c/core/include/ecal_c/pubsub/publisher.h
@@ -18,17 +18,17 @@
 */
 
 /**
- * @file   ecal_publisher_cimpl.h
+ * @file   ecal_c/pubsub/publisher.h
  * @brief  eCAL publisher c interface
 **/
 
-#ifndef ecal_publisher_cimpl_h_included
-#define ecal_publisher_cimpl_h_included
+#ifndef ecal_c_pubsub_publisher_h_included
+#define ecal_c_pubsub_publisher_h_included
 
-#include <ecal/ecalc_export.h>
-#include <ecal/ecalc_types.h>
+#include <ecal_c/export.h>
+#include <ecal_c/types.h>
 
-#include <ecal/cimpl/ecal_callback_cimpl.h>
+#include <ecal_c/callback.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -157,4 +157,4 @@ extern "C"
 }
 #endif /*__cplusplus*/
 
-#endif /*ecal_publisher_cimpl_h_included*/
+#endif /*ecal_c_pubsub_publisher_h_included*/
diff --git a/...nclude/ecal/cimpl/ecal_subscriber_cimpl.h → ...c/core/include/ecal_c/pubsub/subscriber.h b/...nclude/ecal/cimpl/ecal_subscriber_cimpl.h → ...c/core/include/ecal_c/pubsub/subscriber.h
@@ -18,17 +18,17 @@
 */
 
 /**
- * @file   ecal_subscriber_cimpl.h
+ * @file   ecal_c/pubsub/subscriber.h
  * @brief  eCAL subscriber c interface
 **/
 
-#ifndef ecal_subscriber_cimpl_h_included
-#define ecal_subscriber_cimpl_h_included
+#ifndef ecal_c_pubsub_subscriber_h_included
+#define ecal_c_pubsub_subscriber_h_included
 
-#include <ecal/ecalc_export.h>
-#include <ecal/ecalc_types.h>
+#include <ecal_c/export.h>
+#include <ecal_c/types.h>
 
-#include <ecal/cimpl/ecal_callback_cimpl.h>
+#include <ecal_c/callback.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -235,4 +235,4 @@ extern "C"
 }
 #endif /*__cplusplus*/
 
-#endif /*ecal_subscriber_cimpl_h_included*/
+#endif /*ecal_c_pubsub_subscriber_h_included*/
diff --git a/...re/include/ecal/cimpl/ecal_client_cimpl.h → lang/c/core/include/ecal_c/service/client.h b/...re/include/ecal/cimpl/ecal_client_cimpl.h → lang/c/core/include/ecal_c/service/client.h
@@ -18,18 +18,18 @@
 */
 
 /**
- * @file   ecal_client_cimpl.h
+ * @file   ecal_c/service/client.h
  * @brief  eCAL client c interface
 **/
 
-#ifndef ecal_client_cimpl_h_included
-#define ecal_client_cimpl_h_included
+#ifndef ecal_c_service_client_h_included
+#define ecal_c_service_client_h_included
 
-#include <ecal/ecalc_export.h>
-#include <ecal/ecalc_types.h>
+#include <ecal_c/export.h>
+#include <ecal_c/types.h>
 
-#include <ecal/cimpl/ecal_callback_cimpl.h>
-#include <ecal/cimpl/ecal_service_info_cimpl.h>
+#include <ecal_c/callback.h>
+#include <ecal_c/service/service_info.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -168,4 +168,4 @@ extern "C"
 }
 #endif /*__cplusplus*/
 
-#endif /*ecal_client_cimpl_h_included*/
+#endif /*ecal_c_service_client_h_included*/