Run clang-format.shusers/simark/clang-format

Change-Id: Ia948cc26d534b0dd02702244d52434b1a2093968

1 files changed, 34 insertions, 31 deletions

diff --git a/gdb/solib-darwin.c b/gdb/solib-darwin.c
index 1f52dd4..b309149 100644
--- a/gdb/solib-darwin.c
+++ b/gdb/solib-darwin.c
@@ -77,7 +77,9 @@ struct darwin_info
   CORE_ADDR all_image_addr = 0;
 
   /* Gdb copy of dyld_all_info_infos.  */
-  struct gdb_dyld_all_image_infos all_image {};
+  struct gdb_dyld_all_image_infos all_image
+  {
+  };
 };
 
 /* Per-program-space data key.  */
@@ -105,7 +107,7 @@ static int
 darwin_dyld_version_ok (const struct darwin_info *info)
 {
   return info->all_image.version >= DYLD_VERSION_MIN
-    && info->all_image.version <= DYLD_VERSION_MAX;
+	 && info->all_image.version <= DYLD_VERSION_MAX;
 }
 
 /* Read dyld_all_image from inferior.  */
@@ -139,8 +141,8 @@ darwin_load_image_infos (struct darwin_info *info)
 
   info->all_image.count = extract_unsigned_integer (buf + 4, 4, byte_order);
   info->all_image.info = extract_typed_address (buf + 8, ptr_type);
-  info->all_image.notifier = extract_typed_address
-    (buf + 8 + ptr_type->length (), ptr_type);
+  info->all_image.notifier
+    = extract_typed_address (buf + 8 + ptr_type->length (), ptr_type);
 }
 
 /* Link map info to include in an allocated so_list entry.  */
@@ -201,7 +203,8 @@ find_program_interpreter (void)
       bfd_mach_o_load_command *cmd;
 
       if (bfd_mach_o_lookup_command (current_program_space->exec_bfd (),
-				     BFD_MACH_O_LC_LOAD_DYLINKER, &cmd) == 1)
+				     BFD_MACH_O_LC_LOAD_DYLINKER, &cmd)
+	  == 1)
 	return cmd->command.dylinker.name_str;
     }
 
@@ -266,13 +269,13 @@ darwin_current_sos (void)
       if (target_read_memory (load_addr, (gdb_byte *) &hdr, sizeof (hdr) - 4))
 	break;
       /* Discard wrong magic numbers.  Shouldn't happen.  */
-      hdr_val = extract_unsigned_integer
-	(hdr.magic, sizeof (hdr.magic), byte_order);
+      hdr_val
+	= extract_unsigned_integer (hdr.magic, sizeof (hdr.magic), byte_order);
       if (hdr_val != BFD_MACH_O_MH_MAGIC && hdr_val != BFD_MACH_O_MH_MAGIC_64)
 	continue;
       /* Discard executable.  Should happen only once.  */
-      hdr_val = extract_unsigned_integer
-	(hdr.filetype, sizeof (hdr.filetype), byte_order);
+      hdr_val = extract_unsigned_integer (hdr.filetype, sizeof (hdr.filetype),
+					  byte_order);
       if (hdr_val == BFD_MACH_O_MH_EXECUTE)
 	continue;
 
@@ -317,14 +320,14 @@ darwin_validate_exec_header (CORE_ADDR load_addr)
     return 0;
 
   /* Discard wrong magic numbers.  Shouldn't happen.  */
-  hdr_val = extract_unsigned_integer
-    (hdr.magic, sizeof (hdr.magic), byte_order);
+  hdr_val
+    = extract_unsigned_integer (hdr.magic, sizeof (hdr.magic), byte_order);
   if (hdr_val != BFD_MACH_O_MH_MAGIC && hdr_val != BFD_MACH_O_MH_MAGIC_64)
     return 0;
 
   /* Check executable.  */
-  hdr_val = extract_unsigned_integer
-    (hdr.filetype, sizeof (hdr.filetype), byte_order);
+  hdr_val = extract_unsigned_integer (hdr.filetype, sizeof (hdr.filetype),
+				      byte_order);
   if (hdr_val == BFD_MACH_O_MH_EXECUTE)
     return load_addr;
 
@@ -378,7 +381,8 @@ darwin_read_exec_load_addr_at_init (struct darwin_info *info)
   /* Get SP.  */
   if (regcache_cooked_read_unsigned (get_current_regcache (),
 				     gdbarch_sp_regnum (gdbarch),
-				     &load_ptr_addr) != REG_VALID)
+				     &load_ptr_addr)
+      != REG_VALID)
     return 0;
 
   /* Read value at SP (image load address).  */
@@ -440,9 +444,9 @@ darwin_get_dyld_bfd ()
   gdb_bfd_ref_ptr dyld_bfd (gdb_bfd_open (interp_name, gnutarget));
   if (dyld_bfd != NULL)
     {
-      gdb_bfd_ref_ptr sub
-	(gdb_bfd_mach_o_fat_extract (dyld_bfd.get (), bfd_object,
-				     gdbarch_bfd_arch_info (target_gdbarch ())));
+      gdb_bfd_ref_ptr sub (gdb_bfd_mach_o_fat_extract (
+	dyld_bfd.get (), bfd_object,
+	gdbarch_bfd_arch_info (target_gdbarch ())));
       dyld_bfd = sub;
     }
   return dyld_bfd;
@@ -467,8 +471,8 @@ darwin_solib_get_all_image_info_addr_at_init (struct darwin_info *info)
 	       - bfd_get_start_address (dyld_bfd.get ()));
 
   /* Now try to set a breakpoint in the dynamic linker.  */
-  info->all_image_addr =
-    lookup_symbol_from_bfd (dyld_bfd.get (), "_dyld_all_image_infos");
+  info->all_image_addr
+    = lookup_symbol_from_bfd (dyld_bfd.get (), "_dyld_all_image_infos");
 
   if (info->all_image_addr == 0)
     return;
@@ -491,8 +495,8 @@ darwin_solib_read_all_image_info_addr (struct darwin_info *info)
     return;
 
   len = target_read (current_inferior ()->top_target (),
-		     TARGET_OBJECT_DARWIN_DYLD_INFO,
-		     NULL, buf, 0, ptr_type->length ());
+		     TARGET_OBJECT_DARWIN_DYLD_INFO, NULL, buf, 0,
+		     ptr_type->length ());
   if (len <= 0)
     return;
 
@@ -527,7 +531,7 @@ darwin_solib_create_inferior_hook (int from_tty)
 
   if (!darwin_dyld_version_ok (info))
     {
-      warning (_("unhandled dyld version (%d)"), info->all_image.version);
+      warning (_ ("unhandled dyld version (%d)"), info->all_image.version);
       return;
     }
 
@@ -551,7 +555,8 @@ darwin_solib_create_inferior_hook (int from_tty)
       CORE_ADDR vmaddr;
 
       /* Find the base address of the executable.  */
-      vmaddr = bfd_mach_o_get_base_address (current_program_space->exec_bfd ());
+      vmaddr
+	= bfd_mach_o_get_base_address (current_program_space->exec_bfd ());
 
       /* Relocate.  */
       if (vmaddr != load_addr)
@@ -579,7 +584,7 @@ darwin_solib_create_inferior_hook (int from_tty)
 	      CORE_ADDR dyld_relocated_base_address;
 	      CORE_ADDR pc;
 
-	      dyld_bfd_start_address = bfd_get_start_address (dyld_bfd.get());
+	      dyld_bfd_start_address = bfd_get_start_address (dyld_bfd.get ());
 
 	      /* We find the dynamic linker's base address by examining
 		 the current pc (which should point at the entry point
@@ -645,7 +650,7 @@ darwin_relocate_section_addresses (struct so_list *so,
   if (sec->addr < so->addr_low)
     so->addr_low = sec->addr;
 }
-
+
 static gdb_bfd_ref_ptr
 darwin_bfd_open (const char *pathname)
 {
@@ -660,11 +665,10 @@ darwin_bfd_open (const char *pathname)
   /* Open bfd for shared library.  */
   gdb_bfd_ref_ptr abfd (solib_bfd_fopen (found_pathname.get (), found_file));
 
-  gdb_bfd_ref_ptr res
-    (gdb_bfd_mach_o_fat_extract (abfd.get (), bfd_object,
-				 gdbarch_bfd_arch_info (target_gdbarch ())));
+  gdb_bfd_ref_ptr res (gdb_bfd_mach_o_fat_extract (
+    abfd.get (), bfd_object, gdbarch_bfd_arch_info (target_gdbarch ())));
   if (res == NULL)
-    error (_("`%s': not a shared-library: %s"),
+    error (_ ("`%s': not a shared-library: %s"),
 	   bfd_get_filename (abfd.get ()), bfd_errmsg (bfd_get_error ()));
 
   /* The current filename for fat-binary BFDs is a name generated
@@ -675,8 +679,7 @@ darwin_bfd_open (const char *pathname)
   return res;
 }
 
-const struct target_so_ops darwin_so_ops =
-{
+const struct target_so_ops darwin_so_ops = {
   darwin_relocate_section_addresses,
   darwin_free_so,
   nullptr,