svn commit: r213789 - in head/sys/contrib/ngatm/netnatm: msg sig
Rui Paulo
rpaulo at FreeBSD.org
Wed Oct 13 17:09:54 UTC 2010
Author: rpaulo
Date: Wed Oct 13 17:09:53 2010
New Revision: 213789
URL: http://svn.freebsd.org/changeset/base/213789
Log:
Properly tell the compiler that we want to ignore the return value of
certain macros.
Modified:
head/sys/contrib/ngatm/netnatm/msg/privmsg.c
head/sys/contrib/ngatm/netnatm/msg/uni_ie.c
head/sys/contrib/ngatm/netnatm/sig/sig_call.c
head/sys/contrib/ngatm/netnatm/sig/sig_reset.c
Modified: head/sys/contrib/ngatm/netnatm/msg/privmsg.c
==============================================================================
--- head/sys/contrib/ngatm/netnatm/msg/privmsg.c Wed Oct 13 17:09:16 2010 (r213788)
+++ head/sys/contrib/ngatm/netnatm/msg/privmsg.c Wed Oct 13 17:09:53 2010 (r213789)
@@ -145,7 +145,7 @@ uni_decode_body_internal(enum uni_msgtyp
msg->b_rptr = msg->b_wptr;
else
msg->b_rptr += ielen;
- UNI_SAVE_IERR(cx, ietype, hdr.act, UNI_IERR_UNK);
+ (void)UNI_SAVE_IERR(cx, ietype, hdr.act, UNI_IERR_UNK);
err = -1;
continue;
}
@@ -200,16 +200,16 @@ uni_decode_body_internal(enum uni_msgtyp
* Unexpected but recognized.
* Q.2931 5.6.8.3
*/
- UNI_SAVE_IERR(cx, ietype, hdr.act, UNI_IERR_UNK);
+ (void)UNI_SAVE_IERR(cx, ietype, hdr.act, UNI_IERR_UNK);
err = -1;
break;
case DEC_ERR: /* bad IE */
if (iedecl->flags & UNIFL_ACCESS)
/* this may be wrong: 5.6.8.2 */
- UNI_SAVE_IERR(cx, ietype, hdr.act, UNI_IERR_ACC);
+ (void)UNI_SAVE_IERR(cx, ietype, hdr.act, UNI_IERR_ACC);
else
- UNI_SAVE_IERR(cx, ietype, hdr.act, UNI_IERR_BAD);
+ (void)UNI_SAVE_IERR(cx, ietype, hdr.act, UNI_IERR_BAD);
err = -1;
break;
Modified: head/sys/contrib/ngatm/netnatm/msg/uni_ie.c
==============================================================================
--- head/sys/contrib/ngatm/netnatm/msg/uni_ie.c Wed Oct 13 17:09:16 2010 (r213788)
+++ head/sys/contrib/ngatm/netnatm/msg/uni_ie.c Wed Oct 13 17:09:53 2010 (r213789)
@@ -214,7 +214,7 @@ uni_encode_msg_hdr(struct uni_msg *msg,
{
u_char byte;
- uni_msg_ensure(msg, 9);
+ (void)uni_msg_ensure(msg, 9);
APP_BYTE(msg, cx->pnni ? PNNI_PROTO : UNI_PROTO);
APP_BYTE(msg, 3);
@@ -652,7 +652,7 @@ uni_encode_ie_hdr(struct uni_msg *msg, e
{
u_char byte;
- uni_msg_ensure(msg, 4 + len);
+ (void)uni_msg_ensure(msg, 4 + len);
*msg->b_wptr++ = type;
byte = 0x80 | (h->coding << 5);
Modified: head/sys/contrib/ngatm/netnatm/sig/sig_call.c
==============================================================================
--- head/sys/contrib/ngatm/netnatm/sig/sig_call.c Wed Oct 13 17:09:16 2010 (r213788)
+++ head/sys/contrib/ngatm/netnatm/sig/sig_call.c Wed Oct 13 17:09:53 2010 (r213789)
@@ -398,7 +398,7 @@ un0_setup(struct call *c, struct uni_msg
if (IE_ISGOOD(u->u.setup.epref) &&
u->u.setup.epref.flag == 1) {
IE_SETERROR(u->u.setup.epref);
- UNI_SAVE_IERR(&c->uni->cx, UNI_IE_EPREF,
+ (void)UNI_SAVE_IERR(&c->uni->cx, UNI_IE_EPREF,
u->u.setup.epref.h.act, UNI_IERR_BAD);
}
uni_mandate_epref(c->uni, &u->u.setup.epref);
@@ -578,7 +578,7 @@ u1n6_call_proc(struct call *c, struct un
(cp->epref.flag != 1 ||
cp->epref.epref != c->msg_setup.epref.epref)) {
IE_SETERROR(cp->epref);
- UNI_SAVE_IERR(&c->uni->cx, UNI_IE_EPREF,
+ (void)UNI_SAVE_IERR(&c->uni->cx, UNI_IE_EPREF,
cp->epref.h.act, UNI_IERR_BAD);
}
}
@@ -763,7 +763,7 @@ unx_alerting(struct call *c, struct uni_
(al->epref.flag != 1 ||
al->epref.epref != c->msg_setup.epref.epref)) {
IE_SETERROR(al->epref);
- UNI_SAVE_IERR(&c->uni->cx, UNI_IE_EPREF,
+ (void)UNI_SAVE_IERR(&c->uni->cx, UNI_IE_EPREF,
al->epref.h.act, UNI_IERR_BAD);
}
}
@@ -1065,7 +1065,7 @@ unx_connect(struct call *c, struct uni_m
if (IE_ISGOOD(co->epref) &&
co->epref.flag != 1) {
IE_SETERROR(co->epref);
- UNI_SAVE_IERR(&c->uni->cx, UNI_IE_EPREF,
+ (void)UNI_SAVE_IERR(&c->uni->cx, UNI_IE_EPREF,
co->epref.h.act, UNI_IERR_BAD);
}
}
@@ -2757,7 +2757,7 @@ unx_add_party(struct call *c, struct uni
if (IE_ISGOOD(u->u.add_party.epref) && p == NULL &&
u->u.add_party.epref.flag) {
IE_SETERROR(u->u.add_party.epref);
- UNI_SAVE_IERR(&c->uni->cx, UNI_IE_EPREF,
+ (void)UNI_SAVE_IERR(&c->uni->cx, UNI_IE_EPREF,
u->u.add_party.epref.h.act, UNI_IERR_BAD);
}
@@ -2802,7 +2802,7 @@ un10n8_add_party_ack(struct call *c, str
if (IE_ISGOOD(u->u.add_party_ack.epref)) {
if (u->u.add_party_ack.epref.flag == 0) {
IE_SETERROR(u->u.add_party_ack.epref);
- UNI_SAVE_IERR(&c->uni->cx, UNI_IE_EPREF,
+ (void)UNI_SAVE_IERR(&c->uni->cx, UNI_IE_EPREF,
u->u.add_party_ack.epref.h.act, UNI_IERR_BAD);
} else {
p = uni_find_partyx(c, u->u.add_party_ack.epref.epref, 1);
@@ -2902,7 +2902,7 @@ unx_party_alerting(struct call *c, struc
if (IE_ISGOOD(u->u.party_alerting.epref)) {
if (u->u.party_alerting.epref.flag == 0) {
IE_SETERROR(u->u.party_alerting.epref);
- UNI_SAVE_IERR(&c->uni->cx, UNI_IE_EPREF,
+ (void)UNI_SAVE_IERR(&c->uni->cx, UNI_IE_EPREF,
u->u.party_alerting.epref.h.act, UNI_IERR_BAD);
} else {
p = uni_find_partyx(c, u->u.party_alerting.epref.epref, 1);
Modified: head/sys/contrib/ngatm/netnatm/sig/sig_reset.c
==============================================================================
--- head/sys/contrib/ngatm/netnatm/sig/sig_reset.c Wed Oct 13 17:09:16 2010 (r213788)
+++ head/sys/contrib/ngatm/netnatm/sig/sig_reset.c Wed Oct 13 17:09:53 2010 (r213789)
@@ -270,7 +270,7 @@ start_restart_ack(struct uni *uni, struc
*/
if (u->u.restart_ack.restart.rclass == UNI_RESTART_ALL &&
IE_ISGOOD(u->u.restart_ack.connid)) {
- UNI_SAVE_IERR(&uni->cx, UNI_IE_CONNID,
+ (void)UNI_SAVE_IERR(&uni->cx, UNI_IE_CONNID,
u->u.restart_ack.connid.h.act,
UNI_IERR_UNK);
} else if ((u->u.restart_ack.restart.rclass == UNI_RESTART_PATH ||
@@ -547,7 +547,7 @@ response_restart(struct uni *uni, struct
*/
if (u->u.restart.restart.rclass == UNI_RESTART_ALL &&
IE_ISGOOD(u->u.restart.connid)) {
- UNI_SAVE_IERR(&uni->cx, UNI_IE_CONNID,
+ (void)UNI_SAVE_IERR(&uni->cx, UNI_IE_CONNID,
u->u.restart.connid.h.act,
UNI_IERR_UNK);
} else if ((u->u.restart.restart.rclass == UNI_RESTART_PATH ||
More information about the svn-src-all
mailing list