U3V: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

[metze/wireshark/wip.git] / sync_pipe_write.c

diff --git a/sync_pipe_write.c b/sync_pipe_write.c
index 40bb2c1ce882261832497915f5972f5059e81813..c7aa3eb03b3e0da237ed652b70dbdc7197176fdc 100644 (file)
--- a/sync_pipe_write.c
+++ b/sync_pipe_write.c
@@ -1,6 +1,4 @@
 /* sync_pipe_write.c
- *
- * $Id$
  *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
@@ -21,29 +19,22 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <string.h>
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef _WIN32
-#include <io.h>
-#endif
-
 #include <glib.h>
 
+#include <wsutil/file_util.h>
+
 #include "sync_pipe.h"
-#include "log.h"
 
 /****************************************************************************************************************/
 /* sync_pipe handling */
 
 
 /* write a single message header to the recipient pipe */
-size_t
+ssize_t
 pipe_write_header(int pipe_fd, char indicator, int length)
 {
     guchar header[1+3]; /* indicator + 3-byte len */
@@ -62,8 +53,8 @@ pipe_write_header(int pipe_fd, char indicator, int length)
 }
 
 
-/* write a message to the recipient pipe in the standard format 
-   (3 digit message length (excluding length and indicator field), 
+/* write a message to the recipient pipe in the standard format
+   (3 digit message length (excluding length and indicator field),
    1 byte message indicator and the rest is the message).
    If msg is NULL, the message has only a length and indicator. */
 void
@@ -111,3 +102,16 @@ sync_pipe_errmsg_to_parent(int pipe_fd, const char *error_msg,
     pipe_write_block(pipe_fd, SP_ERROR_MSG, error_msg);
     pipe_write_block(pipe_fd, SP_ERROR_MSG, secondary_error_msg);
 }
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */