Fix numerous instances of a variable/parameter name "shadowing" a library function name;

(At least some (gcc ?) compilers give a "shadow" warning for these).

svn path=/trunk/; revision=46402

1 files changed, 8 insertions, 8 deletions

diff --git a/epan/dissectors/packet-xmpp.c b/epan/dissectors/packet-xmpp.c
index bd74a05aa5..8e22faa6e3 100644
--- a/epan/dissectors/packet-xmpp.c
+++ b/epan/dissectors/packet-xmpp.c
@@ -377,23 +377,23 @@ dissect_xmpp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
     /*check if desegment
      * now it checks that last char is '>',
      * TODO checks that first element in packet is closed*/
-    int   index;
+    int   indx;
     gchar last_char;
 
     if (xmpp_desegment)
     {
-        index = tvb_reported_length(tvb) - 1;
-        if (index >= 0)
+        indx = tvb_reported_length(tvb) - 1;
+        if (indx >= 0)
         {
-            last_char = tvb_get_guint8(tvb, index);
+            last_char = tvb_get_guint8(tvb, indx);
 
-            while ((last_char <= ' ') && (index - 1 >= 0))
+            while ((last_char <= ' ') && (indx - 1 >= 0))
             {
-                index--;
-                last_char = tvb_get_guint8(tvb, index);
+                indx--;
+                last_char = tvb_get_guint8(tvb, indx);
             }
 
-            if ((index >= 0) && (last_char != '>'))
+            if ((indx >= 0) && (last_char != '>'))
             {
                 pinfo->desegment_len = DESEGMENT_ONE_MORE_SEGMENT;
                 return;