Remove 'global' keyword from error callback function names

Copilot · wysaid · wysaid · commit a05d43c82f92 · 2025-08-14T17:01:05.000+08:00
Co-authored-by: wysaid &lt;1430725+wysaid@users.noreply.github.com&gt;
diff --git a/README.md b/README.md
@@ -122,8 +122,8 @@ Starting from v1.2.0, ccap uses a global error callback system for simplified er
 #include <iostream>
 
 int main() {
-    // Set global error callback to receive detailed error information
-    ccap::setGlobalErrorCallback([](ccap::ErrorCode errorCode, const std::string& description) {
+    // Set error callback to receive detailed error information
+    ccap::setErrorCallback([](ccap::ErrorCode errorCode, const std::string& description) {
         std::cerr << "Camera Error - Code: " << static_cast<int>(errorCode) 
                   << ", Description: " << description << std::endl;
     });
@@ -516,8 +516,8 @@ typedef enum {
 // Error callback function
 typedef void (*CcapErrorCallback)(CcapErrorCode errorCode, const char* errorDescription, void* userData);
 
-// Set global error callback
-bool ccap_set_global_error_callback(CcapErrorCallback callback, void* userData);
+// Set error callback
+bool ccap_set_error_callback(CcapErrorCallback callback, void* userData);
 
 // Get error description
 const char* ccap_error_code_to_string(CcapErrorCode errorCode);
@@ -528,8 +528,8 @@ void error_callback(CcapErrorCode errorCode, const char* errorDescription, void*
 }
 
 int main() {
-    // Set global error callback to receive error notifications
-    ccap_set_global_error_callback(error_callback, NULL);
+    // Set error callback to receive error notifications
+    ccap_set_error_callback(error_callback, NULL);
     
     CcapProvider* provider = ccap_provider_create();
     
diff --git a/docs/C_Interface.md b/docs/C_Interface.md
@@ -272,8 +272,8 @@ typedef enum {
 // 错误回调函数类型
 typedef void (*CcapErrorCallback)(CcapErrorCode errorCode, const char* errorDescription, void* userData);
 
-// 设置全局错误回调
-bool ccap_set_global_error_callback(CcapErrorCallback callback, void* userData);
+// 设置错误回调
+bool ccap_set_error_callback(CcapErrorCallback callback, void* userData);
 
 // 获取错误码描述
 const char* ccap_error_code_to_string(CcapErrorCode errorCode);
@@ -288,8 +288,8 @@ void error_callback(CcapErrorCode errorCode, const char* errorDescription, void*
 }
 
 int main() {
-    // 设置全局错误回调
-    ccap_set_global_error_callback(error_callback, NULL);
+    // 设置错误回调
+    ccap_set_error_callback(error_callback, NULL);
     
     CcapProvider* provider = ccap_provider_create();
     
diff --git a/examples/desktop/0-print_camera.cpp b/examples/desktop/0-print_camera.cpp
@@ -60,8 +60,8 @@ void printCameraInfo(const std::string& deviceName) {
 }
 
 int main() {
-    // Set global error callback to receive error notifications
-    ccap::setGlobalErrorCallback([](ccap::ErrorCode errorCode, const std::string& description) {
+    // Set error callback to receive error notifications
+    ccap::setErrorCallback([](ccap::ErrorCode errorCode, const std::string& description) {
         std::cerr << "Camera Error - Code: " << static_cast<int>(errorCode) 
                   << ", Description: " << description << std::endl;
     });
diff --git a/examples/desktop/0-print_camera_c.c b/examples/desktop/0-print_camera_c.c
@@ -37,8 +37,8 @@ int main() {
     printf("ccap C Interface Example\n");
     printf("Version: %s\n\n", ccap_get_version());
 
-    // Set global error callback to receive error notifications
-    ccap_set_global_error_callback(error_callback, NULL);
+    // Set error callback to receive error notifications
+    ccap_set_error_callback(error_callback, NULL);
 
     // Create provider
     CcapProvider* provider = ccap_provider_create();
diff --git a/examples/desktop/1-minimal_example.cpp b/examples/desktop/1-minimal_example.cpp
@@ -12,8 +12,8 @@
 #include <iostream>
 
 int main() {
-    // Set global error callback to receive error notifications
-    ccap::setGlobalErrorCallback([](ccap::ErrorCode errorCode, const std::string& description) {
+    // Set error callback to receive error notifications
+    ccap::setErrorCallback([](ccap::ErrorCode errorCode, const std::string& description) {
         std::cerr << "Error occurred - Code: " << static_cast<int>(errorCode) 
                   << ", Description: " << description << std::endl;
     });
diff --git a/examples/desktop/1-minimal_example_c.c b/examples/desktop/1-minimal_example_c.c
@@ -22,8 +22,8 @@ int main() {
     printf("ccap C Interface Minimal Example\n");
     printf("Version: %s\n\n", ccap_get_version());
 
-    // Set global error callback to receive error notifications
-    ccap_set_global_error_callback(error_callback, NULL);
+    // Set error callback to receive error notifications
+    ccap_set_error_callback(error_callback, NULL);
 
     // Create provider
     CcapProvider* provider = ccap_provider_create();
diff --git a/examples/desktop/2-capture_grab.cpp b/examples/desktop/2-capture_grab.cpp
@@ -19,8 +19,8 @@ int main(int argc, char** argv) {
     /// Enable verbose log to see debug information
     ccap::setLogLevel(ccap::LogLevel::Verbose);
 
-    // Set global error callback to receive error notifications
-    ccap::setGlobalErrorCallback([](ccap::ErrorCode errorCode, const std::string& description) {
+    // Set error callback to receive error notifications
+    ccap::setErrorCallback([](ccap::ErrorCode errorCode, const std::string& description) {
         std::cerr << "Camera Error - Code: " << static_cast<int>(errorCode) 
                   << ", Description: " << description << std::endl;
     });
diff --git a/examples/desktop/2-capture_grab_c.c b/examples/desktop/2-capture_grab_c.c
@@ -27,8 +27,8 @@ int main(int argc, char** argv) {
     // Enable verbose log to see debug information
     ccap_set_log_level(CCAP_LOG_LEVEL_VERBOSE);
 
-    // Set global error callback to receive error notifications
-    ccap_set_global_error_callback(error_callback, NULL);
+    // Set error callback to receive error notifications
+    ccap_set_error_callback(error_callback, NULL);
 
     // Get current working directory and create capture directory
     char cwd[1024];
diff --git a/examples/desktop/3-capture_callback.cpp b/examples/desktop/3-capture_callback.cpp
@@ -36,8 +36,8 @@ int main(int argc, char** argv) {
 
     ccap::Provider cameraProvider;
 
-    // Set global error callback to receive error notifications
-    ccap::setGlobalErrorCallback([](ccap::ErrorCode errorCode, const std::string& description) {
+    // Set error callback to receive error notifications
+    ccap::setErrorCallback([](ccap::ErrorCode errorCode, const std::string& description) {
         std::cerr << "Camera Error - Code: " << static_cast<int>(errorCode) 
                   << ", Description: " << description << std::endl;
     });
diff --git a/examples/desktop/3-capture_callback_c.c b/examples/desktop/3-capture_callback_c.c
@@ -112,8 +112,8 @@ int main(int argc, char** argv) {
         return -1;
     }
 
-    // Set global error callback to receive error notifications
-    ccap_set_global_error_callback(error_callback, NULL);
+    // Set error callback to receive error notifications
+    ccap_set_error_callback(error_callback, NULL);
 
     // Find and print available devices
     CcapDeviceNamesList deviceList;
diff --git a/include/ccap_c.h b/include/ccap_c.h
@@ -312,16 +312,16 @@ void ccap_provider_set_max_cache_frame_size(CcapProvider* provider, uint32_t siz
 
 
 
-/* ========== Global Error Callback ========== */
+/* ========== Error Callback ========== */
 
 /**
- * @brief Set global error callback for all camera operations
+ * @brief Set error callback for all camera operations
  * @param callback Error callback function (NULL to remove callback)
  * @param userData User data passed to callback
  * @return true on success, false on failure
- * @note This global callback will be used by all provider instances
+ * @note This callback will be used by all provider instances
  */
-bool ccap_set_global_error_callback(CcapErrorCallback callback, void* userData);
+bool ccap_set_error_callback(CcapErrorCallback callback, void* userData);
 
 /* ========== Utility Functions ========== */
 
diff --git a/include/ccap_core.h b/include/ccap_core.h
@@ -228,21 +228,21 @@ class Provider final {
 };
 
 /**
- * @brief Sets the global error callback function to handle errors from all camera operations.
+ * @brief Sets the error callback function to handle errors from all camera operations.
  * @param callback The callback function to be invoked when an error occurs.
  *     The callback receives an error code and English description of the error.
- *     Pass nullptr to remove the global error callback.
+ *     Pass nullptr to remove the error callback.
  * @note The callback is executed in the same thread where the error occurs.
  *       Keep the callback implementation lightweight to avoid blocking camera operations.
- *       This global callback will be used by all Provider instances.
+ *       This callback will be used by all Provider instances.
  */
-void setGlobalErrorCallback(ErrorCallback callback);
+void setErrorCallback(ErrorCallback callback);
 
 /**
- * @brief Gets the current global error callback function.
- * @return The current global error callback, or nullptr if none is set.
+ * @brief Gets the current error callback function.
+ * @return The current error callback, or nullptr if none is set.
  */
-ErrorCallback getGlobalErrorCallback();
+ErrorCallback getErrorCallback();
 
 } // namespace ccap
 
diff --git a/src/ccap_c.cpp b/src/ccap_c.cpp
@@ -364,14 +364,14 @@ void ccap_provider_set_max_cache_frame_size(CcapProvider* provider, uint32_t siz
 
 /* ========== Global Error Callback ========== */
 
-bool ccap_set_global_error_callback(CcapErrorCallback callback, void* userData) {
+bool ccap_set_error_callback(CcapErrorCallback callback, void* userData) {
     try {
         std::lock_guard<std::mutex> lock(g_cErrorCallbackMutex);
         
         if (callback) {
             g_cGlobalErrorCallbackWrapper = std::make_shared<ErrorCallbackWrapper>(callback, userData);
             
-            ccap::setGlobalErrorCallback([](ccap::ErrorCode errorCode, const std::string& description) {
+            ccap::setErrorCallback([](ccap::ErrorCode errorCode, const std::string& description) {
                 std::lock_guard<std::mutex> lock(g_cErrorCallbackMutex);
                 if (g_cGlobalErrorCallbackWrapper && g_cGlobalErrorCallbackWrapper->callback) {
                     g_cGlobalErrorCallbackWrapper->callback(convert_error_code_to_c(errorCode), 
@@ -381,7 +381,7 @@ bool ccap_set_global_error_callback(CcapErrorCallback callback, void* userData)
             });
         } else {
             g_cGlobalErrorCallbackWrapper = nullptr;
-            ccap::setGlobalErrorCallback(nullptr);
+            ccap::setErrorCallback(nullptr);
         }
         
         return true;
diff --git a/src/ccap_core.cpp b/src/ccap_core.cpp
@@ -41,12 +41,12 @@ namespace {
     ErrorCallback g_globalErrorCallback;
 }
 
-void setGlobalErrorCallback(ErrorCallback callback) {
+void setErrorCallback(ErrorCallback callback) {
     std::lock_guard<std::mutex> lock(g_errorCallbackMutex);
     g_globalErrorCallback = std::move(callback);
 }
 
-ErrorCallback getGlobalErrorCallback() {
+ErrorCallback getErrorCallback() {
     std::lock_guard<std::mutex> lock(g_errorCallbackMutex);
     return g_globalErrorCallback;
 }
diff --git a/src/ccap_imp.cpp b/src/ccap_imp.cpp
@@ -14,7 +14,7 @@
 
 namespace ccap {
 void resetSharedAllocator();
-ErrorCallback getGlobalErrorCallback(); // Forward declaration
+ErrorCallback getErrorCallback(); // Forward declaration
 
 uint8_t* DefaultAllocator::data() { return m_data; }
 
@@ -191,7 +191,7 @@ std::shared_ptr<VideoFrame> ProviderImp::getFreeFrame() {
 }
 
 void ProviderImp::reportError(ErrorCode errorCode, const std::string& description) {
-    ErrorCallback globalCallback = getGlobalErrorCallback();
+    ErrorCallback globalCallback = getErrorCallback();
     if (globalCallback) {
         try {
             globalCallback(errorCode, description);

Original file line number	Diff line number	Diff line change
`@@ -112,8 +112,8 @@ int main(int argc, char** argv) {`
`112`	`112`	`return -1;`
`113`	`113`	`}`
`114`	`114`
`115`		`- // Set global error callback to receive error notifications`
`116`		`- ccap_set_global_error_callback(error_callback, NULL);`
	`115`	`+ // Set error callback to receive error notifications`
	`116`	`+ ccap_set_error_callback(error_callback, NULL);`
`117`	`117`
`118`	`118`	`// Find and print available devices`
`119`	`119`	`CcapDeviceNamesList deviceList;`