diff options
| author | denis <denis@cvs.openbsd.org> | 2020-06-05 19:51:00 +0000 |
|---|---|---|
| committer | denis <denis@cvs.openbsd.org> | 2020-06-05 19:51:00 +0000 |
| commit | 659b80aba7ce97881c95c78858f7f1e214ecd458 (patch) | |
| tree | 40cd19c255616e93b5d52a63b1500ef5b77fd929 | |
| parent | 52a394ba579160ce6d20a9141acc7c8f1f812cdd (diff) | |
Remove redundant code
Reported by Prof. Dr. Steffen Wendzel <wendzel @ hs-worms . de>,
thanks!
OK martijn@ sthen@
| -rw-r--r-- | lib/libcurses/nc_tparm.h | 5 | ||||
| -rw-r--r-- | sys/net/pipex.h | 3 | ||||
| -rw-r--r-- | usr.sbin/bgpd/rde.h | 3 | ||||
| -rw-r--r-- | usr.sbin/relayd/agentx.c | 3 | ||||
| -rw-r--r-- | usr.sbin/snmpd/agentx.c | 3 |
5 files changed, 6 insertions, 11 deletions
diff --git a/lib/libcurses/nc_tparm.h b/lib/libcurses/nc_tparm.h index 0100cd76e03..5b6d063128f 100644 --- a/lib/libcurses/nc_tparm.h +++ b/lib/libcurses/nc_tparm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: nc_tparm.h,v 1.1 2010/01/12 23:21:59 nicm Exp $ */ +/* $OpenBSD: nc_tparm.h,v 1.2 2020/06/05 19:50:59 denis Exp $ */ /**************************************************************************** * Copyright (c) 2006 Free Software Foundation, Inc. * @@ -32,7 +32,7 @@ * Author: Thomas E. Dickey 2006 * ****************************************************************************/ -/* $Id: nc_tparm.h,v 1.1 2010/01/12 23:21:59 nicm Exp $ */ +/* $Id: nc_tparm.h,v 1.2 2020/06/05 19:50:59 denis Exp $ */ /* * Cast parameters past the formatting-string for tparm() to match the @@ -62,6 +62,5 @@ #define TPARM_3(a,b,c,d) TPARM_4(a,b,c,d,0) #define TPARM_2(a,b,c) TPARM_3(a,b,c,0) #define TPARM_1(a,b) TPARM_2(a,b,0) -#define TPARM_1(a,b) TPARM_2(a,b,0) #define TPARM_0(a) TPARM_1(a,0) #endif diff --git a/sys/net/pipex.h b/sys/net/pipex.h index ba77d1da1e4..8f9a63ff567 100644 --- a/sys/net/pipex.h +++ b/sys/net/pipex.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pipex.h,v 1.22 2020/05/26 07:06:37 mpi Exp $ */ +/* $OpenBSD: pipex.h,v 1.23 2020/06/05 19:50:59 denis Exp $ */ /* * Copyright (c) 2009 Internet Initiative Japan Inc. @@ -206,7 +206,6 @@ int pipex_notify_close_session_all(void); struct mbuf *pipex_output (struct mbuf *, int, int, struct pipex_iface_context *); struct pipex_session *pipex_pppoe_lookup_session (struct mbuf *); -struct pipex_session *pipex_pppoe_lookup_session (struct mbuf *); struct mbuf *pipex_pppoe_input (struct mbuf *, struct pipex_session *); struct pipex_session *pipex_pptp_lookup_session (struct mbuf *); struct mbuf *pipex_pptp_input (struct mbuf *, struct pipex_session *); diff --git a/usr.sbin/bgpd/rde.h b/usr.sbin/bgpd/rde.h index 6cba62d44d7..1a4e753b11f 100644 --- a/usr.sbin/bgpd/rde.h +++ b/usr.sbin/bgpd/rde.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rde.h,v 1.233 2020/01/24 05:44:05 claudio Exp $ */ +/* $OpenBSD: rde.h,v 1.234 2020/06/05 19:50:59 denis Exp $ */ /* * Copyright (c) 2003, 2004 Claudio Jeker <claudio@openbsd.org> and @@ -557,7 +557,6 @@ re_rib(struct rib_entry *re) } void path_init(u_int32_t); -void path_init(u_int32_t); void path_shutdown(void); void path_hash_stats(struct rde_hashstats *); int path_compare(struct rde_aspath *, struct rde_aspath *); diff --git a/usr.sbin/relayd/agentx.c b/usr.sbin/relayd/agentx.c index d25ef15b637..33708f0a4b9 100644 --- a/usr.sbin/relayd/agentx.c +++ b/usr.sbin/relayd/agentx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: agentx.c,v 1.14 2017/05/28 10:39:15 benno Exp $ */ +/* $OpenBSD: agentx.c,v 1.15 2020/06/05 19:50:59 denis Exp $ */ /* * Copyright (c) 2013,2014 Bret Stephen Lambert <blambert@openbsd.org> * @@ -654,7 +654,6 @@ snmp_agentx_unregister_pdu(struct snmp_oid *oid, int range_index, if (snmp_agentx_raw(pdu, &uhdr, sizeof(uhdr)) == -1 || snmp_agentx_oid(pdu, oid) == -1 || - snmp_agentx_oid(pdu, oid) == -1 || (range_index && snmp_agentx_int(pdu, &range_bound) == -1)) { snmp_agentx_pdu_free(pdu); return (NULL); diff --git a/usr.sbin/snmpd/agentx.c b/usr.sbin/snmpd/agentx.c index a13dcdc3808..cc55eb71fd9 100644 --- a/usr.sbin/snmpd/agentx.c +++ b/usr.sbin/snmpd/agentx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: agentx.c,v 1.13 2018/06/17 18:19:59 rob Exp $ */ +/* $OpenBSD: agentx.c,v 1.14 2020/06/05 19:50:59 denis Exp $ */ /* * Copyright (c) 2013,2014 Bret Stephen Lambert <blambert@openbsd.org> * @@ -658,7 +658,6 @@ snmp_agentx_unregister_pdu(struct snmp_oid *oid, int range_index, if (snmp_agentx_raw(pdu, &uhdr, sizeof(uhdr)) == -1 || snmp_agentx_oid(pdu, oid) == -1 || - snmp_agentx_oid(pdu, oid) == -1 || (range_index && snmp_agentx_int(pdu, &range_bound) == -1)) { snmp_agentx_pdu_free(pdu); return (NULL); |