diff options
| author | Stephen Hemminger <stephen@networkplumber.org> | 2022-11-22 19:01:23 -0800 |
|---|---|---|
| committer | Stephen Hemminger <stephen@networkplumber.org> | 2022-11-22 19:01:23 -0800 |
| commit | a04a01a59470ad763d79fb82c6ba97f88e79426f (patch) | |
| tree | bc7199a37299f32fd95dd8e4b62330eb87271d45 /ip | |
| parent | 7cd5c983438c50ac49300c2da93298bd068832c7 (diff) | |
| download | iproute2-a04a01a59470ad763d79fb82c6ba97f88e79426f.tar.gz | |
remove #if 0 code
Let's not keep unused code. The YAGNI means that this dead
code doesn't work now, and if it did it would have to change.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Diffstat (limited to 'ip')
| -rw-r--r-- | ip/ipmroute.c | 12 | ||||
| -rw-r--r-- | ip/xfrm_state.c | 11 |
2 files changed, 1 insertions, 22 deletions
diff --git a/ip/ipmroute.c b/ip/ipmroute.c index 981baf2a..32019c94 100644 --- a/ip/ipmroute.c +++ b/ip/ipmroute.c @@ -39,9 +39,6 @@ static void usage(void) "Usage: ip mroute show [ [ to ] PREFIX ] [ from PREFIX ] [ iif DEVICE ]\n" " [ table TABLE_ID ]\n" "TABLE_ID := [ local | main | default | all | NUMBER ]\n" -#if 0 - "Usage: ip mroute [ add | del ] DESTINATION from SOURCE [ iif DEVICE ] [ oif DEVICE ]\n" -#endif ); exit(-1); } @@ -322,14 +319,7 @@ int do_multiroute(int argc, char **argv) { if (argc < 1) return mroute_list(0, NULL); -#if 0 - if (matches(*argv, "add") == 0) - return mroute_modify(RTM_NEWADDR, argc-1, argv+1); - if (matches(*argv, "delete") == 0) - return mroute_modify(RTM_DELADDR, argc-1, argv+1); - if (matches(*argv, "get") == 0) - return mroute_get(argc-1, argv+1); -#endif + if (matches(*argv, "list") == 0 || matches(*argv, "show") == 0 || matches(*argv, "lst") == 0) return mroute_list(argc-1, argv+1); diff --git a/ip/xfrm_state.c b/ip/xfrm_state.c index 6fee7efd..b2294d9f 100644 --- a/ip/xfrm_state.c +++ b/ip/xfrm_state.c @@ -124,11 +124,6 @@ static int xfrm_algo_parse(struct xfrm_algo *alg, enum xfrm_attr_type_t type, int len; int slen = strlen(key); -#if 0 - /* XXX: verifying both name and key is required! */ - fprintf(stderr, "warning: ALGO-NAME/ALGO-KEYMAT values will be sent to the kernel promiscuously! (verifying them isn't implemented yet)\n"); -#endif - strlcpy(alg->alg_name, name, sizeof(alg->alg_name)); if (slen > 2 && strncmp(key, "0x", 2) == 0) { @@ -791,12 +786,6 @@ static int xfrm_state_allocspi(int argc, char **argv) .n.nlmsg_flags = NLM_F_REQUEST, .n.nlmsg_type = XFRM_MSG_ALLOCSPI, .xspi.info.family = preferred_family, -#if 0 - .xspi.lft.soft_byte_limit = XFRM_INF, - .xspi.lft.hard_byte_limit = XFRM_INF, - .xspi.lft.soft_packet_limit = XFRM_INF, - .xspi.lft.hard_packet_limit = XFRM_INF, -#endif }; char *idp = NULL; char *minp = NULL; |