lkml.org 
[lkml]   [2008]   [Dec]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH 6/9] mISDN: fix sparse warnings
    From
    Impact: rename function scope variable

    Fix this warning:

    drivers/isdn/mISDN/l1oip_core.c:472:8: warning: symbol 'id' shadows an earlier one
    drivers/isdn/mISDN/l1oip_core.c:254:14: originally declared here

    Signed-off-by: Hannes Eder <hannes@hanneseder.net>
    ---
    drivers/isdn/mISDN/l1oip_core.c | 22 +++++++++++-----------
    1 files changed, 11 insertions(+), 11 deletions(-)

    diff --git a/drivers/isdn/mISDN/l1oip_core.c b/drivers/isdn/mISDN/l1oip_core.c
    index e42150a..0884dd6 100644
    --- a/drivers/isdn/mISDN/l1oip_core.c
    +++ b/drivers/isdn/mISDN/l1oip_core.c
    @@ -469,7 +469,7 @@ l1oip_socket_recv(struct l1oip *hc, u8 remotecodec, u8 channel, u16 timebase,
    static void
    l1oip_socket_parse(struct l1oip *hc, struct sockaddr_in *sin, u8 *buf, int len)
    {
    - u32 id;
    + u32 packet_id;
    u8 channel;
    u8 remotecodec;
    u16 timebase;
    @@ -508,7 +508,7 @@ l1oip_socket_parse(struct l1oip *hc, struct sockaddr_in *sin, u8 *buf, int len)
    }

    /* get id flag */
    - id = (*buf>>4)&1;
    + packet_id = (*buf>>4)&1;

    /* check coding */
    remotecodec = (*buf) & 0x0f;
    @@ -520,11 +520,11 @@ l1oip_socket_parse(struct l1oip *hc, struct sockaddr_in *sin, u8 *buf, int len)
    buf++;
    len--;

    - /* check id */
    - if (id) {
    + /* check packet_id */
    + if (packet_id) {
    if (!hc->id) {
    printk(KERN_WARNING "%s: packet error - packet has id "
    - "0x%x, but we have not\n", __func__, id);
    + "0x%x, but we have not\n", __func__, packet_id);
    return;
    }
    if (len < 4) {
    @@ -532,16 +532,16 @@ l1oip_socket_parse(struct l1oip *hc, struct sockaddr_in *sin, u8 *buf, int len)
    "short for ID value\n", __func__);
    return;
    }
    - id = (*buf++) << 24;
    - id += (*buf++) << 16;
    - id += (*buf++) << 8;
    - id += (*buf++);
    + packet_id = (*buf++) << 24;
    + packet_id += (*buf++) << 16;
    + packet_id += (*buf++) << 8;
    + packet_id += (*buf++);
    len -= 4;

    - if (id != hc->id) {
    + if (packet_id != hc->id) {
    printk(KERN_WARNING "%s: packet error - ID mismatch, "
    "got 0x%x, we 0x%x\n",
    - __func__, id, hc->id);
    + __func__, packet_id, hc->id);
    return;
    }
    } else {
    --
    1.5.6.3


    \
     
     \ /
      Last update: 2008-12-10 17:19    [W:0.033 / U:60.072 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site