Skip to content

P
PPSi
Commit 9e764429 authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

msg.c: bugfix: fix side-effect in macro 

This was an error on my side. The result may be undefined in
"ntohs(++x)".  It had not bad effects so far, but newer compilers
correctly warn about it, and this commit fixes the error.
Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent 9bad6ed8
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 3 deletions
proto-standard/msg.c
View file @ 9e764429
......@@ -97,7 +97,8 @@ void msg_pack_sync(struct pp_instance *ppi, Timestamp *orig_tstamp)
/* Table 19 */
*(UInteger16 *) (buf + 2) = htons(PP_SYNC_LENGTH);
*(UInteger16 *) (buf + 30) = htons(++(ppi->sent_seq[PPM_SYNC]));
ppi->sent_seq[PPM_SYNC]++;
*(UInteger16 *) (buf + 30) = htons(ppi->sent_seq[PPM_SYNC]);
*(UInteger8 *) (buf + 32) = 0x00;
/* Table 23 */
......@@ -133,7 +134,8 @@ int msg_pack_announce(struct pp_instance *ppi)
*(char *)(buf + 0) = *(char *)(buf + 0) | 0x0B;
/* Table 19 */
*(UInteger16 *) (buf + 2) = htons(PP_ANNOUNCE_LENGTH);
*(UInteger16 *) (buf + 30) = htons(++(ppi->sent_seq[PPM_ANNOUNCE]));
ppi->sent_seq[PPM_ANNOUNCE]++;
*(UInteger16 *) (buf + 30) = htons(ppi->sent_seq[PPM_ANNOUNCE]);
*(UInteger8 *) (buf + 32) = 0x05;
/* Table 23 */
*(Integer8 *) (buf + 33) = DSPOR(ppi)->logAnnounceInterval;
......@@ -240,7 +242,8 @@ void msg_pack_delay_req(struct pp_instance *ppi, Timestamp *orig_tstamp)
/* Table 19 */
*(UInteger16 *) (buf + 2) = htons(PP_DELAY_REQ_LENGTH);
*(UInteger16 *) (buf + 30) = htons(++(ppi->sent_seq[PPM_DELAY_REQ]));
ppi->sent_seq[PPM_DELAY_REQ]++;
*(UInteger16 *) (buf + 30) = htons(ppi->sent_seq[PPM_DELAY_REQ]);
*(UInteger8 *) (buf + 32) = 0x01;
/* Table 23 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment