1 files changed, 31 insertions, 31 deletions

diff --git a/gdb/location.c b/gdb/location.c
index 675c8d9..49067b9 100644
--- a/gdb/location.c
+++ b/gdb/location.c
@@ -52,8 +52,8 @@ struct event_location
 #define EL_ADDRESS(PTR) (PTR)->u.address
 
     /* An explicit location.  */
-    struct explicit_location explicit;
-#define EL_EXPLICIT(PTR) (&((PTR)->u.explicit))
+    struct explicit_location explicit_loc;
+#define EL_EXPLICIT(PTR) (&((PTR)->u.explicit_loc))
   } u;
 
   /* Cached string representation of this location.  This is used, e.g., to
@@ -73,10 +73,10 @@ event_location_type (const struct event_location *location)
 /* See description in location.h.  */
 
 void
-initialize_explicit_location (struct explicit_location *explicit)
+initialize_explicit_location (struct explicit_location *explicit_loc)
 {
-  memset (explicit, 0, sizeof (struct explicit_location));
-  explicit->line_offset.sign = LINE_OFFSET_UNKNOWN;
+  memset (explicit_loc, 0, sizeof (struct explicit_location));
+  explicit_loc->line_offset.sign = LINE_OFFSET_UNKNOWN;
 }
 
 /* See description in location.h.  */
@@ -158,30 +158,30 @@ get_probe_location (const struct event_location *location)
 /* See description in location.h.  */
 
 struct event_location *
-new_explicit_location (const struct explicit_location *explicit)
+new_explicit_location (const struct explicit_location *explicit_loc)
 {
   struct event_location tmp;
 
   memset (&tmp, 0, sizeof (struct event_location));
   EL_TYPE (&tmp) = EXPLICIT_LOCATION;
   initialize_explicit_location (EL_EXPLICIT (&tmp));
-  if (explicit != NULL)
+  if (explicit_loc != NULL)
     {
-      if (explicit->source_filename != NULL)
+      if (explicit_loc->source_filename != NULL)
 	{
 	  EL_EXPLICIT (&tmp)->source_filename
-	    = explicit->source_filename;
+	    = explicit_loc->source_filename;
 	}
 
-      if (explicit->function_name != NULL)
+      if (explicit_loc->function_name != NULL)
 	EL_EXPLICIT (&tmp)->function_name
-	  = explicit->function_name;
+	  = explicit_loc->function_name;
 
-      if (explicit->label_name != NULL)
-	EL_EXPLICIT (&tmp)->label_name = explicit->label_name;
+      if (explicit_loc->label_name != NULL)
+	EL_EXPLICIT (&tmp)->label_name = explicit_loc->label_name;
 
-      if (explicit->line_offset.sign != LINE_OFFSET_UNKNOWN)
-	EL_EXPLICIT (&tmp)->line_offset = explicit->line_offset;
+      if (explicit_loc->line_offset.sign != LINE_OFFSET_UNKNOWN)
+	EL_EXPLICIT (&tmp)->line_offset = explicit_loc->line_offset;
     }
 
   return copy_event_location (&tmp);
@@ -206,14 +206,14 @@ get_explicit_location_const (const struct event_location *location)
 }
 
 /* This convenience function returns a malloc'd string which
-   represents the location in EXPLICIT.
+   represents the location in EXPLICIT_LOC.
 
    AS_LINESPEC is non-zero if this string should be a linespec.
    Otherwise it will be output in explicit form.  */
 
 static char *
 explicit_to_string_internal (int as_linespec,
-			     const struct explicit_location *explicit)
+			     const struct explicit_location *explicit_loc)
 {
   struct ui_file *buf;
   char space, *result;
@@ -224,45 +224,45 @@ explicit_to_string_internal (int as_linespec,
   buf = mem_fileopen ();
   cleanup = make_cleanup_ui_file_delete (buf);
 
-  if (explicit->source_filename != NULL)
+  if (explicit_loc->source_filename != NULL)
     {
       if (!as_linespec)
 	fputs_unfiltered ("-source ", buf);
-      fputs_unfiltered (explicit->source_filename, buf);
+      fputs_unfiltered (explicit_loc->source_filename, buf);
       need_space = 1;
     }
 
-  if (explicit->function_name != NULL)
+  if (explicit_loc->function_name != NULL)
     {
       if (need_space)
 	fputc_unfiltered (space, buf);
       if (!as_linespec)
 	fputs_unfiltered ("-function ", buf);
-      fputs_unfiltered (explicit->function_name, buf);
+      fputs_unfiltered (explicit_loc->function_name, buf);
       need_space = 1;
     }
 
-  if (explicit->label_name != NULL)
+  if (explicit_loc->label_name != NULL)
     {
       if (need_space)
 	fputc_unfiltered (space, buf);
       if (!as_linespec)
 	fputs_unfiltered ("-label ", buf);
-      fputs_unfiltered (explicit->label_name, buf);
+      fputs_unfiltered (explicit_loc->label_name, buf);
       need_space = 1;
     }
 
-  if (explicit->line_offset.sign != LINE_OFFSET_UNKNOWN)
+  if (explicit_loc->line_offset.sign != LINE_OFFSET_UNKNOWN)
     {
       if (need_space)
 	fputc_unfiltered (space, buf);
       if (!as_linespec)
 	fputs_unfiltered ("-line ", buf);
       fprintf_filtered (buf, "%s%d",
-			(explicit->line_offset.sign == LINE_OFFSET_NONE ? ""
-			 : (explicit->line_offset.sign
+			(explicit_loc->line_offset.sign == LINE_OFFSET_NONE ? ""
+			 : (explicit_loc->line_offset.sign
 			    == LINE_OFFSET_PLUS ? "+" : "-")),
-			explicit->line_offset.offset);
+			explicit_loc->line_offset.offset);
     }
 
   result = ui_file_xstrdup (buf, NULL);
@@ -273,17 +273,17 @@ explicit_to_string_internal (int as_linespec,
 /* See description in location.h.  */
 
 char *
-explicit_location_to_string (const struct explicit_location *explicit)
+explicit_location_to_string (const struct explicit_location *explicit_loc)
 {
-  return explicit_to_string_internal (0, explicit);
+  return explicit_to_string_internal (0, explicit_loc);
 }
 
 /* See description in location.h.  */
 
 char *
-explicit_location_to_linespec (const struct explicit_location *explicit)
+explicit_location_to_linespec (const struct explicit_location *explicit_loc)
 {
-  return explicit_to_string_internal (1, explicit);
+  return explicit_to_string_internal (1, explicit_loc);
 }
 
 /* See description in location.h.  */