2010-05-15 Michael Snyder <msnyder@vmware.com>

* objc-lang.c: White space.
	* objfiles.c: White space.
	* observer.c: White space.
	* osabi.c: White space.
	* osdata.c: White space.

gdb/ChangeLog

@@ -1,5 +1,11 @@
 2010-05-15  Michael Snyder  <msnyder@vmware.com>
 
+	* objc-lang.c: White space.
+	* objfiles.c: White space.
+	* observer.c: White space.
+	* osabi.c: White space.
+	* osdata.c: White space.
+
 	* m2-lang.c: White space.
 	* m2-valprint.c: White space.
 	* macrocmd.c: White space.

gdb/objc-lang.c

@@ -244,11 +244,13 @@ objc_demangle (const char *mangled, int options)
 	  xfree(demangled);	/* not mangled name */
 	  return NULL;
 	}
-      if (cp[1] == '_') {	/* easy case: no category name     */
+      if (cp[1] == '_')		/* easy case: no category name     */
+	{
 	  *cp++ = ' ';		/* replace two '_' with one ' '    */
 	  strcpy(cp, mangled + (cp - demangled) + 2);
 	}
-      else {
+      else
+	{
 	  *cp++ = '(';		/* less easy case: category name */
 	  cp = strchr(cp, '_');
 	  if (!cp)
@@ -283,7 +285,6 @@ objc_demangle (const char *mangled, int options)
 static void
 objc_emit_char (int c, struct type *type, struct ui_file *stream, int quoter)
 {
-
   c &= 0xFF;			/* Avoid sign bit follies.  */
 
   if (PRINT_LITERAL_FORM (c))
@@ -574,14 +575,18 @@ add_msglist(struct stoken *str, int addcolon)
   char *s, *p;
   int len, plen;
 
-  if (str == 0) {		/* Unnamed arg, or...  */
+  if (str == 0)			/* Unnamed arg, or...  */
-    if (addcolon == 0) {	/* variable number of args.  */
+    {
+      if (addcolon == 0)	/* variable number of args.  */
+	{
 	  msglist_len++;
 	  return;
 	}
       p = "";
       plen = 0;
-  } else {
+    }
+  else
+    {
       p = str->ptr;
       plen = str->length;
     }
@@ -591,11 +596,13 @@ add_msglist(struct stoken *str, int addcolon)
   strncat(s, p, plen);
   xfree(msglist_sel);
   msglist_sel = s;
-  if (addcolon) {
+  if (addcolon)
+    {
       s[len-2] = ':';
       s[len-1] = 0;
       msglist_len++;
-  } else
+    }
+  else
     s[len-2] = '\0';
 }
 
@@ -993,7 +1000,8 @@ parse_selector (char *method, char **selector)
   nselector = s1;
   s2 = s1;
 
-  for (;;) {
+  for (;;)
+    {
       if (isalnum (*s2) || (*s2 == '_') || (*s2 == ':'))
 	*s1++ = *s2;
       else if (isspace (*s2))
@@ -1087,7 +1095,8 @@ parse_method (char *method, char *type, char **class,
   nselector = s2;
   s1 = s2;
 
-  for (;;) {
+  for (;;)
+    {
       if (isalnum (*s2) || (*s2 == '_') || (*s2 == ':'))
 	*s1++ = *s2;
       else if (isspace (*s2))
@@ -1308,8 +1317,8 @@ char *find_imps (struct symtab *symtab, struct block *block,
   strcpy (buf, method);
   tmp = parse_method (buf, &type, &class, &category, &selector);
 
-  if (tmp == NULL) {
+  if (tmp == NULL)
-    
+    {
       struct symbol *sym = NULL;
       struct minimal_symbol *msym = NULL;
 
@@ -1499,16 +1508,19 @@ static void
 find_objc_msgsend (void)
 {
   unsigned int i;
-  for (i = 0; i < nmethcalls; i++) {
 
+  for (i = 0; i < nmethcalls; i++)
+    {
       struct minimal_symbol *func;
 
       /* Try both with and without underscore.  */
       func = lookup_minimal_symbol (methcalls[i].name, NULL, NULL);
-    if ((func == NULL) && (methcalls[i].name[0] == '_')) {
+      if ((func == NULL) && (methcalls[i].name[0] == '_'))
+	{
 	  func = lookup_minimal_symbol (methcalls[i].name + 1, NULL, NULL);
 	}
-    if (func == NULL) { 
+      if (func == NULL)
+	{ 
 	  methcalls[i].begin = 0;
 	  methcalls[i].end = 0;
 	  continue; 
@@ -1618,6 +1630,7 @@ read_objc_method (struct gdbarch *gdbarch, CORE_ADDR addr,
 		  struct objc_method *method)
 {
   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
+
   method->name  = read_memory_unsigned_integer (addr + 0, 4, byte_order);
   method->types = read_memory_unsigned_integer (addr + 4, 4, byte_order);
   method->imp   = read_memory_unsigned_integer (addr + 8, 4, byte_order);
@@ -1627,6 +1640,7 @@ static unsigned long
 read_objc_methlist_nmethods (struct gdbarch *gdbarch, CORE_ADDR addr)
 {
   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
+
   return read_memory_unsigned_integer (addr + 4, 4, byte_order);
 }
 
@@ -1643,6 +1657,7 @@ read_objc_object (struct gdbarch *gdbarch, CORE_ADDR addr,
 		  struct objc_object *object)
 {
   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
+
   object->isa = read_memory_unsigned_integer (addr, 4, byte_order);
 }
 
@@ -1651,6 +1666,7 @@ read_objc_super (struct gdbarch *gdbarch, CORE_ADDR addr,
 		 struct objc_super *super)
 {
   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
+
   super->receiver = read_memory_unsigned_integer (addr, 4, byte_order);
   super->class = read_memory_unsigned_integer (addr + 4, 4, byte_order);
 };
@@ -1660,6 +1676,7 @@ read_objc_class (struct gdbarch *gdbarch, CORE_ADDR addr,
 		 struct objc_class *class)
 {
   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
+
   class->isa = read_memory_unsigned_integer (addr, 4, byte_order);
   class->super_class = read_memory_unsigned_integer (addr + 4, 4, byte_order);
   class->name = read_memory_unsigned_integer (addr + 8, 4, byte_order);
@@ -1704,8 +1721,8 @@ find_implementation_from_class (struct gdbarch *gdbarch,
 	  for (i = 0; i < nmethods; i++) 
 	    {
 	      struct objc_method meth_str;
-	      read_objc_methlist_method (gdbarch, mlist, i, &meth_str);
 
+	      read_objc_methlist_method (gdbarch, mlist, i, &meth_str);
 #if 0
 	      fprintf (stderr, 
 		       "checking method 0x%lx against selector 0x%lx\n", 

gdb/objfiles.c

@@ -707,16 +707,17 @@ free_all_objfiles (void)
    Return non-zero iff any change happened.  */
 
 static int
-objfile_relocate1 (struct objfile *objfile, struct section_offsets *new_offsets)
+objfile_relocate1 (struct objfile *objfile, 
+		   struct section_offsets *new_offsets)
 {
   struct obj_section *s;
   struct section_offsets *delta =
     ((struct section_offsets *) 
      alloca (SIZEOF_N_SECTION_OFFSETS (objfile->num_sections)));
 
-  {
   int i;
   int something_changed = 0;
+
   for (i = 0; i < objfile->num_sections; ++i)
     {
       delta->offsets[i] =
@@ -726,7 +727,6 @@ objfile_relocate1 (struct objfile *objfile, struct section_offsets *new_offsets)
     }
   if (!something_changed)
     return 0;
-  }
 
   /* OK, get all the symtabs.  */
   {
@@ -794,6 +794,7 @@ objfile_relocate1 (struct objfile *objfile, struct section_offsets *new_offsets)
 
   {
     struct minimal_symbol *msym;
+
     ALL_OBJFILE_MSYMBOLS (objfile, msym)
       if (SYMBOL_SECTION (msym) >= 0)
       SYMBOL_VALUE_ADDRESS (msym) += ANOFFSET (delta, SYMBOL_SECTION (msym));
@@ -816,6 +817,7 @@ objfile_relocate1 (struct objfile *objfile, struct section_offsets *new_offsets)
 
   {
     int i;
+
     for (i = 0; i < objfile->num_sections; ++i)
       (objfile->section_offsets)->offsets[i] = ANOFFSET (new_offsets, i);
   }
@@ -1066,7 +1068,6 @@ qsort_cmp (const void *a, const void *b)
 	  /* We should have found one of the objfiles before getting here.  */
 	  gdb_assert (0);
 	}
-
     }
 
   /* Unreachable.  */

gdb/observer.c

@@ -91,6 +91,7 @@ static struct observer_list *
 xalloc_observer_list_node (void)
 {
   struct observer_list *node = XMALLOC (struct observer_list);
+
   node->observer = XMALLOC (struct observer);
   return node;
 }

gdb/osabi.c

@@ -588,6 +588,7 @@ set_osabi (char *args, int from_tty, struct cmd_list_element *c)
   else
     {
       int i;
+
       for (i = 1; i < GDB_OSABI_INVALID; i++)
 	if (strcmp (set_osabi_string, gdbarch_osabi_name (i)) == 0)
 	  {

gdb/osdata.c

@@ -83,6 +83,7 @@ osdata_start_item (struct gdb_xml_parser *parser,
 {
   struct osdata_parsing_data *data = user_data;
   struct osdata_item item = { NULL };
+
   VEC_safe_push (osdata_item_s, data->osdata->items, &item);
 }
 
@@ -95,6 +96,7 @@ osdata_start_column (struct gdb_xml_parser *parser,
 {
   struct osdata_parsing_data *data = user_data;
   const char *name = VEC_index (gdb_xml_value_s, attributes, 0)->value;
+
   data->property_name = xstrdup (name);
 }
 
@@ -123,6 +125,7 @@ static void
 clear_parsing_data (void *p)
 {
   struct osdata_parsing_data *data = p;
+
   osdata_free (data->osdata);
   data->osdata = NULL;
   xfree (data->property_name);
@@ -192,6 +195,7 @@ osdata_item_clear (struct osdata_item *item)
     {
       struct osdata_column *col;
       int ix;
+
       for (ix = 0;
 	   VEC_iterate (osdata_column_s, item->columns,
 			ix, col);
@@ -215,6 +219,7 @@ osdata_free (struct osdata *osdata)
     {
       struct osdata_item *item;
       int ix;
+
       for (ix = 0;
           VEC_iterate (osdata_item_s, osdata->items,
                        ix, item);
@@ -230,6 +235,7 @@ static void
 osdata_free_cleanup (void *arg)
 {
   struct osdata *osdata = arg;
+
   osdata_free (osdata);
 }
 
@@ -244,6 +250,7 @@ get_osdata (const char *type)
 {
   struct osdata *osdata = NULL;
   char *xml = target_get_osdata (type);
+
   if (xml)
     {
       struct cleanup *old_chain = make_cleanup (xfree, xml);
@@ -309,6 +316,7 @@ info_osdata_command (char *type, int from_tty)
     {
       struct osdata_column *col;
       int ix;
+
       for (ix = 0;
           VEC_iterate (osdata_column_s, last->columns,
                        ix, col);
@@ -323,6 +331,7 @@ info_osdata_command (char *type, int from_tty)
     {
       struct osdata_item *item;
       int ix_items;
+
       for (ix_items = 0;
           VEC_iterate (osdata_item_s, osdata->items,
                        ix_items, item);