log: rename get last error print

Signed-off-by: braydonk <[email protected]>

Author: braydonk

include/fluent-bit/flb_log.h

@@ -233,18 +233,18 @@ int flb_log_worker_init(struct flb_worker *worker);
 int flb_log_worker_destroy(struct flb_worker *worker);
 int flb_errno_print(int errnum, const char *file, int line);
 #ifdef WIN32
-int flb_WSAGetLastError_print(int errnum, const char *file, int line);
+int flb_wsa_get_last_error_print(int errnum, const char *file, int line);
 #endif
 
 #ifdef __FLB_FILENAME__
 #define flb_errno() flb_errno_print(errno, __FLB_FILENAME__, __LINE__)
 #ifdef WIN32
-#define flb_WSAGetLastError() flb_WSAGetLastError_print(WSAGetLastError(), __FLB_FILENAME__, __LINE__)
+#define flb_wsa_get_last_error() flb_wsa_get_last_error_print(WSAGetLastError(), __FLB_FILENAME__, __LINE__)
 #endif
 #else
 #define flb_errno() flb_errno_print(errno, __FILE__, __LINE__)
 #ifdef WIN32
-#define flb_WSAGetLastError() flb_WSAGetLastError_print(WSAGetLastError(), __FILE__, __LINE__)
+#define flb_wsa_get_last_error() flb_wsa_get_last_error_print(WSAGetLastError(), __FILE__, __LINE__)
 #endif
 #endif
 

include/fluent-bit/flb_pipe.h

@@ -28,7 +28,7 @@
 #define flb_sockfd_t evutil_socket_t
 #define flb_pipe_w(fd, buf, len) send(fd, buf, len, 0)
 #define flb_pipe_r(fd, buf, len) recv(fd, buf, len, 0)
-#define flb_pipe_error() flb_WSAGetLastError()
+#define flb_pipe_error() flb_wsa_get_last_error()
 #define FLB_PIPE_WOULDBLOCK() (WSAGetLastError() == WSAEWOULDBLOCK)
 #else
 #define flb_pipefd_t int

src/flb_log.c

@@ -745,18 +745,18 @@ int flb_errno_print(int errnum, const char *file, int line)
 
     strerror_r(errnum, buf, sizeof(buf) - 1);
     flb_error("[%s:%i errno=%i] %s", file, line, errnum, buf);
-    return 0;
+    return errnum;
 }
 
 #ifdef WIN32
-int flb_WSAGetLastError_print(int errnum, const char *file, int line)
+int flb_wsa_get_last_error_print(int errnum, const char *file, int line)
 {
     char buf[256];
     FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
                   NULL, errnum, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
                   buf, sizeof(buf), NULL);
     flb_error("[%s:%i WSAGetLastError=%i] %s", file, line, errnum, buf);
-    return 0;
+    return errnum;
 }
 #endif