From 22e373c14384e84489f66a30df2c7603b044970d Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Fri, 2 Dec 2016 22:24:06 -0800 Subject: [PATCH] Fix misleadingly indented statements. 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 | 62 ++++++++++++++++---------------- src/language/stats/reliability.c | 28 +++++++-------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/language/stats/npar.c b/src/language/stats/npar.c index a7822d30b6..e9e2e61b2f 100644 --- a/src/language/stats/npar.c +++ b/src/language/stats/npar.c @@ -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, diff --git a/src/language/stats/reliability.c b/src/language/stats/reliability.c index fd6af69448..6af1439f56 100644 --- a/src/language/stats/reliability.c +++ b/src/language/stats/reliability.c @@ -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]; + } -- 2.30.2