diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2013-12-06 08:09:56 +0000 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2013-12-06 08:09:56 +0000 |
| commit | 04a8ed21405bbb8dc212fdd648ae4e0f491da63c (patch) | |
| tree | 301651faf9d90e6dc23e56a36f27afc475847ded /epan/dissectors/packet-j1939.c | |
| parent | f5136e37535224706563310c431d312c2d3970e3 (diff) | |
Fix packet-j1939.c:160:42: error: declaration of 'address' shadows a global declaration [-Werror=shadow]
svn path=/trunk/; revision=53805
Diffstat (limited to 'epan/dissectors/packet-j1939.c')
| -rw-r--r-- | epan/dissectors/packet-j1939.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-j1939.c b/epan/dissectors/packet-j1939.c index f0fdb5a451..24765b7d27 100644 --- a/epan/dissectors/packet-j1939.c +++ b/epan/dissectors/packet-j1939.c @@ -157,12 +157,12 @@ static const value_string j1939_address_vals[] = { value_string_ext j1939_address_vals_ext = VALUE_STRING_EXT_INIT(j1939_address_vals);
static void
-j1939_fmt_address(gchar *result, guint32 address )
+j1939_fmt_address(gchar *result, guint32 addr )
{
- if ((address < 128) || (address > 247))
- g_snprintf(result, ITEM_LABEL_LENGTH, "%d (%s)", address, val_to_str_ext_const(address, &j1939_address_vals_ext, "Reserved"));
+ if ((addr < 128) || (addr > 247))
+ g_snprintf(result, ITEM_LABEL_LENGTH, "%d (%s)", addr, val_to_str_ext_const(addr, &j1939_address_vals_ext, "Reserved"));
else
- g_snprintf(result, ITEM_LABEL_LENGTH, "%d (Arbitrary)", address);
+ g_snprintf(result, ITEM_LABEL_LENGTH, "%d (Arbitrary)", addr);
}
struct can_identifier
|