reformat a little to match GNU coding standards.

From-SVN: r14023

diff --git a/gcc/bc-optab.c b/gcc/bc-optab.c
index 63587e2..3d3e539 100644 (file)
--- a/gcc/bc-optab.c
+++ b/gcc/bc-optab.c
@@ -536,9 +536,9 @@ deduce_conversion (from, to)
 
   obstack_init (&recipe_obstack);
   curr.next = (struct rl *) obstack_alloc (&recipe_obstack, sizeof (struct rl));
-  curr.next->list =
-    (struct conversion_list *) obstack_alloc (&recipe_obstack,
-                                             sizeof (struct conversion_list));
+  curr.next->list
+    = (struct conversion_list *) obstack_alloc (&recipe_obstack,
+                                               sizeof (struct conversion_list));
   curr.next->list->opcode = -1;
   curr.next->list->to = from;
   curr.next->list->cost = 0;
@@ -638,9 +638,9 @@ bc_init_mode_to_code_map ()
 
   for (mode = 0; mode < MAX_MACHINE_MODE + 1; mode++)
     {
-      signed_mode_to_code_map[mode] = 
-       unsigned_mode_to_code_map[mode] =
-         LAST_AND_UNUSED_TYPECODE;
+      signed_mode_to_code_map[mode]
+       = unsigned_mode_to_code_map[mode]
+       = LAST_AND_UNUSED_TYPECODE;
     }
 
 #define DEF_MODEMAP(SYM, CODE, UCODE, CONST, LOAD, STORE) \

diff --git a/gcc/c-aux-info.c b/gcc/c-aux-info.c
index 429601f..2114a86 100644 (file)
--- a/gcc/c-aux-info.c
+++ b/gcc/c-aux-info.c
@@ -178,10 +178,10 @@ gen_formal_list_for_type (fntype, style)
         formal_list = concat (formal_list, ", ");
 
       this_type = gen_type ("", TREE_VALUE (formal_type), ansi);
-      formal_list =
-          (strlen (this_type))
-              ? concat (formal_list, affix_data_type (this_type))
-              : concat (formal_list, data_type);
+      formal_list
+       = ((strlen (this_type))
+          ? concat (formal_list, affix_data_type (this_type))
+          : concat (formal_list, data_type));
 
       formal_type = TREE_CHAIN (formal_type);
     }

