[SCM] archer-ratmice-compile-Wc++-compat: rename all "using" identifiers

[SCM] archer-ratmice-compile-Wc++-compat: rename all "using" identifiers

[tromey]

The branch, archer-ratmice-compile-Wc++-compat has been updated
       via  fcdc82f8a7ed37b03fb865db85c93507db639425 (commit)
       via  4953c73ac642bd2e64aa643fcc19f0e9be83c1c2 (commit)
      from  100da71420fcedbc8ce598d723f5658082eedc32 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit fcdc82f8a7ed37b03fb865db85c93507db639425
Author: Tom Tromey <tromey@redhat.com>
Date:   Tue Sep 14 21:54:26 2010 -0600

    rename all "using" identifiers

commit 4953c73ac642bd2e64aa643fcc19f0e9be83c1c2
Author: Tom Tromey <tromey@redhat.com>
Date:   Tue Sep 14 21:48:49 2010 -0600

    rename all "try" identifiers

-----------------------------------------------------------------------

Summary of changes:
 gdb/block.c           |   10 +++++-----
 gdb/block.h           |    2 +-
 gdb/hppa-linux-tdep.c |   16 ++++++++--------
 gdb/i386-nat.c        |    4 ++--
 gdb/remote-mips.c     |    4 ++--
 5 files changed, 18 insertions(+), 18 deletions(-)

First 500 lines of diff:
diff --git a/gdb/block.c b/gdb/block.c
index 7f3c627..e8361df 100644
--- a/gdb/block.c
+++ b/gdb/block.c
@@ -32,7 +32,7 @@
 struct block_namespace_info
 {
   const char *scope;
-  struct using_direct *using;
+  struct using_direct *directive;
 };
 
 static void block_initialize_namespace (struct block *block,
@@ -236,7 +236,7 @@ block_using (const struct block *block)
   if (block == NULL || BLOCK_NAMESPACE (block) == NULL)
     return NULL;
   else
-    return BLOCK_NAMESPACE (block)->using;
+    return BLOCK_NAMESPACE (block)->directive;
 }
 
 /* Set BLOCK's using member to USING; if needed, allocate memory via
@@ -245,12 +245,12 @@ block_using (const struct block *block)
 
 void
 block_set_using (struct block *block,
-		 struct using_direct *using,
+		 struct using_direct *directive,
 		 struct obstack *obstack)
 {
   block_initialize_namespace (block, obstack);
 
-  BLOCK_NAMESPACE (block)->using = using;
+  BLOCK_NAMESPACE (block)->directive = directive;
 }
 
 /* If BLOCK_NAMESPACE (block) is NULL, allocate it via OBSTACK and
@@ -265,7 +265,7 @@ block_initialize_namespace (struct block *block, struct obstack *obstack)
 	= (struct block_namespace_info *)
 	obstack_alloc (obstack, sizeof (struct block_namespace_info));
       BLOCK_NAMESPACE (block)->scope = NULL;
-      BLOCK_NAMESPACE (block)->using = NULL;
+      BLOCK_NAMESPACE (block)->directive = NULL;
     }
 }
 
diff --git a/gdb/block.h b/gdb/block.h
index aa0e8a6..5a5e7dc 100644
--- a/gdb/block.h
+++ b/gdb/block.h
@@ -158,7 +158,7 @@ extern void block_set_scope (struct block *block, const char *scope,
 extern struct using_direct *block_using (const struct block *block);
 
 extern void block_set_using (struct block *block,
-			     struct using_direct *using,
+			     struct using_direct *directive,
 			     struct obstack *obstack);
 
 extern const struct block *block_static_block (const struct block *block);
diff --git a/gdb/hppa-linux-tdep.c b/gdb/hppa-linux-tdep.c
index ebfc2f5..b362921 100644
--- a/gdb/hppa-linux-tdep.c
+++ b/gdb/hppa-linux-tdep.c
@@ -136,7 +136,7 @@ hppa_linux_sigtramp_find_sigcontext (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
   unsigned int dummy[HPPA_MAX_INSN_PATTERN_LEN];
   int offs = 0;
-  int try;
+  int attempt;
   /* offsets to try to find the trampoline */
   static int pcoffs[] = { 0, 4*4, 5*4 };
   /* offsets to the rt_sigframe structure */
