diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2022-05-04 22:12:29 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2022-05-04 22:12:29 +0000 |
commit | 11d70507f8abc88c32106d54fdc00eff1e6469a5 (patch) | |
tree | 4dfaf5e5b1bf7a146b9ab787621598af22583dee | |
parent | a7387792f2eb573f22e195373278277f8aaf80e6 (diff) | |
parent | 9d59bb775d6294c8b447a88512f7bb43f12a25a8 (diff) | |
download | slirp-11d70507f8abc88c32106d54fdc00eff1e6469a5.zip slirp-11d70507f8abc88c32106d54fdc00eff1e6469a5.tar.gz slirp-11d70507f8abc88c32106d54fdc00eff1e6469a5.tar.bz2 |
Merge branch 'warnings' into 'master'
win32: declare some local functions as static
See merge request slirp/libslirp!121
-rw-r--r-- | meson.build | 3 | ||||
-rw-r--r-- | src/slirp.c | 6 | ||||
-rw-r--r-- | test/pingtest.c | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/meson.build b/meson.build index 5605dc9..abbf0c7 100644 --- a/meson.build +++ b/meson.build @@ -54,6 +54,9 @@ host_system = host_machine.system() glib_dep = dependency('glib-2.0') cc = meson.get_compiler('c') +add_project_arguments(cc.get_supported_arguments('-Wmissing-prototypes', '-Wstrict-prototypes', + '-Wredundant-decls', '-Wundef', '-Wwrite-strings'), + language: 'c', native: false) platform_deps = [] diff --git a/src/slirp.c b/src/slirp.c index 1423b01..04bce41 100644 --- a/src/slirp.c +++ b/src/slirp.c @@ -139,7 +139,7 @@ int get_dns_addr(struct in_addr *pdns_addr) return 0; } -int is_site_local_dns_broadcast(struct in6_addr *address) +static int is_site_local_dns_broadcast(struct in6_addr *address) { int i; for (i = 0; i < G_N_ELEMENTS(SITE_LOCAL_DNS_BROADCAST_ADDRS); i++) { @@ -150,7 +150,7 @@ int is_site_local_dns_broadcast(struct in6_addr *address) return 0; } -void print_dns_v6_address(struct in6_addr address) +static void print_dns_v6_address(struct in6_addr address) { char address_str[INET6_ADDRSTRLEN] = ""; if (inet_ntop(AF_INET6, &address, address_str, INET6_ADDRSTRLEN) @@ -166,7 +166,7 @@ void print_dns_v6_address(struct in6_addr address) // are on deprecated addresses and not generally expected // to work. Further details at: // https://www.ietf.org/proceedings/52/I-D/draft-ietf-ipngwg-dns-discovery-03.txt -int get_ipv6_dns_server(struct in6_addr *dns_server_address, uint32_t *scope_id) +static int get_ipv6_dns_server(struct in6_addr *dns_server_address, uint32_t *scope_id) { PIP_ADAPTER_ADDRESSES addresses = NULL; PIP_ADAPTER_ADDRESSES address = NULL; diff --git a/test/pingtest.c b/test/pingtest.c index 46ec60a..8607db6 100644 --- a/test/pingtest.c +++ b/test/pingtest.c @@ -24,7 +24,7 @@ #ifdef _WIN32 //#include <sys/select.h> #include <winsock2.h> -int slirp_inet_aton(const char *cp, struct in_addr *ia) +static int slirp_inet_aton(const char *cp, struct in_addr *ia) { uint32_t addr = inet_addr(cp); if (addr == 0xffffffff) { |