remove #if 0 code
Subsystems (2)
PATCH 1/1 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 <[email protected]>
--- ip/ipmroute.c | 12 +----------- ip/xfrm_state.c | 11 ----------- tc/p_icmp.c | 24 ------------------------ tc/q_gred.c | 3 +-- tc/tc_class.c | 4 ---- 5 files changed, 2 insertions(+), 52 deletions(-)
ip/ipmroute.c +1 -11
@@ -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 );
ip/xfrm_state.c +0 -11
@@ -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 ;
tc/p_icmp.c +0 -24
@@ -27,31 +27,7 @@ static intparse_icmp (int *argc_p, char ***argv_p, struct m_pedit_sel *sel, struct m_pedit_key *tkey) { -int res =-1 ; -#if 0 -int argc = *argc_p; -char **argv = *argv_p; - -if (argc <2 ) -return -1 ; - -if (strcmp (*argv,"type" ) ==0 ) { -NEXT_ARG (); - res =parse_u8 (&argc, &argv,0 ); - goto done; - } -if (strcmp (*argv,"code" ) ==0 ) { -NEXT_ARG (); - res =parse_u8 (&argc, &argv,1 ); - goto done; - }return -1 ; - -done: - *argc_p = argc; - *argv_p = argv; -#endif -return res; }struct m_pedit_util p_pedit_icmp = {
tc/q_gred.c +1 -2
@@ -27,8 +27,7 @@#include "tc_red.h" - -#if 0 +#ifdef DEBUG #define DPRINTF(format, args...) fprintf(stderr, format, ##args)#else #define DPRINTF(format, args...)
tc/tc_class.c +0 -4
@@ -474,10 +474,6 @@ int do_class(int argc, char **argv)return tc_class_modify (RTM_NEWTCLASS ,NLM_F_CREATE , argc-1 , argv+1 );if (matches (*argv,"delete" ) ==0 )return tc_class_modify (RTM_DELTCLASS ,0 , argc-1 , argv+1 ); -#if 0 -if (matches (*argv,"get" ) ==0 ) -return tc_class_get (RTM_GETTCLASS ,0 , argc-1 , argv+1 ); -#endif if (matches (*argv,"list" ) ==0 ||matches (*argv,"show" ) ==0 ||matches (*argv,"lst" ) ==0 )return tc_class_list (argc-1 , argv+1 );
Signature · 1 line
2.35.1
This patch was applied to iproute2/iproute2.git (main) by Stephen Hemminger <[email protected]>:
Hello:
This patch was applied to iproute2/iproute2.git (main) by Stephen Hemminger <[email protected]>:
Quoted 11 lines · On Tue, 22 Nov 2022 19:02:56 -0800 you wrote:
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 <[email protected]>--- ip/ipmroute.c | 12 +----------- ip/xfrm_state.c | 11 ----------- tc/p_icmp.c | 24 ------------------------ tc/q_gred.c | 3 +-- tc/tc_class.c | 4 ---- 5 files changed, 2 insertions(+), 52 deletions(-)
Here is the summary with links:
- [iproute2] remove #if 0 code
https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=a04a01a59470
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html