diff options
author | darkjames <darkjames@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-06-13 15:28:37 +0000 |
---|---|---|
committer | darkjames <darkjames@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-06-13 15:28:37 +0000 |
commit | e224ee8ebc3c661b6c7b74b3ca29992873144a5d (patch) | |
tree | 87f6de1f492ceef54221f05f933905d28977a023 /dumpcap.c | |
parent | e70d8c76946250a5e55c79047cb1764d6d7583b2 (diff) |
Remove not used cap_pipe_err_str.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37662 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'dumpcap.c')
-rw-r--r-- | dumpcap.c | 12 |
1 files changed, 2 insertions, 10 deletions
@@ -329,7 +329,6 @@ static gboolean need_timeout_workaround; #else #define PIPE_READ_TIMEOUT 100000 #endif -static const char *cap_pipe_err_str; #define WRITER_THREAD_TIMEOUT 100000 /* usecs */ @@ -1610,17 +1609,13 @@ static void *cap_pipe_read(void *arg) /* Provide select() functionality for a single file descriptor * on UNIX/POSIX. Windows uses cap_pipe_read via a thread. * - * Returns the same values as select. If an error is returned, - * the string cap_pipe_err_str should be used instead of errno. + * Returns the same values as select. */ static int cap_pipe_select(int pipe_fd) { fd_set rfds; struct timeval timeout; - int sel_ret; - - cap_pipe_err_str = "Unknown error"; FD_ZERO(&rfds); FD_SET(pipe_fd, &rfds); @@ -1628,10 +1623,7 @@ cap_pipe_select(int pipe_fd) timeout.tv_sec = PIPE_READ_TIMEOUT / 1000000; timeout.tv_usec = PIPE_READ_TIMEOUT % 1000000; - sel_ret = select(pipe_fd+1, &rfds, NULL, NULL, &timeout); - if (sel_ret < 0) - cap_pipe_err_str = strerror(errno); - return sel_ret; + return select(pipe_fd+1, &rfds, NULL, NULL, &timeout); } |