summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Ovsienko <denis@ovsienko.info>2023-02-11 14:09:25 +0000
committerDenis Ovsienko <denis@ovsienko.info>2023-02-11 14:12:39 +0000
commitd376f6565bdd3d50256e48b7765c234493c26877 (patch)
treed71ecb48948c1a7b52357d2d10caf60b5c698a42
parente4461319a29555a8335ba2070918de4fe9e85a7e (diff)
downloadlibpcap-d376f6565bdd3d50256e48b7765c234493c26877.tar.gz
Refine some C in pcap-haiku.c. [skip ci]
Convert prepare_request() from bool to int and squelch the warnings: ./pcap-haiku.c:39:1: warning: no previous prototype for 'prepare_request' [-Wmissing-prototypes] ./pcap-haiku.c: In function 'pcap_inject_haiku': ./pcap-haiku.c:110:47: warning: unused parameter 'buffer' [-Wunused-parameter] ./pcap-haiku.c:110:59: warning: unused parameter 'size' [-Wunused-parameter] ./pcap-haiku.c: In function 'get_if_flags': ./pcap-haiku.c:273:26: warning: unused parameter 'name' [-Wunused-parameter] ./pcap-haiku.c:273:58: warning: unused parameter 'errbuf' [-Wunused-parameter] Remove pcap-haiku.cpp from the comment in build.sh.
-rwxr-xr-xbuild.sh9
-rw-r--r--pcap-haiku.c10
2 files changed, 5 insertions, 14 deletions
diff --git a/build.sh b/build.sh
index fd032ed3..3b44c526 100755
--- a/build.sh
+++ b/build.sh
@@ -85,15 +85,6 @@ suncc-5.1[45]/SunOS-5.11)
LIBPCAP_TAINTED=yes
;;
*/Haiku-*)
- # (GCC 8.3.0 and later, Clang 9.0.1.)
- # pcap-haiku.cpp:55:21: warning: unused variable 'handlep' [-Wunused-variable]
- # pcap-haiku.cpp:50:37: warning: unused parameter 'maxPackets' [-Wunused-parameter]
- # pcap-haiku.cpp:111:47: warning: unused parameter 'buffer' [-Wunused-parameter]
- # pcap-haiku.cpp:111:59: warning: unused parameter 'size' [-Wunused-parameter]
- # pcap-haiku.cpp:268:26: warning: unused parameter 'name' [-Wunused-parameter]
- # pcap-haiku.cpp:274:26: warning: unused parameter 'name' [-Wunused-parameter]
- # pcap-haiku.cpp:274:58: warning: unused parameter 'errbuf' [-Wunused-parameter]
- #
# (The warnings below come from GCC and Clang in CMake builds after installing
# all system updates.)
# gencode.c:4143:9: warning: converting a packed 'struct in6_addr' pointer
diff --git a/pcap-haiku.c b/pcap-haiku.c
index 1c509806..f77a6874 100644
--- a/pcap-haiku.c
+++ b/pcap-haiku.c
@@ -35,14 +35,14 @@ struct pcap_haiku {
};
-bool
+static int
prepare_request(struct ifreq *request, const char* name)
{
if (strlen(name) >= IF_NAMESIZE)
- return false;
+ return 0;
strcpy(request->ifr_name, name);
- return true;
+ return 1;
}
@@ -107,7 +107,7 @@ pcap_read_haiku(pcap_t* handle, int maxPackets _U_, pcap_handler callback,
static int
-pcap_inject_haiku(pcap_t *handle, const void *buffer, int size)
+pcap_inject_haiku(pcap_t *handle, const void *buffer _U_, int size _U_)
{
// we don't support injecting packets yet
// TODO: use the AF_LINK protocol (we need another socket for this) to
@@ -270,7 +270,7 @@ can_be_bound(const char *name _U_)
}
static int
-get_if_flags(const char *name, bpf_u_int32 *flags, char *errbuf)
+get_if_flags(const char *name _U_, bpf_u_int32 *flags, char *errbuf _U_)
{
/* TODO */
if (*flags & PCAP_IF_LOOPBACK) {