diff options
author | Dario Lombardo <lomato@gmail.com> | 2016-02-22 16:28:15 +0100 |
---|---|---|
committer | Roland Knall <rknall@gmail.com> | 2016-02-26 10:02:59 +0000 |
commit | 298012359b52a9bf1ca22e0d1bedf23ec3e7680f (patch) | |
tree | a45d34417930edf1b3a9299bac31efdf7f71ef2b /extcap/androiddump.c | |
parent | 3b9306e91b397755785b6b85be10594b2bfaf740 (diff) | |
download | wireshark-298012359b52a9bf1ca22e0d1bedf23ec3e7680f.tar.gz |
extcap: move windows functions into extcap-base
Change-Id: Iec7fed027a24992afd673b09c32470af51739ae5
Reviewed-on: https://code.wireshark.org/review/14075
Reviewed-by: Roland Knall <rknall@gmail.com>
Diffstat (limited to 'extcap/androiddump.c')
-rw-r--r-- | extcap/androiddump.c | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/extcap/androiddump.c b/extcap/androiddump.c index e5b68fbfb7..a862c9ec76 100644 --- a/extcap/androiddump.c +++ b/extcap/androiddump.c @@ -104,7 +104,6 @@ #define PACKET_LENGTH 65535 #define verbose_print(...) { if (verbose) printf(__VA_ARGS__); } -#define errmsg_print(...) { fprintf(stderr, __VA_ARGS__); fprintf(stderr, "\n"); } enum { EXTCAP_BASE_OPTIONS_ENUM, @@ -1990,52 +1989,7 @@ static int capture_android_logcat(char *interface, char *fifo, /*============================================================================*/ -#ifdef _WIN32 -BOOLEAN IsHandleRedirected(DWORD handle) -{ - HANDLE h = GetStdHandle(handle); - if (h) { - BY_HANDLE_FILE_INFORMATION fi; - if (GetFileInformationByHandle(h, &fi)) { - return TRUE; - } - } - return FALSE; -} - -static void attach_parent_console() -{ - BOOL outRedirected, errRedirected; - - outRedirected = IsHandleRedirected(STD_OUTPUT_HANDLE); - errRedirected = IsHandleRedirected(STD_ERROR_HANDLE); - - if (outRedirected && errRedirected) { - /* Both standard output and error handles are redirected. - * There is no point in attaching to parent process console. - */ - return; - } - - if (AttachConsole(ATTACH_PARENT_PROCESS) == 0) { - /* Console attach failed. */ - return; - } - - /* Console attach succeeded */ - if (outRedirected == FALSE) { - if (!freopen("CONOUT$", "w", stdout)) { - errmsg_print("WARNING: Cannot redirect to stdout."); - } - } - if (errRedirected == FALSE) { - if (!freopen("CONOUT$", "w", stderr)) { - errmsg_print("WARNING: Cannot redirect to strerr."); - } - } -} -#endif /*----------------------------------------------------------------------------*/ /* Android Wifi Tcpdump */ |