* symtab.c (search_symbols): Formatting fixes.

	(print_symbol_info): Formatting fixes.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 55917f4f20861f44c8ddcb88bc6d80f511d379c8..e2cef25b75b432fd30a3a1a3302a79e58db34a43 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
 2012-05-23  Doug Evans  <dje@google.com>
 
+       * symtab.c (search_symbols): Formatting fixes.
+       (print_symbol_info): Formatting fixes.
+
        * dwarf2-frame.c (execute_cfa_program): Update to handle long long ->
        int64_t change to leb128 API.
        (read_encoded_value, decode_frame_entry_1): Ditto.

diff --git a/gdb/symtab.c b/gdb/symtab.c
index bdb93b050e5bced971deea6b552b8b2c812825ba..85ddd1dfb39ef23aa42e0e725ce91513e11ffb08 100644 (file)
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -3454,10 +3454,10 @@ search_symbols (char *regexp, enum search_domain kind,
       {
         QUIT;
 
-       if (MSYMBOL_TYPE (msymbol) == ourtype ||
-           MSYMBOL_TYPE (msymbol) == ourtype2 ||
-           MSYMBOL_TYPE (msymbol) == ourtype3 ||
-           MSYMBOL_TYPE (msymbol) == ourtype4)
+       if (MSYMBOL_TYPE (msymbol) == ourtype
+           || MSYMBOL_TYPE (msymbol) == ourtype2
+           || MSYMBOL_TYPE (msymbol) == ourtype3
+           || MSYMBOL_TYPE (msymbol) == ourtype4)
          {
            if (!datum.preg_p
                || regexec (&datum.preg, SYMBOL_NATURAL_NAME (msymbol), 0,
@@ -3486,69 +3486,69 @@ search_symbols (char *regexp, enum search_domain kind,
   ALL_PRIMARY_SYMTABS (objfile, s)
   {
     bv = BLOCKVECTOR (s);
-      for (i = GLOBAL_BLOCK; i <= STATIC_BLOCK; i++)
-       {
-         struct symbol_search *prevtail = tail;
-         int nfound = 0;
+    for (i = GLOBAL_BLOCK; i <= STATIC_BLOCK; i++)
+      {
+       struct symbol_search *prevtail = tail;
+       int nfound = 0;
 
-         b = BLOCKVECTOR_BLOCK (bv, i);
-         ALL_BLOCK_SYMBOLS (b, iter, sym)
-           {
-             struct symtab *real_symtab = SYMBOL_SYMTAB (sym);
-
-             QUIT;
-
-             if (file_matches (real_symtab->filename, files, nfiles)
-                 && ((!datum.preg_p
-                      || regexec (&datum.preg, SYMBOL_NATURAL_NAME (sym), 0,
-                                  NULL, 0) == 0)
-                     && ((kind == VARIABLES_DOMAIN
-                          && SYMBOL_CLASS (sym) != LOC_TYPEDEF
-                          && SYMBOL_CLASS (sym) != LOC_UNRESOLVED
-                          && SYMBOL_CLASS (sym) != LOC_BLOCK
-                          /* LOC_CONST can be used for more than just enums,
-                             e.g., c++ static const members.
-                             We only want to skip enums here.  */
-                          && !(SYMBOL_CLASS (sym) == LOC_CONST
-                               && TYPE_CODE (SYMBOL_TYPE (sym))
-                               == TYPE_CODE_ENUM))
-                         || (kind == FUNCTIONS_DOMAIN 
-                             && SYMBOL_CLASS (sym) == LOC_BLOCK)
-                         || (kind == TYPES_DOMAIN
-                             && SYMBOL_CLASS (sym) == LOC_TYPEDEF))))
-               {
-                 /* match */
-                 psr = (struct symbol_search *)
-                   xmalloc (sizeof (struct symbol_search));
-                 psr->block = i;
-                 psr->symtab = real_symtab;
-                 psr->symbol = sym;
-                 psr->msymbol = NULL;
-                 psr->next = NULL;
-                 if (tail == NULL)
-                   sr = psr;
-                 else
-                   tail->next = psr;
-                 tail = psr;
-                 nfound ++;
-               }
-           }
-         if (nfound > 0)
-           {
-             if (prevtail == NULL)
-               {
-                 struct symbol_search dummy;
+       b = BLOCKVECTOR_BLOCK (bv, i);
+       ALL_BLOCK_SYMBOLS (b, iter, sym)
+         {
+           struct symtab *real_symtab = SYMBOL_SYMTAB (sym);
+
+           QUIT;
+
+           if (file_matches (real_symtab->filename, files, nfiles)
+               && ((!datum.preg_p
+                    || regexec (&datum.preg, SYMBOL_NATURAL_NAME (sym), 0,
+                                NULL, 0) == 0)
+                   && ((kind == VARIABLES_DOMAIN
+                        && SYMBOL_CLASS (sym) != LOC_TYPEDEF
+                        && SYMBOL_CLASS (sym) != LOC_UNRESOLVED
+                        && SYMBOL_CLASS (sym) != LOC_BLOCK
+                        /* LOC_CONST can be used for more than just enums,
+                           e.g., c++ static const members.
+                           We only want to skip enums here.  */
+                        && !(SYMBOL_CLASS (sym) == LOC_CONST
+                             && TYPE_CODE (SYMBOL_TYPE (sym))
+                             == TYPE_CODE_ENUM))
+                       || (kind == FUNCTIONS_DOMAIN 
+                           && SYMBOL_CLASS (sym) == LOC_BLOCK)
+                       || (kind == TYPES_DOMAIN
+                           && SYMBOL_CLASS (sym) == LOC_TYPEDEF))))
+             {
+               /* match */
+               psr = (struct symbol_search *)
+                 xmalloc (sizeof (struct symbol_search));
+               psr->block = i;
+               psr->symtab = real_symtab;
+               psr->symbol = sym;
+               psr->msymbol = NULL;
+               psr->next = NULL;
+               if (tail == NULL)
+                 sr = psr;
+               else
+                 tail->next = psr;
+               tail = psr;
+               nfound ++;
+             }
+         }
+       if (nfound > 0)
+         {
+           if (prevtail == NULL)
+             {
+               struct symbol_search dummy;
 
-                 dummy.next = sr;
-                 tail = sort_search_symbols (&dummy, nfound);
-                 sr = dummy.next;
+               dummy.next = sr;
+               tail = sort_search_symbols (&dummy, nfound);
+               sr = dummy.next;
 
-                 make_cleanup_free_search_symbols (sr);
-               }
-             else
-               tail = sort_search_symbols (prevtail, nfound);
-           }
-       }
+               make_cleanup_free_search_symbols (sr);
+             }
+           else
+             tail = sort_search_symbols (prevtail, nfound);
+         }
+      }
   }
 
   /* If there are no eyes, avoid all contact.  I mean, if there are
@@ -3560,10 +3560,10 @@ search_symbols (char *regexp, enum search_domain kind,
       {
         QUIT;
 
-       if (MSYMBOL_TYPE (msymbol) == ourtype ||
-           MSYMBOL_TYPE (msymbol) == ourtype2 ||
-           MSYMBOL_TYPE (msymbol) == ourtype3 ||
-           MSYMBOL_TYPE (msymbol) == ourtype4)
+       if (MSYMBOL_TYPE (msymbol) == ourtype
+           || MSYMBOL_TYPE (msymbol) == ourtype2
+           || MSYMBOL_TYPE (msymbol) == ourtype3
+           || MSYMBOL_TYPE (msymbol) == ourtype4)
          {
            if (!datum.preg_p
                || regexec (&datum.preg, SYMBOL_NATURAL_NAME (msymbol), 0,
@@ -3630,9 +3630,9 @@ print_symbol_info (enum search_domain kind,
       && SYMBOL_DOMAIN (sym) != STRUCT_DOMAIN)
     typedef_print (SYMBOL_TYPE (sym), sym, gdb_stdout);
   /* variable, func, or typedef-that-is-c++-class.  */
-  else if (kind < TYPES_DOMAIN ||
-          (kind == TYPES_DOMAIN &&
-           SYMBOL_DOMAIN (sym) == STRUCT_DOMAIN))
+  else if (kind < TYPES_DOMAIN
+          || (kind == TYPES_DOMAIN
+              && SYMBOL_DOMAIN (sym) == STRUCT_DOMAIN))
     {
       type_print (SYMBOL_TYPE (sym),
                  (SYMBOL_CLASS (sym) == LOC_TYPEDEF