[Compile Regression in 2.4.25-pre8][PATCH 24/42]

Kronos
2004-02-02T20:56:35Z

irlmp.c:1244: warning: concatenation of string literals with __FUNCTION__ is deprecated
irlmp.c:1258: warning: concatenation of string literals with __FUNCTION__ is deprecated
irlmp.c:1277: warning: concatenation of string literals with __FUNCTION__ is deprecated
irlmp.c:1284: warning: concatenation of string literals with __FUNCTION__ is deprecated

Fix IRDA_DEBUG: __FUNCTION__ shouldn't be concatenated with other
literals.

diff -Nru -X dontdiff linux-2.4-vanilla/net/irda/irlmp.c linux-2.4/net/irda/irlmp.c
--- linux-2.4-vanilla/net/irda/irlmp.c Fri Jun 13 16:51:39 2003
+++ linux-2.4/net/irda/irlmp.c Sat Jan 31 18:11:40 2004
@@ -1241,7 +1241,7 @@
/* Get the number of lsap. That's the only safe way to know
* that we have looped around... - Jean II */
lsap_todo = HASHBIN_GET_SIZE(self->lsaps);
- IRDA_DEBUG(4, __FUNCTION__ "() : %d lsaps to scan\n", lsap_todo);
+ IRDA_DEBUG(4, "%s() : %d lsaps to scan\n", __FUNCTION__, lsap_todo);

/* Poll lsap in order until the queue is full or until we
* tried them all.
@@ -1255,7 +1255,7 @@
/* Note that if there is only one LSAP on the LAP
* (most common case), self->flow_next is always NULL,
* so we always avoid this loop. - Jean II */
- IRDA_DEBUG(4, __FUNCTION__ "() : searching my LSAP\n");
+ IRDA_DEBUG(4, "%s() : searching my LSAP\n", __FUNCTION__);

/* We look again in hashbins, because the lsap
* might have gone away... - Jean II */
@@ -1274,14 +1274,14 @@

/* Next time, we will get the next one (or the first one) */
self->flow_next = (struct lsap_cb *) hashbin_get_next(self->lsaps);
- IRDA_DEBUG(4, __FUNCTION__ "() : curr is %p, next was %p and is now %p, still %d to go - queue len = %d\n", curr, next, self->flow_next, lsap_todo, IRLAP_GET_TX_QUEUE_LEN(self->irlap));
+ IRDA_DEBUG(4, "() : curr is %p, next was %p and is now %p, still %d to go - queue len = %d\n", __FUNCTION__, curr, next, self->flow_next, lsap_todo, IRLAP_GET_TX_QUEUE_LEN(self->irlap));

/* Inform lsap user that it can send one more packet. */
if (curr->notify.flow_indication != NULL)
curr->notify.flow_indication(curr->notify.instance,
curr, flow);
else
- IRDA_DEBUG(1, __FUNCTION__ "(), no handler\n");
+ IRDA_DEBUG(1, "%s(), no handler\n", __FUNCTION__);
}
}

--
Reply-To: kronos@kronoz.cjb.net
Home: http://kronoz.cjb.net
Tentare e` il primo passo verso il fallimento.
Homer J. Simpson