proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2025-10-04 11:24:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Include bsd/string.h only in include/utils.h

Browse Source 
This is simpler and cleaner, and avoids having to include the header
from every file where the functions are used. The prototypes of the
internal implementation are in this header, so utils.h will have to be
included anyway for those.

Fixes: 508f3c231e ("Use libbsd for strlcpy if available")

Signed-off-by: Luca Boccassi <bluca@debian.org>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Luca Boccassi 2018-11-01 22:25:27 +00:00 committed by Stephen Hemminger
parent 39776a8665
commit 6d2fd4a53f
15 changed files with 4 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
genl/ctrl.c
View File

@ -18,9 +18,6 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <string.h> #include <string.h>
#ifdef HAVE_LIBBSD
#include <bsd/string.h>
#endif
#include "utils.h" #include "utils.h"
#include "genl_utils.h" #include "genl_utils.h"

4
include/utils.h
View File

@ -9,6 +9,10 @@
#include <stdbool.h> #include <stdbool.h>
#include <time.h> #include <time.h>
#ifdef HAVE_LIBBSD
#include <bsd/string.h>
#endif
#include "libnetlink.h" #include "libnetlink.h"
#include "ll_map.h" #include "ll_map.h"
#include "rtm_map.h" #include "rtm_map.h"

3
ip/iplink.c
View File

@ -24,9 +24,6 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <string.h> #include <string.h>
#ifdef HAVE_LIBBSD
#include <bsd/string.h>
#endif
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <stdbool.h> #include <stdbool.h>
#include <linux/mpls.h> #include <linux/mpls.h>

3
ip/ipnetns.c
View File

@ -8,9 +8,6 @@
#include <sys/syscall.h> #include <sys/syscall.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#ifdef HAVE_LIBBSD
#include <bsd/string.h>
#endif
#include <sched.h> #include <sched.h>
#include <fcntl.h> #include <fcntl.h>
#include <dirent.h> #include <dirent.h>

3
ip/iproute_lwtunnel.c
View File

@ -16,9 +16,6 @@
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <string.h> #include <string.h>
#ifdef HAVE_LIBBSD
#include <bsd/string.h>
#endif
#include <linux/ila.h> #include <linux/ila.h>
#include <linux/lwtunnel.h> #include <linux/lwtunnel.h>
#include <linux/mpls_iptunnel.h> #include <linux/mpls_iptunnel.h>

3
ip/ipvrf.c
View File

@ -21,9 +21,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <string.h>
#ifdef HAVE_LIBBSD
#include <bsd/string.h>
#endif
#include <dirent.h> #include <dirent.h>
#include <errno.h> #include <errno.h>
#include <limits.h> #include <limits.h>

3
ip/ipxfrm.c
View File

@ -28,9 +28,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#ifdef HAVE_LIBBSD
#include <bsd/string.h>
#endif
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <time.h> #include <time.h>

3
ip/tunnel.c
View File

@ -24,9 +24,6 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#ifdef HAVE_LIBBSD
#include <bsd/string.h>
#endif
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
#include <sys/types.h> #include <sys/types.h>

3
ip/xfrm_state.c
View File

@ -27,9 +27,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#ifdef HAVE_LIBBSD
#include <bsd/string.h>
#endif
#include <netdb.h> #include <netdb.h>
#include "utils.h" #include "utils.h"
#include "xfrm.h" #include "xfrm.h"

3
lib/bpf.c
View File

@ -15,9 +15,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <string.h>
#ifdef HAVE_LIBBSD
#include <bsd/string.h>
#endif
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>
#include <errno.h> #include <errno.h>

3
lib/fs.c
View File

@ -20,9 +20,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <string.h>
#ifdef HAVE_LIBBSD
#include <bsd/string.h>
#endif
#include <errno.h> #include <errno.h>
#include <limits.h> #include <limits.h>

3
lib/inet_proto.c
View File

@ -18,9 +18,6 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <netdb.h> #include <netdb.h>
#include <string.h> #include <string.h>
#ifdef HAVE_LIBBSD
#include <bsd/string.h>
#endif
#include "rt_names.h" #include "rt_names.h"
#include "utils.h" #include "utils.h"

3
misc/ss.c
View File

@ -19,9 +19,6 @@
#include <sys/sysmacros.h> #include <sys/sysmacros.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <string.h> #include <string.h>
#ifdef HAVE_LIBBSD
#include <bsd/string.h>
#endif
#include <errno.h> #include <errno.h>
#include <netdb.h> #include <netdb.h>
#include <arpa/inet.h> #include <arpa/inet.h>

3
tc/em_ipset.c
View File

@ -20,9 +20,6 @@
#include <netdb.h> #include <netdb.h>
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <string.h>
#ifdef HAVE_LIBBSD
#include <bsd/string.h>
#endif
#include <stdlib.h> #include <stdlib.h>
#include <getopt.h> #include <getopt.h>

3
tc/m_pedit.c
View File

@ -23,9 +23,6 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <string.h> #include <string.h>
#ifdef HAVE_LIBBSD
#include <bsd/string.h>
#endif
#include <dlfcn.h> #include <dlfcn.h>
#include "utils.h" #include "utils.h"
#include "tc_util.h" #include "tc_util.h"