diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2015-04-08 21:55:46 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-04-09 23:14:25 +0000 |
| commit | 806ba8c63af2f27dc5e35c85251492eaf56013e7 (patch) | |
| tree | 7d81bbd1310157f210eaf884aa31c2ac71911da7 /extcap | |
| parent | 10e20531d327b8baa2d9ab932eb7564dc3b8ffd9 (diff) | |
| download | wireshark-806ba8c63af2f27dc5e35c85251492eaf56013e7.tar.gz wireshark-806ba8c63af2f27dc5e35c85251492eaf56013e7.tar.bz2 wireshark-806ba8c63af2f27dc5e35c85251492eaf56013e7.zip | |
Androiddump: fix Null pointer passed as an argument to a 'nonnull' parameter
By remove duplicate code...
Change-Id: I247c64864c112b08e912d4738478a22e65470eb4
Reviewed-on: https://code.wireshark.org/review/7988
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'extcap')
| -rw-r--r-- | extcap/androiddump.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/extcap/androiddump.c b/extcap/androiddump.c index 933b2fa358..91ca612d5e 100644 --- a/extcap/androiddump.c +++ b/extcap/androiddump.c @@ -999,19 +999,6 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo, } } - closesocket(sock); - - sock = adb_connect(adb_server_ip, adb_server_tcp_port); - if (sock < 0) - return -1; - - sprintf((char *) helpful_packet, adb_transport_serial_templace, 15 + strlen(serial_number), serial_number); - result = adb_send(sock, helpful_packet); - if (result) { - fprintf(stderr, "ERROR: Error while setting adb transport for <%s>\n", helpful_packet); - return 1; - } - result = adb_send(sock, adb_shell_hcidump); if (result) { fprintf(stderr, "ERROR: Error while starting capture by sending command: %s\n", adb_shell_hcidump); |