From 7dcc3d5eab873d942879aedda6139128230756bb Mon Sep 17 00:00:00 2001
From: Bert Belder <bertbelder@gmail.com>
Date: Thu, 7 Dec 2017 22:06:11 +0100
Subject: [PATCH] error: remove return_handle_error() and helpers

---
 src/error.c |  6 ------
 src/error.h | 11 +----------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/error.c b/src/error.c
index b0cae2f..6b81179 100644
--- a/src/error.c
+++ b/src/error.c
@@ -134,9 +134,3 @@ int err_check_handle(HANDLE handle) {
 
   return 0;
 }
-
-void err_validate_handle_and_set_win_error(HANDLE handle, DWORD error) {
-  if (err_check_handle(handle) < 0)
-    return;
-  err_set_win_error(error);
-}
diff --git a/src/error.h b/src/error.h
index c5ca688..1e4591b 100644
--- a/src/error.h
+++ b/src/error.h
@@ -11,20 +11,11 @@
     err_set_win_error(error);              \
     return (value);                        \
   } while (0)
-#define return_error(value, ...) _return_error_helper(__VA_ARGS__ + 0, value)
 
-#define _return_handle_error_helper(error, value, handle)          \
-  do {                                                             \
-    err_validate_handle_and_set_win_error((HANDLE) handle, error); \
-    return (value);                                                \
-  } while (0)
-#define return_handle_error(value, handle, ...) \
-  _return_handle_error_helper(__VA_ARGS__ + 0, value, handle)
+#define return_error(value, ...) _return_error_helper(__VA_ARGS__ + 0, value)
 
 WEPOLL_INTERNAL errno_t err_map_win_error_to_errno(DWORD error);
 WEPOLL_INTERNAL void err_set_win_error(DWORD error);
 WEPOLL_INTERNAL int err_check_handle(HANDLE handle);
-WEPOLL_INTERNAL void err_validate_handle_and_set_win_error(HANDLE handle,
-                                                           DWORD error);
 
 #endif /* WEPOLL_ERROR_H_ */