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

clock_send_notification: msg_len is unused 

message length is already included in the msg structure

Signed-off-by: Rafaël Carré <funman@videolan.org>
master
Rafaël Carré 2018-06-25 15:06:28 +02:00 committed by Richard Cochran
parent 6bc77ccf4b
commit 3c7fa5dd42
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clock.c
View File

@ -232,7 +232,7 @@ static void clock_prune_subscriptions(struct clock *c)
} }
void clock_send_notification(struct clock *c, struct ptp_message *msg, void clock_send_notification(struct clock *c, struct ptp_message *msg,
int msglen, enum notification event) enum notification event)
{ {
unsigned int event_pos = event / 8; unsigned int event_pos = event / 8;
uint8_t mask = 1 << (event % 8); uint8_t mask = 1 << (event % 8);
@ -1422,7 +1422,6 @@ void clock_notify_event(struct clock *c, enum notification event)
struct port *uds = c->uds_port; struct port *uds = c->uds_port;
struct PortIdentity pid = port_identity(uds); struct PortIdentity pid = port_identity(uds);
struct ptp_message *msg; struct ptp_message *msg;
UInteger16 msg_len;
int id; int id;
switch (event) { switch (event) {
@ -1437,10 +1436,9 @@ void clock_notify_event(struct clock *c, enum notification event)
return; return;
if (!clock_management_fill_response(c, NULL, NULL, msg, id)) if (!clock_management_fill_response(c, NULL, NULL, msg, id))
goto err; goto err;
msg_len = msg->header.messageLength;
if (msg_pre_send(msg)) if (msg_pre_send(msg))
goto err; goto err;
clock_send_notification(c, msg, msg_len, event); clock_send_notification(c, msg, event);
err: err:
msg_put(msg); msg_put(msg);
} }

3
clock.h
View File

@ -191,11 +191,10 @@ int clock_manage(struct clock *c, struct port *p, struct ptp_message *msg);
* Send notification about an event to all subscribers. * Send notification about an event to all subscribers.
* @param c The clock instance. * @param c The clock instance.
* @param msg The PTP message to send, in network byte order. * @param msg The PTP message to send, in network byte order.
* @param msglen The length of the message in bytes.
* @param event The event that occured. * @param event The event that occured.
*/ */
void clock_send_notification(struct clock *c, struct ptp_message *msg, void clock_send_notification(struct clock *c, struct ptp_message *msg,
int msglen, enum notification event); enum notification event);
/** /**
* Construct and send notification to subscribers about an event that * Construct and send notification to subscribers about an event that

4
port.c
View File

@ -2735,7 +2735,6 @@ void port_notify_event(struct port *p, enum notification event)
{ {
struct PortIdentity pid = port_identity(p); struct PortIdentity pid = port_identity(p);
struct ptp_message *msg; struct ptp_message *msg;
UInteger16 msg_len;
int id; int id;
switch (event) { switch (event) {
@ -2752,10 +2751,9 @@ void port_notify_event(struct port *p, enum notification event)
return; return;
if (!port_management_fill_response(p, msg, id)) if (!port_management_fill_response(p, msg, id))
goto err; goto err;
msg_len = msg->header.messageLength;
if (msg_pre_send(msg)) if (msg_pre_send(msg))
goto err; goto err;
clock_send_notification(p->clock, msg, msg_len, event); clock_send_notification(p->clock, msg, event);
err: err:
msg_put(msg); msg_put(msg);
} }