diff --git a/gcc/calls.c b/gcc/calls.c
index 696479a..6a753d3 100644 (file)
--- a/gcc/calls.c
+++ b/gcc/calls.c
@@ -452,10 +452,10 @@ emit_call_1 (funexp, fndecl, funtype, stack_size, struct_value_size,
   if (stack_size != 0 && RETURN_POPS_ARGS (fndecl, funtype, stack_size) > 0)
     {
       if (!already_popped)
-       CALL_INSN_FUNCTION_USAGE (call_insn) =
-          gen_rtx (EXPR_LIST, VOIDmode,
-                   gen_rtx (CLOBBER, VOIDmode, stack_pointer_rtx),
-                   CALL_INSN_FUNCTION_USAGE (call_insn));
+       CALL_INSN_FUNCTION_USAGE (call_insn)
+         = gen_rtx (EXPR_LIST, VOIDmode,
+                    gen_rtx (CLOBBER, VOIDmode, stack_pointer_rtx),
+                    CALL_INSN_FUNCTION_USAGE (call_insn));
       stack_size -= RETURN_POPS_ARGS (fndecl, funtype, stack_size);
       stack_size_rtx = GEN_INT (stack_size);
     }
@@ -812,16 +812,16 @@ expand_call (exp, target, ignore)
   /* Unless it's a call to a specific function that isn't alloca,
      if it has one argument, we must assume it might be alloca.  */
 
-  may_be_alloca =
-    (!(fndecl != 0 && strcmp (name, "alloca"))
-     && actparms != 0
-     && TREE_CHAIN (actparms) == 0);
+  may_be_alloca
+    = (!(fndecl != 0 && strcmp (name, "alloca"))
+       && actparms != 0
+       && TREE_CHAIN (actparms) == 0);
 #else
   /* We assume that alloca will always be called by name.  It
      makes no sense to pass it as a pointer-to-function to
      anything that does not understand its behavior.  */
-  may_be_alloca =
-    (name && ((IDENTIFIER_LENGTH (DECL_NAME (fndecl)) == 6
+  may_be_alloca
+    = (name && ((IDENTIFIER_LENGTH (DECL_NAME (fndecl)) == 6
                 && name[0] == 'a'
                 && ! strcmp (name, "alloca"))
                || (IDENTIFIER_LENGTH (DECL_NAME (fndecl)) == 16

diff --git a/gcc/cccp.c b/gcc/cccp.c
index 0725465..0cc57cd 100644 (file)
--- a/gcc/cccp.c
+++ b/gcc/cccp.c
@@ -1489,10 +1489,10 @@ main (argc, argv)
          if (i + 1 == argc)
            fatal ("Filename missing after -pcp option");
          pcp_fname = argv[++i];
-         pcp_outfile = 
-           ((pcp_fname[0] != '-' || pcp_fname[1] != '\0')
-            ? fopen (pcp_fname, "w")
-            : stdout);
+         pcp_outfile
+           = ((pcp_fname[0] != '-' || pcp_fname[1] != '\0')
+              ? fopen (pcp_fname, "w")
+              : stdout);
          if (pcp_outfile == 0)
            pfatal_with_name (pcp_fname);
          no_precomp = 1;
@@ -5546,8 +5546,8 @@ create_definition (buf, limit, op)
       while (is_idchar[*bp]) {
        bp++;
        /* do we have a "special" rest-args extension here? */
-       if (limit - bp > REST_EXTENSION_LENGTH &&
-           bcmp (rest_extension, bp, REST_EXTENSION_LENGTH) == 0) {
+       if (limit - bp > REST_EXTENSION_LENGTH
+           && bcmp (rest_extension, bp, REST_EXTENSION_LENGTH) == 0) {
          rest_args = 1;
          temp->rest_args = 1;
          break;
@@ -5579,8 +5579,8 @@ create_definition (buf, limit, op)
        struct arglist *otemp;
 
        for (otemp = temp->next; otemp != NULL; otemp = otemp->next)
-         if (temp->length == otemp->length &&
-             bcmp (temp->name, otemp->name, temp->length) == 0) {
+         if (temp->length == otemp->length
+             && bcmp (temp->name, otemp->name, temp->length) == 0) {
              error ("duplicate argument name `%.*s' in `#define'",
                     temp->length, temp->name);
              goto nope;
@@ -6657,8 +6657,7 @@ do_line (buf, limit, op, keyword)
       }
     }
 
-    hash_bucket =
-      &fname_table[hashf (fname, fname_length, FNAME_HASHSIZE)];
+    hash_bucket = &fname_table[hashf (fname, fname_length, FNAME_HASHSIZE)];
     for (hp = *hash_bucket; hp != NULL; hp = hp->next)
       if (hp->length == fname_length &&
          bcmp (hp->value.cpval, fname, fname_length) == 0) {
@@ -6947,8 +6946,8 @@ do_elif (buf, limit, op, keyword)
     if (if_stack->type != T_IF && if_stack->type != T_ELIF) {
       error ("`#elif' after `#else'");
       fprintf (stderr, " (matches line %d", if_stack->lineno);
-      if (if_stack->fname != NULL && ip->fname != NULL &&
-         strcmp (if_stack->fname, ip->nominal_fname) != 0)
+      if (if_stack->fname != NULL && ip->fname != NULL
+         && strcmp (if_stack->fname, ip->nominal_fname) != 0)
        fprintf (stderr, ", file %s", if_stack->fname);
       fprintf (stderr, ")\n");
     }
@@ -7066,9 +7065,9 @@ do_xifdef (buf, limit, op, keyword)
 
     if (pcp_outfile) {
       /* Output a precondition for this macro.  */
-      if (hp &&
-         (hp->type == T_CONST
-          || (hp->type == T_MACRO && hp->value.defn->predefined)))
+      if (hp
+         && (hp->type == T_CONST
+             || (hp->type == T_MACRO && hp->value.defn->predefined)))
        fprintf (pcp_outfile, "#define %s\n", hp->name);
       else {
        U_CHAR *cp = buf;

diff --git a/gcc/combine.c b/gcc/combine.c
index 31efa5b..edf2126 100644 (file)
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -7358,9 +7358,9 @@ nonzero_bits (x, mode)
       if (GET_MODE (XEXP (x, 0)) != VOIDmode)
        {
          inner_nz &= GET_MODE_MASK (GET_MODE (XEXP (x, 0)));
-         if (inner_nz &
-             (((HOST_WIDE_INT) 1
-               << (GET_MODE_BITSIZE (GET_MODE (XEXP (x, 0))) - 1))))
+         if (inner_nz
+             & (((HOST_WIDE_INT) 1
+                 << (GET_MODE_BITSIZE (GET_MODE (XEXP (x, 0))) - 1))))
            inner_nz |= (GET_MODE_MASK (mode)
                          & ~ GET_MODE_MASK (GET_MODE (XEXP (x, 0))));
        }

diff --git a/gcc/cplus-dem.c b/gcc/cplus-dem.c
index f43f7c1..43aa8e1 100644 (file)
--- a/gcc/cplus-dem.c
+++ b/gcc/cplus-dem.c
@@ -1362,8 +1362,8 @@ demangle_prefix (work, mangled, declp)
          success = 0;
        }
     }
-  else if ((scan == *mangled) &&
-          (isdigit (scan[2]) || (scan[2] == 'Q') || (scan[2] == 't')))
+  else if ((scan == *mangled)
+          && (isdigit (scan[2]) || (scan[2] == 'Q') || (scan[2] == 't')))
     {
       /* The ARM says nothing about the mangling of local variables.
         But cfront mangles local variables by prepending __<nesting_level>
@@ -2349,15 +2349,15 @@ remember_type (work, start, len)
       if (work -> typevec_size == 0)
        {
          work -> typevec_size = 3;
-         work -> typevec =
-           (char **) xmalloc (sizeof (char *) * work -> typevec_size);
+         work -> typevec
+           = (char **) xmalloc (sizeof (char *) * work -> typevec_size);
        }
       else
        {
          work -> typevec_size *= 2;
-         work -> typevec =
-           (char **) xrealloc ((char *)work -> typevec,
-                               sizeof (char *) * work -> typevec_size);
+         work -> typevec
+           = (char **) xrealloc ((char *)work -> typevec,
+                                 sizeof (char *) * work -> typevec_size);
        }
     }
   tem = xmalloc (len + 1);

diff --git a/gcc/cpplib.c b/gcc/cpplib.c
index 697cea8..10dc2fc 100644 (file)
--- a/gcc/cpplib.c
+++ b/gcc/cpplib.c
@@ -1542,8 +1542,8 @@ create_definition (buf, limit, pfile, predefinition)
       while (is_idchar[*bp]) {
        bp++;
        /* do we have a "special" rest-args extension here? */
-       if (limit - bp > REST_EXTENSION_LENGTH &&
-           strncmp (rest_extension, bp, REST_EXTENSION_LENGTH) == 0) {
+       if (limit - bp > REST_EXTENSION_LENGTH
+           && strncmp (rest_extension, bp, REST_EXTENSION_LENGTH) == 0) {
          rest_args = 1;
          temp->rest_args = 1;
          break;
@@ -1570,8 +1570,8 @@ create_definition (buf, limit, pfile, predefinition)
        struct arglist *otemp;
 
        for (otemp = temp->next; otemp != NULL; otemp = otemp->next)
-         if (temp->length == otemp->length &&
-           strncmp (temp->name, otemp->name, temp->length) == 0) {
+         if (temp->length == otemp->length
+             && strncmp (temp->name, otemp->name, temp->length) == 0) {
              U_CHAR *name;
 
              name = (U_CHAR *) alloca (temp->length + 1);
@@ -3798,11 +3798,10 @@ do_line (pfile, keyword)
       }
     }
 
-    hash_bucket =
-      &fname_table[hashf (fname, fname_length, FNAME_HASHSIZE)];
+    hash_bucket = &fname_table[hashf (fname, fname_length, FNAME_HASHSIZE)];
     for (hp = *hash_bucket; hp != NULL; hp = hp->next)
-      if (hp->length == fname_length &&
-         strncmp (hp->value.cpval, fname, fname_length) == 0) {
+      if (hp->length == fname_length
+         && strncmp (hp->value.cpval, fname, fname_length) == 0) {
        ip->nominal_fname = hp->value.cpval;
        break;
       }
@@ -6430,10 +6429,9 @@ cpp_handle_options (pfile, argc, argv)
 #if 0
        else if (!strcmp (argv[i], "-pcp")) {
          char *pcp_fname = argv[++i];
-         pcp_outfile = 
-           ((pcp_fname[0] != '-' || pcp_fname[1] != '\0')
-            ? fopen (pcp_fname, "w")
-            : fdopen (dup (fileno (stdout)), "w"));
+         pcp_outfile = ((pcp_fname[0] != '-' || pcp_fname[1] != '\0')
+                        ? fopen (pcp_fname, "w")
+                        : fdopen (dup (fileno (stdout)), "w"));
          if (pcp_outfile == 0)
            cpp_pfatal_with_name (pfile, pcp_fname);
          no_precomp = 1;

diff --git a/gcc/dbxout.c b/gcc/dbxout.c
index 6a62635..39d4932 100644 (file)
--- a/gcc/dbxout.c
+++ b/gcc/dbxout.c
@@ -1013,19 +1013,19 @@ dbxout_type (type, full, show_arg_types)
 
       if (next_type_number == typevec_len)
        {
-         typevec =
-           (struct typeinfo *) xrealloc (typevec,
-                                         typevec_len * 2 * sizeof typevec[0]);
+         typevec
+           = (struct typeinfo *) xrealloc (typevec,
+                                           typevec_len * 2 * sizeof typevec[0]);
          bzero ((char *) (typevec + typevec_len),
                 typevec_len * sizeof typevec[0]);
          typevec_len *= 2;
        }
 
 #ifdef DBX_USE_BINCL
-      typevec[TYPE_SYMTAB_ADDRESS (type)].file_number =
-       current_file->file_number;
-      typevec[TYPE_SYMTAB_ADDRESS (type)].type_number =
-       current_file->next_type_number++;
+      typevec[TYPE_SYMTAB_ADDRESS (type)].file_number
+       = current_file->file_number;
+      typevec[TYPE_SYMTAB_ADDRESS (type)].type_number
+       = current_file->next_type_number++;
 #endif
     }