@@ -154,12 +154,12 @@ hppa_linux_sigtramp_find_sigcontext (struct gdbarch *gdbarch, CORE_ADDR pc)
      e4008200 be,l 0x100(%sr2, %r0), %sr0, %r31
      08000240 nop  */
 
-  for (try = 0; try < ARRAY_SIZE (pcoffs); try++)
+  for (attempt = 0; attempt < ARRAY_SIZE (pcoffs); attempt++)
     {
-      if (insns_match_pattern (gdbarch, sp + pcoffs[try],
+      if (insns_match_pattern (gdbarch, sp + pcoffs[attempt],
 			       hppa_sigtramp, dummy))
 	{
-          offs = sfoffs[try];
+          offs = sfoffs[attempt];
 	  break;
 	}
     }
@@ -171,8 +171,8 @@ hppa_linux_sigtramp_find_sigcontext (struct gdbarch *gdbarch, CORE_ADDR pc)
 	  /* sigaltstack case: we have no way of knowing which offset to 
 	     use in this case; default to new kernel handling. If this is
 	     wrong the unwinding will fail.  */
-	  try = 2;
-	  sp = pc - pcoffs[try];
+	  attempt = 2;
+	  sp = pc - pcoffs[attempt];
 	}
       else
       {
@@ -180,13 +180,13 @@ hppa_linux_sigtramp_find_sigcontext (struct gdbarch *gdbarch, CORE_ADDR pc)
       }
     }
 
-  /* sp + sfoffs[try] points to a struct rt_sigframe, which contains
+  /* sp + sfoffs[attempt] points to a struct rt_sigframe, which contains
      a struct siginfo and a struct ucontext.  struct ucontext contains
      a struct sigcontext. Return an offset to this sigcontext here.  Too 
      bad we cannot include system specific headers :-(.  
      sizeof(struct siginfo) == 128
      offsetof(struct ucontext, uc_mcontext) == 24.  */
-  return sp + sfoffs[try] + 128 + 24;
+  return sp + sfoffs[attempt] + 128 + 24;
 }
 
 struct hppa_linux_sigtramp_unwind_cache
diff --git a/gdb/i386-nat.c b/gdb/i386-nat.c
index 82c51d7..3d7b811 100644
--- a/gdb/i386-nat.c
+++ b/gdb/i386-nat.c
@@ -434,8 +434,8 @@ i386_handle_nonaligned_watchpoint (i386_wp_op_t what, CORE_ADDR addr, int len,
       int align = addr % max_wp_len;
       /* Four (eight on AMD64) is the maximum length a debug register
 	 can watch.  */
-      int try = (len > max_wp_len ? (max_wp_len - 1) : len - 1);
-      int size = size_try_array[try][align];
+      int attempt = (len > max_wp_len ? (max_wp_len - 1) : len - 1);
+      int size = size_try_array[attempt][align];
 
       if (what == WP_COUNT)
 	{
diff --git a/gdb/remote-mips.c b/gdb/remote-mips.c
index 28d2ecb..b735d65 100644
--- a/gdb/remote-mips.c
+++ b/gdb/remote-mips.c
@@ -844,7 +844,7 @@ mips_send_packet (const char *s, int get_ack)
   /* unsigned */ int len;
   unsigned char *packet;
   int cksum;
-  int try;
+  int attempt;
 
   len = strlen (s);
   if (len > DATA_MAXLEN)
@@ -871,7 +871,7 @@ mips_send_packet (const char *s, int get_ack)
   /* We can only have one outstanding data packet, so we just wait for
      the acknowledgement here.  Keep retransmitting the packet until
      we get one, or until we've tried too many times.  */
-  for (try = 0; try < mips_send_retries; try++)
+  for (attempt = 0; attempt < mips_send_retries; attempt++)
     {
       int garbage;
       int ch;


hooks/post-receive
--
Repository for Project Archer.