lib, bgpd: smux_trap return code is never used

The return code from smux_trap is never used.  If we have
never used it after all this time.  Remove the return from
the function.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2021-02-14 16:18:39 -05:00
parent 227b6af0d7
commit 97e21b4bd8
3 changed files with 15 additions and 15 deletions

View File

@ -870,10 +870,10 @@ static int bgpTrapEstablished(struct peer *peer)
oid_copy_addr(index, &addr, IN_ADDR_SIZE);
ret = smux_trap(bgp_variables, array_size(bgp_variables), bgp_trap_oid,
array_size(bgp_trap_oid), bgp_oid,
sizeof(bgp_oid) / sizeof(oid), index, IN_ADDR_SIZE,
bgpTrapList, array_size(bgpTrapList), BGPESTABLISHED);
smux_trap(bgp_variables, array_size(bgp_variables), bgp_trap_oid,
array_size(bgp_trap_oid), bgp_oid,
sizeof(bgp_oid) / sizeof(oid), index, IN_ADDR_SIZE,
bgpTrapList, array_size(bgpTrapList), BGPESTABLISHED);
return 0;
}

View File

@ -265,11 +265,11 @@ void smux_register_mib(const char *descr, struct variable *var, size_t width,
register_mib(descr, var, width, num, name, namelen);
}
int smux_trap(struct variable *vp, size_t vp_len, const oid *ename,
size_t enamelen, const oid *name, size_t namelen,
const oid *iname, size_t inamelen,
const struct trap_object *trapobj, size_t trapobjlen,
uint8_t sptrap)
void smux_trap(struct variable *vp, size_t vp_len, const oid *ename,
size_t enamelen, const oid *name, size_t namelen,
const oid *iname, size_t inamelen,
const struct trap_object *trapobj, size_t trapobjlen,
uint8_t sptrap)
{
struct index_oid trap_index[1];
@ -277,9 +277,9 @@ int smux_trap(struct variable *vp, size_t vp_len, const oid *ename,
oid_copy(trap_index[0].indexname, iname, inamelen);
trap_index[0].indexlen = inamelen;
return (smux_trap_multi_index(
vp, vp_len, ename, enamelen, name, namelen, trap_index,
array_size(trap_index), trapobj, trapobjlen, sptrap));
smux_trap_multi_index(vp, vp_len, ename, enamelen, name, namelen,
trap_index, array_size(trap_index), trapobj,
trapobjlen, sptrap);
}
int smux_trap_multi_index(struct variable *vp, size_t vp_len, const oid *ename,

View File

@ -131,9 +131,9 @@ extern int smux_header_table(struct variable *, oid *, size_t *, int, size_t *,
The use of the arguments may differ depending on the implementation
used.
*/
extern int smux_trap(struct variable *, size_t, const oid *, size_t,
const oid *, size_t, const oid *, size_t,
const struct trap_object *, size_t, uint8_t);
extern void smux_trap(struct variable *, size_t, const oid *, size_t,
const oid *, size_t, const oid *, size_t,
const struct trap_object *, size_t, uint8_t);
extern int smux_trap_multi_index(struct variable *vp, size_t vp_len,
const oid *ename, size_t enamelen,