diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-11-28 23:10:44 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-11-29 07:11:29 +0000 |
| commit | 1429986ded1a0a63afcf67d57a1de2c496839068 (patch) | |
| tree | 28ee5b92a51cab3f9c08a0f96f5929920a35006b /epan/dissectors | |
| parent | 72b91a56f86e3bbab700900366f81dc8c353b91d (diff) | |
Sadly, index() was the name of a routine in V7, so....
Change-Id: Id83899de08e0ad8e5664dddfb6ca268e7d0bd54d
Reviewed-on: https://code.wireshark.org/review/5529
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-selfm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-selfm.c b/epan/dissectors/packet-selfm.c index 4bb7a3c7b5..b6220a4a84 100644 --- a/epan/dissectors/packet-selfm.c +++ b/epan/dissectors/packet-selfm.c @@ -973,22 +973,22 @@ region_lookup(packet_info *pinfo, guint32 base_addr) /* Create Fast SER Unsolicited Word Bit item. Return item to calling function. 'index' parameter */ /* will be used to store 'name' parameter in lookup tree. Index 254 and 255 are special (hardcoded) cases */ /***********************************************************************************************************/ -static fastser_uns_wordbit* fastser_uns_wordbit_save(guint8 index, const char *name) +static fastser_uns_wordbit* fastser_uns_wordbit_save(guint8 idx, const char *name) { fastser_uns_wordbit *wordbit_item; /* get a new wordbit_item and initialize it */ wordbit_item = wmem_new(wmem_file_scope(), fastser_uns_wordbit); - if (index <= 253) { + if (idx <= 253) { wordbit_item->name = wmem_strdup(wmem_file_scope(), name); } - if (index == 254) { + if (idx == 254) { wordbit_item->name = wmem_strdup(wmem_file_scope(), "POWER_UP"); } - if (index == 255) { + if (idx == 255) { wordbit_item->name = wmem_strdup(wmem_file_scope(), "SET_CHNG"); } @@ -1000,7 +1000,7 @@ static fastser_uns_wordbit* fastser_uns_wordbit_save(guint8 index, const char *n /* Lookup uns wordbit name using current index position & saved conversation data. Return ptr to gchar string */ /***************************************************************************************************************/ static const gchar* -fastser_uns_wordbit_lookup(packet_info *pinfo, guint8 index) +fastser_uns_wordbit_lookup(packet_info *pinfo, guint8 idx) { fm_conversation *conv; fastser_uns_wordbit *wordbit = NULL; @@ -1008,7 +1008,7 @@ fastser_uns_wordbit_lookup(packet_info *pinfo, guint8 index) conv = (fm_conversation *)p_get_proto_data(wmem_file_scope(), pinfo, proto_selfm, 0); if (conv) { - wordbit = (fastser_uns_wordbit*)wmem_tree_lookup32(conv->fastser_uns_wordbits, index); + wordbit = (fastser_uns_wordbit*)wmem_tree_lookup32(conv->fastser_uns_wordbits, idx); } if (wordbit) { |