log: address wsa error function comments

braydonk · edsiper · commit 408fa91bf5db · 2025-03-29T11:00:22.000-06:00
Signed-off-by: braydonk &lt;braydonk@google.com&gt;
diff --git a/include/fluent-bit/flb_log.h b/include/fluent-bit/flb_log.h
@@ -232,7 +232,9 @@ static inline int flb_log_suppress_check(int log_suppress_interval, const char *
 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);
+#endif
 
 #ifdef __FLB_FILENAME__
 #define flb_errno() flb_errno_print(errno, __FLB_FILENAME__, __LINE__)
diff --git a/src/flb_log.c b/src/flb_log.c
@@ -126,8 +126,6 @@ static inline int log_read(flb_pipefd_t fd, struct flb_log *log)
     bytes = flb_pipe_read_all(fd, &msg, sizeof(struct log_message));
 
     if (bytes <= 0) {
-        flb_pipe_error();
-
         return -1;
     }
     if (msg.size > sizeof(msg.msg)) {
@@ -750,16 +748,17 @@ int flb_errno_print(int errnum, const char *file, int line)
     return 0;
 }
 
+#ifdef WIN32
 int flb_WSAGetLastError_print(int errnum, const char *file, int line)
 {
-#ifdef WIN32
     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);
-#endif
+    return 0;
 }
+#endif
 
 int flb_log_destroy(struct flb_log *log, struct flb_config *config)
 {
diff --git a/x.conf b/x.conf
@@ -0,0 +1,6 @@
+[INPUT]
+    Name dummy
+
+[OUTPUT]
+    Name es
+    Match *

Original file line number	Diff line number	Diff line change
`@@ -126,8 +126,6 @@ static inline int log_read(flb_pipefd_t fd, struct flb_log *log)`
`126`	`126`	`bytes = flb_pipe_read_all(fd, &msg, sizeof(struct log_message));`
`127`	`127`
`128`	`128`	`if (bytes <= 0) {`
`129`		`- flb_pipe_error();`
`130`		`-`
`131`	`129`	`return -1;`
`132`	`130`	`}`
`133`	`131`	`if (msg.size > sizeof(msg.msg)) {`
`@@ -750,16 +748,17 @@ int flb_errno_print(int errnum, const char *file, int line)`
`750`	`748`	`return 0;`
`751`	`749`	`}`
`752`	`750`
	`751`	`+#ifdef WIN32`
`753`	`752`	`int flb_WSAGetLastError_print(int errnum, const char *file, int line)`
`754`	`753`	`{`
`755`		`-#ifdef WIN32`
`756`	`754`	`char buf[256];`
`757`	`755`	`FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM \| FORMAT_MESSAGE_IGNORE_INSERTS,`
`758`	`756`	`NULL, errnum, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),`
`759`	`757`	`buf, sizeof(buf), NULL);`
`760`	`758`	`flb_error("[%s:%i WSAGetLastError=%i] %s", file, line, errnum, buf);`
`761`		`-#endif`
	`759`	`+ return 0;`
`762`	`760`	`}`
	`761`	`+#endif`
`763`	`762`
`764`	`763`	`int flb_log_destroy(struct flb_log log, struct flb_config config)`
`765`	`764`	`{`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +[INPUT]
 +    Name dummy
++
 +[OUTPUT]
 +    Name es
 +    Match *