13463af29
Denis Vlasenko
2006-12-31
Subject
remove commented out #includes etc move get_hz to the only caller
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
include/platform.h +0 -7networking/libiproute/iproute.c +22 -0networking/libiproute/libnetlink.h +0 -1networking/libiproute/linux/pkt_sched.h +0 -2networking/libiproute/utils.c +0 -20networking/libiproute/utils.h +0 -12
include/platform.h+0 -7
| @@ -133,13 +133,6 @@ typedef int socklen_t; | |
| #endif | |
| /* ---- Compiler dependent settings ------------------------- */ | |
| - | //#ifndef __GNUC__ |
| - | //#if defined __INTEL_COMPILER |
| - | //__extension__ typedef __signed__ long long __s64; |
| - | //__extension__ typedef unsigned long long __u64; |
| - | //#endif /* __INTEL_COMPILER */ |
| - | //#endif /* ifndef __GNUC__ */ |
| - | |
| #if (defined __digital__ && defined __unix__) | |
| # undef HAVE_MNTENT_H | |
| #else | |
networking/libiproute/iproute.c+22 -0
| @@ -57,6 +57,28 @@ static int flush_update(void) | |
| return 0; | |
| } | |
| + | static int get_hz(void) |
| + | { |
| + | static int hz_internal; |
| + | FILE *fp; |
| + | |
| + | if (hz_internal) |
| + | return hz_internal; |
| + | |
| + | fp = fopen("/proc/net/psched", "r"); |
| + | if (fp) { |
| + | unsigned nom, denom; |
| + | |
| + | if (fscanf(fp, "%*08x%*08x%08x%08x", &nom, &denom) == 2) |
| + | if (nom == 1000000) |
| + | hz_internal = denom; |
| + | fclose(fp); |
| + | } |
| + | if (!hz_internal) |
| + | hz_internal = sysconf(_SC_CLK_TCK); |
| + | return hz_internal; |
| + | } |
| + | |
| static int print_route(struct sockaddr_nl *who ATTRIBUTE_UNUSED, | |
| struct nlmsghdr *n, void *arg) | |
| { | |
networking/libiproute/libnetlink.h+0 -1
| @@ -2,7 +2,6 @@ | |
| #ifndef __LIBNETLINK_H__ | |
| #define __LIBNETLINK_H__ 1 | |
| - | //#include <asm/types.h> |
| #include <linux/netlink.h> | |
| #include <linux/rtnetlink.h> | |
networking/libiproute/linux/pkt_sched.h+0 -2
| @@ -15,8 +15,6 @@ | |
| filler or even bulk. | |
| */ | |
| - | //#include <asm/types.h> |
| - | |
| #define TC_PRIO_BESTEFFORT 0 | |
| #define TC_PRIO_FILLER 1 | |
| #define TC_PRIO_BULK 2 | |
networking/libiproute/utils.c+0 -20
| @@ -294,26 +294,6 @@ int inet_addr_match(inet_prefix * a, inet_prefix * b, int bits) | |
| return 0; | |
| } | |
| - | int __iproute2_hz_internal; |
| - | |
| - | int __get_hz(void) |
| - | { |
| - | int hz = 0; |
| - | FILE *fp = fopen("/proc/net/psched", "r"); |
| - | |
| - | if (fp) { |
| - | unsigned nom, denom; |
| - | |
| - | if (fscanf(fp, "%*08x%*08x%08x%08x", &nom, &denom) == 2) |
| - | if (nom == 1000000) |
| - | hz = denom; |
| - | fclose(fp); |
| - | } |
| - | if (hz) |
| - | return hz; |
| - | return sysconf(_SC_CLK_TCK); |
| - | } |
| - | |
| const char *rt_addr_n2a(int af, int ATTRIBUTE_UNUSED len, | |
| void *addr, char *buf, int buflen) | |
| { | |
networking/libiproute/utils.h+0 -12
| @@ -3,8 +3,6 @@ | |
| #define __UTILS_H__ 1 | |
| #include "libbb.h" | |
| - | //#include <asm/types.h> |
| - | //#include <resolv.h> |
| #include "libnetlink.h" | |
| #include "ll_map.h" | |
| @@ -90,14 +88,4 @@ int dnet_pton(int af, const char *src, void *addr); | |
| const char *ipx_ntop(int af, const void *addr, char *str, size_t len); | |
| int ipx_pton(int af, const char *src, void *addr); | |
| - | extern int __iproute2_hz_internal; |
| - | extern int __get_hz(void); |
| - | |
| - | static inline int get_hz(void) |
| - | { |
| - | if (__iproute2_hz_internal == 0) |
| - | __iproute2_hz_internal = __get_hz(); |
| - | return __iproute2_hz_internal; |
| - | } |
| - | |
| #endif /* __UTILS_H__ */ | |