Fix misleadingly indented statements.
authorBen Pfaff <blp@cs.stanford.edu>
Sat, 3 Dec 2016 06:24:06 +0000 (22:24 -0800)
committerBen Pfaff <blp@cs.stanford.edu>
Sat, 3 Dec 2016 06:24:06 +0000 (22:24 -0800)
GCC 6.2.1 reported {}-braced blocks that looked like they were guarded by
preceding "if" statements but really weren't.  This fixes the misleading
indentation.

src/language/stats/npar.c
src/language/stats/reliability.c

index a7822d30b6d66fe07217031d96cd7a531f184a20..e9e2e61b2f85613f7c401900cc782e31016d5054 100644 (file)
@@ -947,37 +947,37 @@ npar_binomial (struct lexer *lexer, struct dataset *ds,
     if (!lex_force_match (lexer, T_EQUALS))
       return 0;
 
-    {
-      if (parse_variables_const_pool (lexer, specs->pool, dataset_dict (ds),
-                                     &tp->vars, &tp->n_vars,
-                                     PV_NUMERIC | PV_NO_SCRATCH | PV_NO_DUPLICATE) )
-       {
-         if (lex_match (lexer, T_LPAREN))
-           {
-             if (! lex_force_num (lexer))
-               return 2;
-             btp->category1 = lex_number (lexer);
-             lex_get (lexer);
-             if ( lex_match (lexer, T_COMMA))
-               {
-                 if ( ! lex_force_num (lexer) ) return 2;
-                 btp->category2 = lex_number (lexer);
-                 lex_get (lexer);
-               }
-             else
-               {
-                 btp->cutpoint = btp->category1;
-               }
-
-             if (! lex_force_match (lexer, T_RPAREN))
-               return 0;
-           }
-       }
-      else
-       {
-         return 2;
-       }
-    }
+  {
+    if (parse_variables_const_pool (lexer, specs->pool, dataset_dict (ds),
+                                    &tp->vars, &tp->n_vars,
+                                    PV_NUMERIC | PV_NO_SCRATCH | PV_NO_DUPLICATE) )
+      {
+        if (lex_match (lexer, T_LPAREN))
+          {
+            if (! lex_force_num (lexer))
+              return 2;
+            btp->category1 = lex_number (lexer);
+            lex_get (lexer);
+            if ( lex_match (lexer, T_COMMA))
+              {
+                if ( ! lex_force_num (lexer) ) return 2;
+                btp->category2 = lex_number (lexer);
+                lex_get (lexer);
+              }
+            else
+              {
+                btp->cutpoint = btp->category1;
+              }
+
+            if (! lex_force_match (lexer, T_RPAREN))
+              return 0;
+          }
+      }
+    else
+      {
+        return 2;
+      }
+  }
 
   specs->n_tests++;
   specs->test = pool_realloc (specs->pool,
index fd6af69448a59200195994aa7ebfc208c43a10a7..6af1439f565de47b01bec4cf68fc73cb91fee760 100644 (file)
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009, 2010, 2011, 2013, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010, 2011, 2013, 2015, 2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -164,23 +164,23 @@ cmd_reliability (struct lexer *lexer, struct dataset *ds)
     msg (MW, _("Reliability on a single variable is not useful."));
 
 
-    {
-      int i;
-      struct cronbach *c;
-      /* Create a default Scale */
+  {
+    int i;
+    struct cronbach *c;
+    /* Create a default Scale */
 
-      reliability.n_sc = 1;
-      reliability.sc = xzalloc (sizeof (struct cronbach) * reliability.n_sc);
+    reliability.n_sc = 1;
+    reliability.sc = xzalloc (sizeof (struct cronbach) * reliability.n_sc);
 
-      ds_assign_cstr (&reliability.scale_name, "ANY");
+    ds_assign_cstr (&reliability.scale_name, "ANY");
 
-      c = &reliability.sc[0];
-      c->n_items = reliability.n_variables;
-      c->items = xzalloc (sizeof (struct variable*) * c->n_items);
+    c = &reliability.sc[0];
+    c->n_items = reliability.n_variables;
+    c->items = xzalloc (sizeof (struct variable*) * c->n_items);
 
-      for (i = 0 ; i < c->n_items ; ++i)
-       c->items[i] = reliability.variables[i];
-    }
+    for (i = 0 ; i < c->n_items ; ++i)
+      c->items[i] = reliability.variables[i];
+  }