chao
/
linuxptp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change a misleading fault handling function signature. 

Looking at the fault logic in port_dispatch(), you might think that
the function, fault_interval(), checks whether a fault is active, but
you would be wrong, since that function always returns zero.

This patch removes the superfluous input error checking inside of
fault_interval() and changes the return type to void, making the
actual behavior explicit.  Dropping the input check is safe because
that function has exactly two callers, both of whom always provide
valid inputs.

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
master
Richard Cochran 2017-01-03 20:55:33 +01:00
parent 10d4e7f8b0
commit 80a28a9dc3
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
port.c
View File

@ -205,16 +205,11 @@ enum fault_type last_fault_type(struct port *port)
return port->last_fault_type; return port->last_fault_type;
} }
int fault_interval(struct port *port, enum fault_type ft, void fault_interval(struct port *port, enum fault_type ft,
struct fault_interval *i) struct fault_interval *i)
{ {
if (!port || !i)
return -EINVAL;
if (ft < 0 || ft >= FT_CNT)
return -EINVAL;
i->type = port->flt_interval_pertype[ft].type; i->type = port->flt_interval_pertype[ft].type;
i->val = port->flt_interval_pertype[ft].val; i->val = port->flt_interval_pertype[ft].val;
return 0;
} }
int port_fault_fd(struct port *port) int port_fault_fd(struct port *port)
@ -2147,9 +2142,9 @@ int port_dispatch(struct port *p, enum fsm_event event, int mdiff)
} }
next = p->state_machine(p->state, event, mdiff); next = p->state_machine(p->state, event, mdiff);
if (!fault_interval(p, last_fault_type(p), &i) && fault_interval(p, last_fault_type(p), &i);
((i.val == FRI_ASAP && i.type == FTMO_LOG2_SECONDS) || if ((i.val == FRI_ASAP && i.type == FTMO_LOG2_SECONDS) ||
(i.val == 0 && i.type == FTMO_LINEAR_SECONDS))) (i.val == 0 && i.type == FTMO_LINEAR_SECONDS))
fri_asap = 1; fri_asap = 1;
if (PS_INITIALIZING == next || (PS_FAULTY == next && fri_asap)) { if (PS_INITIALIZING == next || (PS_FAULTY == next && fri_asap)) {
/* /*

3
port.h
View File

@ -318,9 +318,8 @@ enum fault_type last_fault_type(struct port *port);
* @param port A port instance. * @param port A port instance.
* @param ft Fault type. * @param ft Fault type.
* @param i Pointer to the struct which will be filled in. * @param i Pointer to the struct which will be filled in.
* @return Zero on success, non-zero otherwise.
*/ */
int fault_interval(struct port *port, enum fault_type ft, void fault_interval(struct port *port, enum fault_type ft,
struct fault_interval *i); struct fault_interval *i);
#endif #endif