From 96994a54e60e9c95b8bba54c2281acf7059b1203 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sun, 7 Jun 2020 12:32:44 +0200 Subject: [PATCH 1/1] Whitespace changes only. Remove whitespace following opening parentheses and preceding closing parentheses. --- lib/tukey/ptukey.c | 2 +- lib/tukey/qtukey.c | 4 +- perl-module/ppport.h | 40 ++--- src/data/case-map.c | 2 +- src/data/case.c | 2 +- src/data/casereader-filter.c | 2 +- src/data/casereader-translator.c | 18 +-- src/data/casereader.c | 2 +- src/data/datasheet.c | 2 +- src/data/dictionary.c | 48 +++--- src/data/file-handle-def.c | 8 +- src/data/file-name.c | 6 +- src/data/format-guesser.c | 2 +- src/data/format.c | 6 +- src/data/gnumeric-reader.c | 92 +++++------ src/data/identifier.h | 4 +- src/data/ods-reader.c | 92 +++++------ src/data/por-file-writer.c | 2 +- src/data/psql-reader.c | 58 +++---- src/data/settings.c | 38 ++--- src/data/settings.h | 16 +- src/data/spreadsheet-reader.c | 18 +-- src/data/sys-file-reader.c | 4 +- src/data/sys-file-writer.c | 2 +- src/data/transformations.c | 2 +- src/language/command.c | 2 +- src/language/data-io/combine-files.c | 4 +- src/language/data-io/data-reader.c | 2 +- src/language/data-io/get-data.c | 26 ++-- src/language/data-io/list.c | 12 +- src/language/data-io/matrix-reader.c | 2 +- src/language/data-io/placement-parser.c | 2 +- src/language/dictionary/modify-variables.c | 2 +- src/language/dictionary/numeric.c | 2 +- src/language/dictionary/split-file.c | 2 +- src/language/dictionary/variable-display.c | 34 ++--- src/language/expressions/evaluate.c | 2 +- src/language/expressions/parse.c | 2 +- src/language/lexer/q2c.c | 32 ++-- src/language/lexer/subcommand-list.c | 4 +- src/language/lexer/variable-parser.c | 6 +- src/language/lexer/variable-parser.h | 2 +- src/language/stats/aggregate.c | 12 +- src/language/stats/binomial.c | 22 +-- src/language/stats/chisquare.c | 20 +-- src/language/stats/cochran.c | 8 +- src/language/stats/correlations.c | 18 +-- src/language/stats/descriptives.c | 6 +- src/language/stats/examine.c | 34 ++--- src/language/stats/factor.c | 62 ++++---- src/language/stats/flip.c | 2 +- src/language/stats/frequencies.c | 14 +- src/language/stats/friedman.c | 16 +- src/language/stats/glm.c | 34 ++--- src/language/stats/graph.c | 6 +- src/language/stats/jonckheere-terpstra.c | 4 +- src/language/stats/jonckheere-terpstra.h | 2 +- src/language/stats/kruskal-wallis.c | 4 +- src/language/stats/kruskal-wallis.h | 2 +- src/language/stats/logistic.c | 30 ++-- src/language/stats/mann-whitney.c | 10 +- src/language/stats/mann-whitney.h | 2 +- src/language/stats/mcnemar.c | 14 +- src/language/stats/means-calc.c | 2 +- src/language/stats/means-parser.c | 6 +- src/language/stats/median.c | 14 +- src/language/stats/median.h | 2 +- src/language/stats/npar.c | 144 +++++++++--------- src/language/stats/oneway.c | 50 +++--- src/language/stats/quick-cluster.c | 16 +- src/language/stats/rank.c | 68 ++++----- src/language/stats/reliability.c | 34 ++--- src/language/stats/roc.c | 82 +++++----- src/language/stats/runs.c | 20 +-- src/language/stats/sign.c | 6 +- src/language/stats/t-test-indep.c | 14 +- src/language/stats/t-test-one-sample.c | 4 +- src/language/stats/t-test-paired.c | 4 +- src/language/stats/t-test-parser.c | 30 ++-- src/language/stats/wilcoxon.c | 10 +- src/language/stats/wilcoxon.h | 2 +- src/language/utilities/cd.c | 4 +- src/language/utilities/include.c | 22 +-- src/language/utilities/permissions.c | 12 +- src/language/xforms/recode.c | 2 +- src/libpspp/abt.h | 2 +- src/libpspp/ext-array.c | 2 +- src/libpspp/i18n.c | 10 +- src/libpspp/i18n.h | 2 +- src/libpspp/ll.c | 4 +- src/libpspp/llx.c | 6 +- src/libpspp/message.c | 6 +- src/libpspp/str.c | 2 +- src/libpspp/taint.c | 2 +- src/libpspp/zip-private.h | 8 +- src/libpspp/zip-reader.c | 48 +++--- src/math/box-whisker.c | 4 +- src/math/covariance.c | 42 ++--- src/math/extrema.c | 12 +- src/math/interaction.c | 2 +- src/math/levene.c | 16 +- src/math/linreg.c | 6 +- src/math/merge.c | 2 +- src/math/np.c | 2 +- src/math/order-stats.c | 10 +- src/math/percentiles.c | 34 ++--- src/math/trimmed-mean.c | 6 +- src/math/tukey-hinges.c | 4 +- src/output/ascii.c | 6 +- src/output/cairo-chart.c | 12 +- src/output/cairo.c | 4 +- src/output/charts/barchart-cairo.c | 2 +- src/output/charts/boxplot-cairo.c | 6 +- src/output/charts/piechart-cairo.c | 6 +- src/output/charts/piechart.c | 2 +- src/output/charts/plot-hist-cairo.c | 4 +- src/output/charts/roc-chart-cairo.c | 2 +- src/output/charts/scree-cairo.c | 2 +- src/output/charts/spreadlevel-plot.c | 2 +- src/output/driver.c | 4 +- src/output/html.c | 6 +- src/output/journal.c | 4 +- src/output/odt.c | 12 +- src/output/pivot-output.c | 2 +- src/output/pivot-table.c | 6 +- src/output/pivot-table.h | 2 +- src/output/render.c | 20 +-- src/output/spv/spv-legacy-decoder.c | 8 +- src/output/spv/spv.c | 4 +- src/output/spv/spv.h | 2 +- src/output/spv/spvbin-helpers.c | 2 +- src/ui/gui/builder-wrapper.c | 6 +- src/ui/gui/dialog-common.c | 8 +- src/ui/gui/dict-display.c | 10 +- src/ui/gui/dict-display.h | 2 +- src/ui/gui/executor.c | 6 +- src/ui/gui/find-dialog.c | 50 +++--- src/ui/gui/help-menu.c | 4 +- src/ui/gui/helper.c | 22 +-- src/ui/gui/missing-val-dialog.c | 26 ++-- src/ui/gui/psppire-acr.c | 8 +- src/ui/gui/psppire-buttonbox.c | 16 +- src/ui/gui/psppire-conf.c | 22 +-- src/ui/gui/psppire-data-editor.c | 10 +- src/ui/gui/psppire-data-editor.h | 2 +- src/ui/gui/psppire-data-store.c | 38 ++--- src/ui/gui/psppire-data-window.c | 24 +-- src/ui/gui/psppire-dialog-action-1sks.c | 18 +-- src/ui/gui/psppire-dialog-action-aggregate.c | 30 ++-- src/ui/gui/psppire-dialog-action-autorecode.c | 22 +-- src/ui/gui/psppire-dialog-action-barchart.c | 4 +- src/ui/gui/psppire-dialog-action-binomial.c | 10 +- src/ui/gui/psppire-dialog-action-chisquare.c | 8 +- src/ui/gui/psppire-dialog-action-comments.c | 12 +- src/ui/gui/psppire-dialog-action-compute.c | 34 ++--- .../gui/psppire-dialog-action-correlation.c | 2 +- src/ui/gui/psppire-dialog-action-count.c | 8 +- src/ui/gui/psppire-dialog-action-crosstabs.c | 8 +- .../gui/psppire-dialog-action-descriptives.c | 2 +- src/ui/gui/psppire-dialog-action-examine.c | 22 +-- src/ui/gui/psppire-dialog-action-factor.c | 28 ++-- src/ui/gui/psppire-dialog-action-flip.c | 8 +- .../gui/psppire-dialog-action-frequencies.c | 4 +- src/ui/gui/psppire-dialog-action-histogram.c | 4 +- .../gui/psppire-dialog-action-indep-samps.c | 4 +- .../gui/psppire-dialog-action-k-independent.c | 8 +- src/ui/gui/psppire-dialog-action-k-related.c | 10 +- src/ui/gui/psppire-dialog-action-kmeans.c | 2 +- src/ui/gui/psppire-dialog-action-logistic.c | 4 +- src/ui/gui/psppire-dialog-action-means.c | 2 +- src/ui/gui/psppire-dialog-action-oneway.c | 44 +++--- src/ui/gui/psppire-dialog-action-paired.c | 10 +- src/ui/gui/psppire-dialog-action-rank.c | 22 +-- .../psppire-dialog-action-recode-different.c | 18 +-- .../gui/psppire-dialog-action-recode-same.c | 8 +- src/ui/gui/psppire-dialog-action-recode.c | 22 +-- src/ui/gui/psppire-dialog-action-recode.h | 2 +- src/ui/gui/psppire-dialog-action-regression.c | 6 +- .../gui/psppire-dialog-action-reliability.c | 10 +- src/ui/gui/psppire-dialog-action-roc.c | 22 +-- src/ui/gui/psppire-dialog-action-runs.c | 18 +-- .../gui/psppire-dialog-action-scatterplot.c | 6 +- src/ui/gui/psppire-dialog-action-select.c | 30 ++-- src/ui/gui/psppire-dialog-action-sort.c | 6 +- src/ui/gui/psppire-dialog-action-split.c | 14 +- src/ui/gui/psppire-dialog-action-tt1s.c | 6 +- src/ui/gui/psppire-dialog-action-two-sample.c | 8 +- src/ui/gui/psppire-dialog-action-univariate.c | 4 +- src/ui/gui/psppire-dialog-action-var-info.c | 2 +- src/ui/gui/psppire-dialog-action-weight.c | 6 +- src/ui/gui/psppire-dialog-action.c | 2 +- src/ui/gui/psppire-dialog.c | 24 +-- src/ui/gui/psppire-dialog.h | 4 +- src/ui/gui/psppire-dict.c | 28 ++-- src/ui/gui/psppire-dictview.c | 8 +- src/ui/gui/psppire-keypad.c | 8 +- src/ui/gui/psppire-keypad.h | 2 +- src/ui/gui/psppire-lex-reader.c | 2 +- src/ui/gui/psppire-output-view.c | 8 +- src/ui/gui/psppire-output-window.c | 16 +- src/ui/gui/psppire-scanf.c | 32 ++-- src/ui/gui/psppire-selector.c | 62 ++++---- src/ui/gui/psppire-syntax-window.c | 34 ++--- src/ui/gui/psppire-val-chooser.c | 10 +- src/ui/gui/psppire-var-ptr.c | 6 +- src/ui/gui/psppire-var-view.c | 8 +- src/ui/gui/psppire-window.c | 16 +- src/ui/gui/psppire.c | 2 +- src/ui/gui/spreadsheet-test.c | 4 +- src/ui/gui/t-test-options.c | 6 +- src/ui/gui/val-labs-dialog.c | 8 +- src/ui/gui/var-display.c | 10 +- src/ui/gui/var-type-dialog.c | 14 +- src/ui/gui/widget-io.c | 12 +- src/ui/gui/windows-menu.c | 2 +- src/ui/source-init-opts.c | 2 +- src/ui/terminal/terminal-reader.c | 10 +- tests/language/lexer/segment-test.c | 2 +- tests/libpspp/abt-test.c | 2 +- tests/libpspp/range-map-test.c | 2 +- tests/libpspp/range-set-test.c | 2 +- tests/libpspp/range-tower-test.c | 2 +- tests/libpspp/tower-test.c | 2 +- tests/libpspp/zip-test.c | 16 +- tests/output/render-test.c | 2 +- utilities/pspp-convert.c | 2 +- utilities/pspp-dump-sav.c | 2 +- 227 files changed, 1489 insertions(+), 1489 deletions(-) diff --git a/lib/tukey/ptukey.c b/lib/tukey/ptukey.c index 2af46cf893..d2c46270a8 100644 --- a/lib/tukey/ptukey.c +++ b/lib/tukey/ptukey.c @@ -327,7 +327,7 @@ ptukey (double q, double rr, double cc, double df, int lower_tail, int log_p) f(x) = .5 + erf(x / sqrt(2)) / 2 for x > 0 - f(x) = erfc( -x / sqrt(2)) / 2 for x < 0 + f(x) = erfc(-x / sqrt(2)) / 2 for x < 0 where f(x) is standard normal c. d. f. diff --git a/lib/tukey/qtukey.c b/lib/tukey/qtukey.c index 08f8c855d3..54c174be20 100644 --- a/lib/tukey/qtukey.c +++ b/lib/tukey/qtukey.c @@ -143,8 +143,8 @@ static double qinv(double p, double c, double v) ps = 0.5 - 0.5 * p; yi = sqrt (log (1.0 / (ps * ps))); - t = yi + (((( yi * p4 + p3) * yi + p2) * yi + p1) * yi + p0) - / (((( yi * q4 + q3) * yi + q2) * yi + q1) * yi + q0); + t = yi + ((((yi * p4 + p3) * yi + p2) * yi + p1) * yi + p0) + / ((((yi * q4 + q3) * yi + q2) * yi + q1) * yi + q0); if (v < vmax) t += (t * t * t + t) / v / 4.0; q = c1 - c2 * t; if (v < vmax) q += -c3 / v + c4 * t / v; diff --git a/perl-module/ppport.h b/perl-module/ppport.h index 166f577f1f..055919b033 100644 --- a/perl-module/ppport.h +++ b/perl-module/ppport.h @@ -365,7 +365,7 @@ eval { help quiet diag! filter! hints! changes! cplusplus patch=s copy=s diff=s compat-version=s list-provided list-unsupported api-info=s - )) or usage(); +)) or usage(); }; if ($@ and grep /^-/, @ARGV) { @@ -395,13 +395,13 @@ my $rccs = quotemeta $ccs; my $rcce = quotemeta $cce; my %API = map { /^(\w+)\|([^|]*)\|([^|]*)\|(\w*)$/ - ? ( $1 => { - ($2 ? ( base => $2 ) : ()), - ($3 ? ( todo => $3 ) : ()), - (index($4, 'v') >= 0 ? ( varargs => 1 ) : ()), - (index($4, 'p') >= 0 ? ( provided => 1 ) : ()), - (index($4, 'n') >= 0 ? ( nothxarg => 1 ) : ()), - } ) + ? ($1 => { + ($2 ? (base => $2) : ()), + ($3 ? (todo => $3) : ()), + (index($4, 'v') >= 0 ? (varargs => 1) : ()), + (index($4, 'p') >= 0 ? (provided => 1) : ()), + (index($4, 'n') >= 0 ? (nothxarg => 1) : ()), + }) : die "invalid spec: $_" } qw( AvFILLp|5.004050||p AvFILL||| @@ -2101,7 +2101,7 @@ if (exists $opt{'list-provided'}) { } my @files; -my @srcext = qw( xs c h cc cpp ); +my @srcext = qw(xs c h cc cpp); my $srcext = join '|', @srcext; if (@ARGV) { @@ -2165,13 +2165,13 @@ for $filename (@files) { (?:"[^"\\]*(?:\\.[^"\\]*)*" [^"'/]*)+ | (?:'[^'\\]*(?:\\.[^'\\]*)*' [^"'/]*)+ - ) +) | (/ (?: \*[^*]*\*+(?:[^$ccs][^*]*\*+)* / | /[^\r\n]* - )) +)) }{ defined $2 and push @ccom, $2; defined $1 ? $1 : "$ccs$#ccom$cce"; @@ -2624,7 +2624,7 @@ sub hint sub usage { my($usage) = do { local(@ARGV,$/)=($0); <> } =~ /^=head\d$HS+SYNOPSIS\s*^(.*?)\s*^=/ms; - my %M = ( 'I' => '*' ); + my %M = ('I' => '*'); $usage =~ s/^\s*perl\s+\S+/$^X $0/; $usage =~ s/([A-Z])<([^>]+)>/$M{$1}$2$M{$1}/g; @@ -3058,7 +3058,7 @@ __DATA__ # define sv_uv(sv) SvUVx(sv) #endif #ifndef XST_mUV -# define XST_mUV(i,v) (ST(i) = sv_2mortal(newSVuv(v)) ) +# define XST_mUV(i,v) (ST(i) = sv_2mortal(newSVuv(v))) #endif #ifndef XSRETURN_UV @@ -3555,7 +3555,7 @@ DPPP_(my_newCONSTSUB)(HV *stash, char *name, SV *sv) * case below uses it to declare the data as static. */ #define START_MY_CXT -#if (PERL_VERSION < 4 || (PERL_VERSION == 4 && PERL_SUBVERSION < 68 )) +#if (PERL_VERSION < 4 || (PERL_VERSION == 4 && PERL_SUBVERSION < 68)) /* Fetches the SV that keeps the per-interpreter data. */ #define dMY_CXT_SV \ SV *my_cxt_sv = get_sv(MY_CXT_KEY, FALSE) @@ -4736,9 +4736,9 @@ DPPP_(my_grok_bin)(pTHX_ char *start, STRLEN *len_p, I32 *flags, NV *result) break; } - if ( ( overflowed && value_nv > 4294967295.0) + if ((overflowed && value_nv > 4294967295.0) #if UVSIZE > 4 - || (!overflowed && value > 0xffffffff ) + || (!overflowed && value > 0xffffffff) #endif ) { warn("Binary number > 0b11111111111111111111111111111111 non-portable"); @@ -4838,9 +4838,9 @@ DPPP_(my_grok_hex)(pTHX_ char *start, STRLEN *len_p, I32 *flags, NV *result) break; } - if ( ( overflowed && value_nv > 4294967295.0) + if ((overflowed && value_nv > 4294967295.0) #if UVSIZE > 4 - || (!overflowed && value > 0xffffffff ) + || (!overflowed && value > 0xffffffff) #endif ) { warn("Hexadecimal number > 0xffffffff non-portable"); @@ -4931,9 +4931,9 @@ DPPP_(my_grok_oct)(pTHX_ char *start, STRLEN *len_p, I32 *flags, NV *result) break; } - if ( ( overflowed && value_nv > 4294967295.0) + if ((overflowed && value_nv > 4294967295.0) #if UVSIZE > 4 - || (!overflowed && value > 0xffffffff ) + || (!overflowed && value > 0xffffffff) #endif ) { warn("Octal number > 037777777777 non-portable"); diff --git a/src/data/case-map.c b/src/data/case-map.c index 131e407879..f9dc678514 100644 --- a/src/data/case-map.c +++ b/src/data/case-map.c @@ -364,6 +364,6 @@ void case_map_dump (const struct case_map *cm) { int i; - for (i = 0 ; i < caseproto_get_n_widths (cm->proto); ++i ) + for (i = 0 ; i < caseproto_get_n_widths (cm->proto); ++i) printf ("%d -> %d\n", i, cm->map[i]); } diff --git a/src/data/case.c b/src/data/case.c index e879f6ac25..70c1b44075 100644 --- a/src/data/case.c +++ b/src/data/case.c @@ -496,7 +496,7 @@ copy_backward (struct ccase *dst, size_t dst_idx, { size_t i; - for (i = n_values; i-- != 0; ) + for (i = n_values; i-- != 0;) value_copy (&dst->values[dst_idx + i], &src->values[src_idx + i], caseproto_get_width (dst->proto, dst_idx + i)); } diff --git a/src/data/casereader-filter.c b/src/data/casereader-filter.c index 5b6cf06b72..a5a2dd5476 100644 --- a/src/data/casereader-filter.c +++ b/src/data/casereader-filter.c @@ -310,7 +310,7 @@ casereader_filter_missing_include (const struct ccase *c, void *cfm_) const union value *value = case_data (c, var); if (var_is_value_missing (var, value, cfm->class)) { - if ( cfm->n_missing ) + if (cfm->n_missing) (*cfm->n_missing)++; return false; } diff --git a/src/data/casereader-translator.c b/src/data/casereader-translator.c index d3388aa68b..cab13fe31d 100644 --- a/src/data/casereader-translator.c +++ b/src/data/casereader-translator.c @@ -369,7 +369,7 @@ casereader_create_append_rank (struct casereader *subreader, enum rank_error *err, distinct_func *distinct_callback, void *aux - ) + ) { struct casereader_append_rank *car = xmalloc (sizeof *car); car->proto = caseproto_ref (casereader_get_proto (subreader)); @@ -407,13 +407,13 @@ car_translate (struct ccase *input, void *car_) const double value = case_data (input, car->var)->f; - if ( car->prev_value != SYSMIS) + if (car->prev_value != SYSMIS) { if (car->err && value < car->prev_value) *car->err |= RANK_ERR_UNSORTED; } - if ( car->n_common == 1) + if (car->n_common == 1) { double vxx = SYSMIS; casenumber k = 0; @@ -421,7 +421,7 @@ car_translate (struct ccase *input, void *car_) if (car->weight) { weight = case_data (input, car->weight)->f; - if ( car->err && weight < 0 ) + if (car->err && weight < 0) *car->err |= RANK_ERR_NEGATIVE_WEIGHT; } @@ -432,13 +432,13 @@ car_translate (struct ccase *input, void *car_) break; vxx = case_data (c, car->var)->f; - if ( vxx == value) + if (vxx == value) { if (car->weight) { double w = case_data (c, car->weight)->f; - if ( car->err && w < 0 ) + if (car->err && w < 0) *car->err |= RANK_ERR_NEGATIVE_WEIGHT; weight += w; @@ -497,13 +497,13 @@ uniquify (const struct ccase *c, void *aux) cdr->n ++; cdr->cc += weight; - if ( NULL == next_case) + if (NULL == next_case) goto end; dir = value_compare_3way (case_data (next_case, cdr->key), current_value, key_width); case_unref (next_case); - if ( dir != 0 ) + if (dir != 0) { /* Insist that the data are sorted */ assert (cdr->direction == 0 || dir == cdr->direction); @@ -582,7 +582,7 @@ casereader_create_distinct (struct casereader *input, cdr->clone = casereader_clone (input); cdr->direction = 0; - if ( NULL == cdr->weight ) + if (NULL == cdr->weight) output_proto = caseproto_add_width (output_proto, 0); cdr->proto = output_proto; diff --git a/src/data/casereader.c b/src/data/casereader.c index 41d0ca473a..578a865dfd 100644 --- a/src/data/casereader.c +++ b/src/data/casereader.c @@ -107,7 +107,7 @@ casereader_clone (const struct casereader *reader_) { struct casereader *reader = CONST_CAST (struct casereader *, reader_); struct casereader *clone; - if ( reader == NULL ) + if (reader == NULL) return NULL; if (reader->class->clone == NULL) diff --git a/src/data/datasheet.c b/src/data/datasheet.c index ef2024873b..f18cf8bdc2 100644 --- a/src/data/datasheet.c +++ b/src/data/datasheet.c @@ -819,7 +819,7 @@ rw_case (struct datasheet *ds, enum rw_op op, assert (start_column + n_columns <= datasheet_get_n_columns (ds)); prow = axis_map (ds->rows, lrow); - for (i = 0; i < n_columns; ) + for (i = 0; i < n_columns;) { struct source *source = columns[i].source; size_t j; diff --git a/src/data/dictionary.c b/src/data/dictionary.c index 56b65a8bf6..40352b0f2b 100644 --- a/src/data/dictionary.c +++ b/src/data/dictionary.c @@ -137,7 +137,7 @@ void dict_dump (const struct dictionary *d) { int i; - for (i = 0 ; i < d->var_cnt ; ++i ) + for (i = 0 ; i < d->var_cnt ; ++i) { const struct variable *v = d->var[i].var; printf ("Name: %s;\tdict_idx: %zu; case_idx: %zu\n", @@ -275,7 +275,7 @@ dict_clear (struct dictionary *d) { /* FIXME? Should we really clear case_limit, label, documents? Others are necessarily cleared by deleting all the variables.*/ - while (d->var_cnt > 0 ) + while (d->var_cnt > 0) { dict_delete_var (d, d->var[d->var_cnt - 1].var); } @@ -419,8 +419,8 @@ add_var_with_case_index (struct dictionary *d, struct variable *v, vardict->case_index = case_index; var_set_vardict (v, vardict); - if ( d->changed ) d->changed (d, d->changed_data); - if ( d->callbacks && d->callbacks->var_added ) + if (d->changed) d->changed (d, d->changed_data); + if (d->callbacks && d->callbacks->var_added) d->callbacks->var_added (d, var_get_dict_index (v), d->cb_data); invalidate_proto (d); @@ -581,7 +581,7 @@ reindex_var (struct dictionary *d, struct vardict_info *vardict) hmap_insert_fast (&d->name_map, &vardict->name_node, vardict->name_node.hash); - if ( d->changed ) d->changed (d, d->changed_data); + if (d->changed) d->changed (d, d->changed_data); if (old) { d->callbacks->var_changed (d, var_get_dict_index (var), VAR_TRAIT_POSITION, old, d->cb_data); @@ -661,10 +661,10 @@ dict_delete_var (struct dictionary *d, struct variable *v) /* Free memory. */ var_clear_vardict (v); - if ( d->changed ) d->changed (d, d->changed_data); + if (d->changed) d->changed (d, d->changed_data); invalidate_proto (d); - if (d->callbacks && d->callbacks->var_deleted ) + if (d->callbacks && d->callbacks->var_deleted) d->callbacks->var_deleted (d, v, dict_index, case_index, d->cb_data); var_destroy (v); @@ -689,7 +689,7 @@ dict_delete_vars (struct dictionary *d, details. Deleting consecutive vars will result in less callbacks compared to iterating over dict_delete_var. A simple while loop over dict_delete_var will - produce (d->var_cnt - IDX ) * COUNT variable changed callbacks + produce (d->var_cnt - IDX) * COUNT variable changed callbacks plus COUNT variable delete callbacks. This here produces d->var_cnt - IDX variable changed callbacks plus COUNT variable delete callbacks. */ @@ -738,7 +738,7 @@ dict_delete_consecutive_vars (struct dictionary *d, size_t idx, size_t count) reindex_vars (d, idx, d->var_cnt); invalidate_proto (d); - if ( d->changed ) d->changed (d, d->changed_data); + if (d->changed) d->changed (d, d->changed_data); /* Now issue the variable delete callbacks and delete the variables. The vardict is not valid at this point @@ -748,7 +748,7 @@ dict_delete_consecutive_vars (struct dictionary *d, size_t idx, size_t count) { struct delvar *dv = (struct delvar *) ll_pop_head (&list); var_clear_vardict (dv->var); - if (d->callbacks && d->callbacks->var_deleted ) + if (d->callbacks && d->callbacks->var_deleted) d->callbacks->var_deleted (d, dv->var, vi, dv->case_index, d->cb_data); var_destroy (dv->var); free (dv); @@ -763,7 +763,7 @@ dict_delete_scratch_vars (struct dictionary *d) /* FIXME: this can be done in O(count) time, but this algorithm is O(count**2). */ - for (i = 0; i < d->var_cnt; ) + for (i = 0; i < d->var_cnt;) if (var_get_dict_class (d->var[i].var) == DC_SCRATCH) dict_delete_var (d, d->var[i].var); else @@ -858,8 +858,8 @@ dict_try_rename_var (struct dictionary *d, struct variable *v, if (settings_get_algorithm () == ENHANCED) var_clear_short_names (v); - if ( d->changed ) d->changed (d, d->changed_data); - if ( d->callbacks && d->callbacks->var_changed ) + if (d->changed) d->changed (d, d->changed_data); + if (d->callbacks && d->callbacks->var_changed) d->callbacks->var_changed (d, var_get_dict_index (v), VAR_TRAIT_NAME, old, d->cb_data); var_destroy (old); @@ -1148,7 +1148,7 @@ dict_set_weight (struct dictionary *d, struct variable *v) d->weight = v; if (d->changed) d->changed (d, d->changed_data); - if ( d->callbacks && d->callbacks->weight_changed ) + if (d->callbacks && d->callbacks->weight_changed) d->callbacks->weight_changed (d, v ? var_get_dict_index (v) : -1, d->cb_data); @@ -1191,7 +1191,7 @@ dict_set_filter (struct dictionary *d, struct variable *v) d->filter = v; if (d->changed) d->changed (d, d->changed_data); - if ( d->callbacks && d->callbacks->filter_changed ) + if (d->callbacks && d->callbacks->filter_changed) d->callbacks->filter_changed (d, v ? var_get_dict_index (v) : -1, d->cb_data); @@ -1370,7 +1370,7 @@ dict_set_split_vars (struct dictionary *d, assert (cnt == 0 || split != NULL); d->split_cnt = cnt; - if ( cnt > 0 ) + if (cnt > 0) { d->split = xnrealloc (d->split, cnt, sizeof *d->split) ; memcpy (d->split, split, cnt * sizeof *d->split); @@ -1382,7 +1382,7 @@ dict_set_split_vars (struct dictionary *d, } if (d->changed) d->changed (d, d->changed_data); - if ( d->callbacks && d->callbacks->split_changed ) + if (d->callbacks && d->callbacks->split_changed) d->callbacks->split_changed (d, d->cb_data); } @@ -1438,7 +1438,7 @@ dict_set_documents_string (struct dictionary *d, const char *new_docs) const char *s; dict_clear_documents (d); - for (s = new_docs; *s != '\0'; ) + for (s = new_docs; *s != '\0';) { size_t len = strcspn (s, "\n"); char *line = xmemdup0 (s, len); @@ -1686,12 +1686,12 @@ dict_unset_mrset_var (struct dictionary *dict, struct variable *var) assert (dict_contains_var (dict, var)); - for (i = 0; i < dict->n_mrsets; ) + for (i = 0; i < dict->n_mrsets;) { struct mrset *mrset = dict->mrsets[i]; size_t j; - for (j = 0; j < mrset->n_vars; ) + for (j = 0; j < mrset->n_vars;) if (mrset->vars[j] == var) remove_element (mrset->vars, mrset->n_vars--, sizeof *mrset->vars, j); @@ -1741,16 +1741,16 @@ dict_has_attributes (const struct dictionary *d) void dict_var_changed (const struct variable *v, unsigned int what, struct variable *oldvar) { - if ( var_has_vardict (v)) + if (var_has_vardict (v)) { const struct vardict_info *vardict = var_get_vardict (v); struct dictionary *d = vardict->dict; - if ( NULL == d) + if (NULL == d) return; - if (d->changed ) d->changed (d, d->changed_data); - if ( d->callbacks && d->callbacks->var_changed ) + if (d->changed) d->changed (d, d->changed_data); + if (d->callbacks && d->callbacks->var_changed) d->callbacks->var_changed (d, var_get_dict_index (v), what, oldvar, d->cb_data); } var_destroy (oldvar); diff --git a/src/data/file-handle-def.c b/src/data/file-handle-def.c index 4c4820cb12..4546a9ca0c 100644 --- a/src/data/file-handle-def.c +++ b/src/data/file-handle-def.c @@ -494,14 +494,14 @@ fh_lock (struct file_handle *h, enum fh_referent mask UNUSED, HMAP_FOR_EACH_WITH_HASH (lock, struct fh_lock, node, hash, &locks) { - if ( 0 == compare_fh_locks (lock, key)) + if (0 == compare_fh_locks (lock, key)) { found_lock = true; break; } } - if ( found_lock ) + if (found_lock) { if (strcmp (lock->type, type)) { @@ -533,7 +533,7 @@ fh_lock (struct file_handle *h, enum fh_referent mask UNUSED, found_lock = false; HMAP_FOR_EACH_WITH_HASH (lock, struct fh_lock, node, hash, &locks) { - if ( 0 == compare_fh_locks (lock, key)) + if (0 == compare_fh_locks (lock, key)) { found_lock = true; break; @@ -608,7 +608,7 @@ fh_is_locked (const struct file_handle *handle, enum fh_access access) HMAP_FOR_EACH_WITH_HASH (k, struct fh_lock, node, hash, &locks) { - if ( 0 == compare_fh_locks (k, &key)) + if (0 == compare_fh_locks (k, &key)) { is_locked = true; break; diff --git a/src/data/file-name.c b/src/data/file-name.c index 2bbd749b8d..184a79aa4f 100644 --- a/src/data/file-name.c +++ b/src/data/file-name.c @@ -98,7 +98,7 @@ fn_search_path (const char *base_name, char **path) file = xasprintf ("%s/%s", dir, base_name); struct stat temp; - if (( (stat (file, &temp) == 0 ) && ( ! S_ISDIR (temp.st_mode) ))) + if (((stat (file, &temp) == 0) && (! S_ISDIR (temp.st_mode)))) return file; free (file); @@ -115,7 +115,7 @@ fn_exists (const struct file_handle *fh) { const char *name = fh_get_file_name (fh); struct stat temp; - if ( stat (name, &temp) != 0 ) + if (stat (name, &temp) != 0) return false; return ! S_ISDIR (temp.st_mode); @@ -235,7 +235,7 @@ default_output_path (void) { static char *path = NULL; - if ( path == NULL) + if (path == NULL) { /* Windows NT defines HOMEDRIVE and HOMEPATH. But give preference to HOME, because the user can change HOME. */ diff --git a/src/data/format-guesser.c b/src/data/format-guesser.c index f2f5eb6aee..189320d293 100644 --- a/src/data/format-guesser.c +++ b/src/data/format-guesser.c @@ -334,7 +334,7 @@ add_numeric (struct fmt_guesser *g, struct substring s) if (dots || commas) delim_digits++; } - else if (c == '.' ) + else if (c == '.') { dots++; prev_delim = c; diff --git a/src/data/format.c b/src/data/format.c index 1cf083d38f..113d52592e 100644 --- a/src/data/format.c +++ b/src/data/format.c @@ -69,7 +69,7 @@ fmt_settings_create (void) int t; settings = xzalloc (sizeof *settings); - for (t = 0 ; t < FMT_NUMBER_OF_FORMATS ; ++t ) + for (t = 0 ; t < FMT_NUMBER_OF_FORMATS ; ++t) fmt_number_style_init (&settings->styles[t]); fmt_settings_set_decimal (settings, '.'); @@ -84,7 +84,7 @@ fmt_settings_destroy (struct fmt_settings *settings) { int t; - for (t = 0 ; t < FMT_NUMBER_OF_FORMATS ; ++t ) + for (t = 0 ; t < FMT_NUMBER_OF_FORMATS ; ++t) fmt_number_style_destroy (&settings->styles[t]); free (settings->styles); @@ -99,7 +99,7 @@ fmt_settings_clone (const struct fmt_settings *old) int t; new = xmalloc (sizeof *new); - for (t = 0 ; t < FMT_NUMBER_OF_FORMATS ; ++t ) + for (t = 0 ; t < FMT_NUMBER_OF_FORMATS ; ++t) fmt_number_style_clone (&new->styles[t], &old->styles[t]); return new; diff --git a/src/data/gnumeric-reader.c b/src/data/gnumeric-reader.c index fe5e866256..acfc3c9064 100644 --- a/src/data/gnumeric-reader.c +++ b/src/data/gnumeric-reader.c @@ -209,7 +209,7 @@ gnumeric_get_sheet_range (struct spreadsheet *s, int n) (gr->sheets[n].stop_col == -1) && (1 == (ret = xmlTextReaderRead (gr->msd.xtr))) - ) + ) { process_node (gr, &gr->msd); } @@ -227,12 +227,12 @@ gnm_file_casereader_destroy (struct casereader *reader UNUSED, void *r_) { struct gnumeric_reader *r = r_; - if ( r == NULL) + if (r == NULL) return ; state_data_destroy (&r->rsd); - if (r->first_case && ! r->used_first_case ) + if (r->first_case && ! r->used_first_case) case_unref (r->first_case); if (r->proto) @@ -285,7 +285,7 @@ process_node (struct gnumeric_reader *r, struct state_data *sd) } else if (XML_READER_TYPE_TEXT == sd->node_type) { - if ( r->sheets [r->spreadsheet.n_sheets - 1].name == NULL) + if (r->sheets [r->spreadsheet.n_sheets - 1].name == NULL) r->sheets [r->spreadsheet.n_sheets - 1].name = CHAR_CAST (char *, xmlTextReaderValue (sd->xtr)); } break; @@ -318,10 +318,10 @@ process_node (struct gnumeric_reader *r, struct state_data *sd) } else if (XML_READER_TYPE_TEXT == sd->node_type) { - if ( r->target_sheet != NULL) + if (r->target_sheet != NULL) { xmlChar *value = xmlTextReaderValue (sd->xtr); - if ( 0 == xmlStrcmp (value, r->target_sheet)) + if (0 == xmlStrcmp (value, r->target_sheet)) sd->state = STATE_SHEET_FOUND; free (value); } @@ -414,7 +414,7 @@ process_node (struct gnumeric_reader *r, struct state_data *sd) if (! xmlTextReaderIsEmptyElement (sd->xtr)) sd->state = STATE_CELL; } - else if ( (0 == xmlStrcasecmp (name, _xml("gnm:Cells"))) && (XML_READER_TYPE_END_ELEMENT == sd->node_type) ) + else if ((0 == xmlStrcasecmp (name, _xml("gnm:Cells"))) && (XML_READER_TYPE_END_ELEMENT == sd->node_type)) { r->sheets[sd->current_sheet].stop_col = sd->col; r->sheets[sd->current_sheet].stop_row = sd->row; @@ -446,7 +446,7 @@ convert_xml_string_to_value (struct ccase *c, const struct variable *var, if (xv == NULL) value_set_missing (v, var_get_width (var)); - else if ( var_is_alpha (var)) + else if (var_is_alpha (var)) value_copy_str_rpad (v, var_get_width (var), xv, ' '); else if (type == VALUE_FLOAT || type == VALUE_INTEGER) { @@ -455,7 +455,7 @@ convert_xml_string_to_value (struct ccase *c, const struct variable *var, errno = 0; v->f = c_strtod (text, &endptr); - if ( errno != 0 || endptr == text) + if (errno != 0 || endptr == text) v->f = SYSMIS; } else @@ -533,7 +533,7 @@ gnumeric_reopen (struct gnumeric_reader *r, const char *filename, bool show_erro xtr = xmlReaderForIO ((xmlInputReadCallback) gzread, (xmlInputCloseCallback) gzclose, gz, NULL, NULL, - show_errors ? 0 : (XML_PARSE_NOERROR | XML_PARSE_NOWARNING) ); + show_errors ? 0 : (XML_PARSE_NOERROR | XML_PARSE_NOWARNING)); if (xtr == NULL) { @@ -569,14 +569,14 @@ gnumeric_reopen (struct gnumeric_reader *r, const char *filename, bool show_erro This gives us some confidence that we are actually dealing with a gnumeric spreadsheet. */ - while ( (sd->state != STATE_INIT ) + while ((sd->state != STATE_INIT) && 1 == (ret = xmlTextReaderRead (sd->xtr))) { process_node (r, sd); } - if ( ret != 1) + if (ret != 1) { /* Does not seem to be a gnumeric file */ gnumeric_unref (&r->spreadsheet); @@ -590,7 +590,7 @@ gnumeric_reopen (struct gnumeric_reader *r, const char *filename, bool show_erro const xmlChar *enc = xmlTextReaderConstEncoding (sd->xtr); xmlCharEncoding xce = xmlParseCharEncoding (CHAR_CAST (const char *, enc)); - if ( XML_CHAR_ENCODING_UTF8 != xce) + if (XML_CHAR_ENCODING_UTF8 != xce) { /* I have been told that ALL gnumeric files are UTF8 encoded. If that is correct, this can never happen. */ @@ -632,9 +632,9 @@ gnumeric_make_reader (struct spreadsheet *spreadsheet, r = gnumeric_reopen (r, NULL, true); - if ( opts->cell_range ) + if (opts->cell_range) { - if ( ! convert_cell_ref (opts->cell_range, + if (! convert_cell_ref (opts->cell_range, &r->start_col, &r->start_row, &r->stop_col, &r->stop_row)) { @@ -659,14 +659,14 @@ gnumeric_make_reader (struct spreadsheet *spreadsheet, r->proto = NULL; /* Advance to the start of the cells for the target sheet */ - while ( (r->rsd.state != STATE_CELL || r->rsd.row < r->start_row ) + while ((r->rsd.state != STATE_CELL || r->rsd.row < r->start_row) && 1 == (ret = xmlTextReaderRead (r->rsd.xtr))) { xmlChar *value ; process_node (r, &r->rsd); value = xmlTextReaderValue (r->rsd.xtr); - if ( r->rsd.state == STATE_MAXROW && r->rsd.node_type == XML_READER_TYPE_TEXT) + if (r->rsd.state == STATE_MAXROW && r->rsd.node_type == XML_READER_TYPE_TEXT) { n_cases = 1 + _xmlchar_to_int (value) ; } @@ -675,12 +675,12 @@ gnumeric_make_reader (struct spreadsheet *spreadsheet, /* If a range has been given, then use that to calculate the number of cases */ - if ( opts->cell_range) + if (opts->cell_range) { n_cases = MIN (n_cases, r->stop_row - r->start_row + 1); } - if ( opts->read_names ) + if (opts->read_names) { r->start_row++; n_cases --; @@ -690,9 +690,9 @@ gnumeric_make_reader (struct spreadsheet *spreadsheet, /* Read in the first row of cells, including the headers if read_names was set */ while ( - (( r->rsd.state == STATE_CELLS_START && r->rsd.row <= r->start_row) || r->rsd.state == STATE_CELL ) + ((r->rsd.state == STATE_CELLS_START && r->rsd.row <= r->start_row) || r->rsd.state == STATE_CELL) && (ret = xmlTextReaderRead (r->rsd.xtr)) - ) + ) { int idx; @@ -708,7 +708,7 @@ gnumeric_make_reader (struct spreadsheet *spreadsheet, process_node (r, &r->rsd); - if ( r->rsd.row > r->start_row ) + if (r->rsd.row > r->start_row) { xmlChar *attr = xmlTextReaderGetAttribute (r->rsd.xtr, _xml ("ValueType")); @@ -719,13 +719,13 @@ gnumeric_make_reader (struct spreadsheet *spreadsheet, break; } - if ( r->rsd.col < r->start_col || + if (r->rsd.col < r->start_col || (r->stop_col != -1 && r->rsd.col > r->stop_col)) continue; idx = r->rsd.col - r->start_col; - if ( idx >= n_var_specs ) + if (idx >= n_var_specs) { int i; var_spec = xrealloc (var_spec, sizeof (*var_spec) * (idx + 1)); @@ -741,14 +741,14 @@ gnumeric_make_reader (struct spreadsheet *spreadsheet, var_spec [idx].first_type = type; - if ( r->rsd.node_type == XML_READER_TYPE_TEXT ) + if (r->rsd.node_type == XML_READER_TYPE_TEXT) { xmlChar *value = xmlTextReaderValue (r->rsd.xtr); const char *text = CHAR_CAST (const char *, value); - if ( r->rsd.row < r->start_row) + if (r->rsd.row < r->start_row) { - if ( opts->read_names ) + if (opts->read_names) { var_spec [idx].name = xstrdup (text); } @@ -757,22 +757,22 @@ gnumeric_make_reader (struct spreadsheet *spreadsheet, { var_spec [idx].first_value = xmlStrdup (value); - if (-1 == var_spec [idx].width ) + if (-1 == var_spec [idx].width) var_spec [idx].width = (opts->asw == -1) ? ROUND_UP (strlen(text), SPREADSHEET_DEFAULT_WIDTH) : opts->asw; } free (value); } - else if ( r->rsd.node_type == XML_READER_TYPE_ELEMENT + else if (r->rsd.node_type == XML_READER_TYPE_ELEMENT && r->rsd.state == STATE_CELL) { - if ( r->rsd.row == r->start_row ) + if (r->rsd.row == r->start_row) { xmlChar *attr = xmlTextReaderGetAttribute (r->rsd.xtr, _xml ("ValueType")); - if ( NULL == attr || VALUE_STRING != _xmlchar_to_int (attr)) + if (NULL == attr || VALUE_STRING != _xmlchar_to_int (attr)) var_spec [idx].width = 0; free (attr); @@ -782,22 +782,22 @@ gnumeric_make_reader (struct spreadsheet *spreadsheet, { const xmlChar *enc = xmlTextReaderConstEncoding (r->rsd.xtr); - if ( enc == NULL) + if (enc == NULL) goto error; /* Create the dictionary and populate it */ spreadsheet->dict = r->dict = dict_create (CHAR_CAST (const char *, enc)); } - for (i = 0 ; i < n_var_specs ; ++i ) + for (i = 0 ; i < n_var_specs ; ++i) { char *name; - if ( (var_spec[i].name == NULL) && (var_spec[i].first_value == NULL)) + if ((var_spec[i].name == NULL) && (var_spec[i].first_value == NULL)) continue; /* Probably no data exists for this variable, so allocate a default width */ - if ( var_spec[i].width == -1 ) + if (var_spec[i].width == -1) var_spec[i].width = SPREADSHEET_DEFAULT_WIDTH; name = dict_make_unique_var_name (r->dict, var_spec[i].name, &vstart); @@ -808,7 +808,7 @@ gnumeric_make_reader (struct spreadsheet *spreadsheet, /* Create the first case, and cache it */ r->used_first_case = false; - if ( n_var_specs == 0 ) + if (n_var_specs == 0) { msg (MW, _("Selected sheet or range of spreadsheet `%s' is empty."), spreadsheet->file_name); @@ -820,11 +820,11 @@ gnumeric_make_reader (struct spreadsheet *spreadsheet, case_set_missing (r->first_case); - for ( i = 0 ; i < n_var_specs ; ++i ) + for (i = 0 ; i < n_var_specs ; ++i) { const struct variable *var; - if ( (var_spec[i].name == NULL) && (var_spec[i].first_value == NULL)) + if ((var_spec[i].name == NULL) && (var_spec[i].first_value == NULL)) continue; var = dict_get_var (r->dict, x++); @@ -836,7 +836,7 @@ gnumeric_make_reader (struct spreadsheet *spreadsheet, r->rsd.row - 1); } - for ( i = 0 ; i < n_var_specs ; ++i ) + for (i = 0 ; i < n_var_specs ; ++i) { free (var_spec[i].first_value); free (var_spec[i].name); @@ -853,7 +853,7 @@ gnumeric_make_reader (struct spreadsheet *spreadsheet, error: - for ( i = 0 ; i < n_var_specs ; ++i ) + for (i = 0 ; i < n_var_specs ; ++i) { free (var_spec[i].first_value); free (var_spec[i].name); @@ -878,7 +878,7 @@ gnm_file_casereader_read (struct casereader *reader UNUSED, void *r_) struct gnumeric_reader *r = r_; int current_row = r->rsd.row; - if ( !r->used_first_case ) + if (!r->used_first_case) { r->used_first_case = true; return r->first_case; @@ -891,7 +891,7 @@ gnm_file_casereader_read (struct casereader *reader UNUSED, void *r_) r->start_col = r->rsd.min_col; - while ((r->rsd.state == STATE_CELL || r->rsd.state == STATE_CELLS_START ) + while ((r->rsd.state == STATE_CELL || r->rsd.state == STATE_CELLS_START) && r->rsd.row == current_row && (ret = xmlTextReaderRead (r->rsd.xtr))) { process_node (r, &r->rsd); @@ -906,18 +906,18 @@ gnm_file_casereader_read (struct casereader *reader UNUSED, void *r_) xmlFree (attr); } - if ( r->rsd.col < r->start_col || (r->stop_col != -1 && + if (r->rsd.col < r->start_col || (r->stop_col != -1 && r->rsd.col > r->stop_col)) continue; - if ( r->rsd.col - r->start_col >= caseproto_get_n_widths (r->proto)) + if (r->rsd.col - r->start_col >= caseproto_get_n_widths (r->proto)) continue; - if ( r->stop_row != -1 && r->rsd.row > r->stop_row) + if (r->stop_row != -1 && r->rsd.row > r->stop_row) break; - if ( r->rsd.node_type == XML_READER_TYPE_TEXT ) + if (r->rsd.node_type == XML_READER_TYPE_TEXT) { xmlChar *value = xmlTextReaderValue (r->rsd.xtr); const int idx = r->rsd.col - r->start_col; diff --git a/src/data/identifier.h b/src/data/identifier.h index 7f2f904239..b7affdb192 100644 --- a/src/data/identifier.h +++ b/src/data/identifier.h @@ -35,8 +35,8 @@ TOKEN_TYPE(ASTERISK) /* * */ \ TOKEN_TYPE(SLASH) /* / */ \ TOKEN_TYPE(EQUALS) /* = */ \ - TOKEN_TYPE(LPAREN) /* ( */ \ - TOKEN_TYPE(RPAREN) /* ) */ \ + TOKEN_TYPE(LPAREN) /* (*/ \ + TOKEN_TYPE(RPAREN) /*) */ \ TOKEN_TYPE(LBRACK) /* [ */ \ TOKEN_TYPE(RBRACK) /* ] */ \ TOKEN_TYPE(COMMA) /* , */ \ diff --git a/src/data/ods-reader.c b/src/data/ods-reader.c index 7d91135b99..8f307200b0 100644 --- a/src/data/ods-reader.c +++ b/src/data/ods-reader.c @@ -173,7 +173,7 @@ reading_target_sheet (const struct ods_reader *r, const struct state_data *msd) { if (r->target_sheet_name != NULL) { - if ( 0 == xmlStrcmp (r->target_sheet_name, msd->current_sheet_name)) + if (0 == xmlStrcmp (r->target_sheet_name, msd->current_sheet_name)) return true; } @@ -198,10 +198,10 @@ ods_get_sheet_name (struct spreadsheet *s, int n) while ( (r->n_allocated_sheets <= n) || or->state != STATE_SPREADSHEET - ) + ) { int ret = xmlTextReaderRead (or->xtr); - if ( ret != 1) + if (ret != 1) break; process_node (r, or); @@ -222,10 +222,10 @@ ods_get_sheet_range (struct spreadsheet *s, int n) (r->n_allocated_sheets <= n) || (r->sheets[n].stop_row == -1) || or->state != STATE_SPREADSHEET - ) + ) { int ret = xmlTextReaderRead (or->xtr); - if ( ret != 1) + if (ret != 1) break; process_node (r, or); @@ -243,17 +243,17 @@ static void ods_file_casereader_destroy (struct casereader *reader UNUSED, void *r_) { struct ods_reader *r = r_; - if ( r == NULL) + if (r == NULL) return ; state_data_destroy (&r->rsd); - if ( ! ds_is_empty (&r->ods_errs)) + if (! ds_is_empty (&r->ods_errs)) msg (ME, "%s", ds_cstr (&r->ods_errs)); ds_destroy (&r->ods_errs); - if ( r->first_case && ! r->used_first_case ) + if (r->first_case && ! r->used_first_case) case_unref (r->first_case); @@ -349,7 +349,7 @@ process_node (struct ods_reader *or, struct state_data *r) } break; case STATE_ROW: - if ( (0 == xmlStrcasecmp (name, _xml ("table:table-cell"))) + if ((0 == xmlStrcasecmp (name, _xml ("table:table-cell"))) && (XML_READER_TYPE_ELEMENT == r->node_type)) { @@ -365,7 +365,7 @@ process_node (struct ods_reader *or, struct state_data *r) xmlFree (value); } - else if ( (0 == xmlStrcasecmp (name, _xml ("table:table-row"))) + else if ((0 == xmlStrcasecmp (name, _xml ("table:table-row"))) && (XML_READER_TYPE_END_ELEMENT == r->node_type)) { @@ -373,18 +373,18 @@ process_node (struct ods_reader *or, struct state_data *r) } break; case STATE_CELL: - if ( (0 == xmlStrcasecmp (name, _xml("text:p"))) + if ((0 == xmlStrcasecmp (name, _xml("text:p"))) && - ( XML_READER_TYPE_ELEMENT == r->node_type)) + (XML_READER_TYPE_ELEMENT == r->node_type)) { if (! xmlTextReaderIsEmptyElement (r->xtr)) r->state = STATE_CELL_CONTENT; } else if - ( (0 == xmlStrcasecmp (name, _xml("table:table-cell"))) + ((0 == xmlStrcasecmp (name, _xml("table:table-cell"))) && (XML_READER_TYPE_END_ELEMENT == r->node_type) - ) + ) { r->state = STATE_ROW; } @@ -400,12 +400,12 @@ process_node (struct ods_reader *or, struct state_data *r) (or->sheets[r->current_sheet].start_col == -1) || (or->sheets[r->current_sheet].start_col >= r->col - 1) - ) + ) or->sheets[r->current_sheet].start_col = r->col - 1; or->sheets[r->current_sheet].stop_row = r->row - 1; - if ( or->sheets[r->current_sheet].stop_col < r->col - 1) + if (or->sheets[r->current_sheet].stop_col < r->col - 1) or->sheets[r->current_sheet].stop_col = r->col - 1; if (XML_READER_TYPE_END_ELEMENT == r->node_type) @@ -447,13 +447,13 @@ xmv_to_width (const struct xml_value *xmv, int fallback) if (xmv->type != NULL && 0 != xmlStrcmp (xmv->type, _xml("string"))) return 0; - if ( fallback != -1) + if (fallback != -1) return fallback; - if ( xmv->value ) + if (xmv->value) width = ROUND_UP (xmlStrlen (xmv->value), SPREADSHEET_DEFAULT_WIDTH); - else if ( xmv->text) + else if (xmv->text) width = ROUND_UP (xmlStrlen (xmv->text), SPREADSHEET_DEFAULT_WIDTH); @@ -471,7 +471,7 @@ convert_xml_to_value (struct ccase *c, const struct variable *var, if (xmv->value == NULL && xmv->text == NULL) value_set_missing (v, var_get_width (var)); - else if ( var_is_alpha (var)) + else if (var_is_alpha (var)) /* Use the text field, because it seems that there is no value field for strings */ value_copy_str_rpad (v, var_get_width (var), xmv->text, ' '); @@ -480,9 +480,9 @@ convert_xml_to_value (struct ccase *c, const struct variable *var, const struct fmt_spec *fmt = var_get_write_format (var); enum fmt_category fc = fmt_get_category (fmt->type); - assert ( fc != FMT_CAT_STRING); + assert (fc != FMT_CAT_STRING); - if ( 0 == xmlStrcmp (xmv->type, _xml("float"))) + if (0 == xmlStrcmp (xmv->type, _xml("float"))) { v->f = c_strtod (CHAR_CAST (const char *, xmv->value), NULL); } @@ -526,7 +526,7 @@ get_sheet_count (struct zip_reader *zreader) struct zip_member *meta = NULL; meta = zip_member_open (zreader, "meta.xml"); - if ( meta == NULL) + if (meta == NULL) return -1; mxtr = xmlReaderForIO (xml_reader_for_zip_member, NULL, meta, NULL, NULL, 0); @@ -534,11 +534,11 @@ get_sheet_count (struct zip_reader *zreader) while (1 == xmlTextReaderRead (mxtr)) { xmlChar *name = xmlTextReaderName (mxtr); - if ( 0 == xmlStrcmp (name, _xml("meta:document-statistic"))) + if (0 == xmlStrcmp (name, _xml("meta:document-statistic"))) { xmlChar *attr = xmlTextReaderGetAttribute (mxtr, _xml ("meta:table-count")); - if ( attr != NULL) + if (attr != NULL) { int s = _xmlchar_to_int (attr); xmlFreeTextReader (mxtr); @@ -579,13 +579,13 @@ init_reader (struct ods_reader *r, bool report_errors, struct zip_member *content = zip_member_open (r->zreader, "content.xml"); xmlTextReaderPtr xtr; - if ( content == NULL) + if (content == NULL) return NULL; xtr = xmlReaderForIO (xml_reader_for_zip_member, NULL, content, NULL, NULL, - report_errors ? 0 : (XML_PARSE_NOERROR | XML_PARSE_NOWARNING) ); + report_errors ? 0 : (XML_PARSE_NOERROR | XML_PARSE_NOWARNING)); - if ( xtr == NULL) + if (xtr == NULL) return false; *state = (struct state_data) { .xtr = xtr, @@ -675,7 +675,7 @@ ods_make_reader (struct spreadsheet *spreadsheet, if (opts->cell_range) { - if ( ! convert_cell_ref (opts->cell_range, + if (! convert_cell_ref (opts->cell_range, &r->start_col, &r->start_row, &r->stop_col, &r->stop_row)) { @@ -696,8 +696,8 @@ ods_make_reader (struct spreadsheet *spreadsheet, r->target_sheet_index = opts->sheet_index; /* Advance to the start of the cells for the target sheet */ - while ( ! reading_target_sheet (r, &r->rsd) - || r->rsd.state != STATE_ROW || r->rsd.row <= r->start_row ) + while (! reading_target_sheet (r, &r->rsd) + || r->rsd.state != STATE_ROW || r->rsd.row <= r->start_row) { if (1 != (ret = xmlTextReaderRead (r->rsd.xtr))) break; @@ -712,7 +712,7 @@ ods_make_reader (struct spreadsheet *spreadsheet, goto error; } - if ( opts->read_names) + if (opts->read_names) { while (1 == xmlTextReaderRead (r->rsd.xtr)) { @@ -765,7 +765,7 @@ ods_make_reader (struct spreadsheet *spreadsheet, int idx; process_node (r, &r->rsd); - if ( ! reading_target_sheet (r, &r->rsd) ) + if (! reading_target_sheet (r, &r->rsd)) break; /* If the row is finished then stop for now */ @@ -780,14 +780,14 @@ ods_make_reader (struct spreadsheet *spreadsheet, if (r->stop_col != -1 && idx > r->stop_col - r->start_col) continue; - if ( r->rsd.state == STATE_CELL && + if (r->rsd.state == STATE_CELL && XML_READER_TYPE_ELEMENT == r->rsd.node_type) { type = xmlTextReaderGetAttribute (r->rsd.xtr, _xml ("office:value-type")); val_string = xmlTextReaderGetAttribute (r->rsd.xtr, _xml ("office:value")); } - if ( r->rsd.state == STATE_CELL_CONTENT && + if (r->rsd.state == STATE_CELL_CONTENT && XML_READER_TYPE_TEXT == r->rsd.node_type) { if (idx >= n_var_specs) @@ -815,7 +815,7 @@ ods_make_reader (struct spreadsheet *spreadsheet, r->spreadsheet.dict = r->dict = dict_create ( CHAR_CAST (const char *, xmlTextReaderConstEncoding (r->rsd.xtr))); - for (i = 0; i < n_var_specs ; ++i ) + for (i = 0; i < n_var_specs ; ++i) { struct fmt_spec fmt; struct variable *var = NULL; @@ -826,7 +826,7 @@ ods_make_reader (struct spreadsheet *spreadsheet, var = dict_get_var (r->dict, i); - if ( 0 == xmlStrcmp (var_spec[i].firstval.type, _xml("date"))) + if (0 == xmlStrcmp (var_spec[i].firstval.type, _xml("date"))) { fmt.type = FMT_DATE; fmt.d = 0; @@ -838,7 +838,7 @@ ods_make_reader (struct spreadsheet *spreadsheet, var_set_both_formats (var, &fmt); } - if ( n_var_specs == 0 ) + if (n_var_specs == 0) { msg (MW, _("Selected sheet or range of spreadsheet `%s' is empty."), spreadsheet->file_name); @@ -869,7 +869,7 @@ ods_make_reader (struct spreadsheet *spreadsheet, } - for ( i = 0 ; i < n_var_specs ; ++i ) + for (i = 0 ; i < n_var_specs ; ++i) { free (var_spec[i].firstval.type); free (var_spec[i].firstval.value); @@ -888,7 +888,7 @@ ods_make_reader (struct spreadsheet *spreadsheet, error: - for ( i = 0 ; i < n_var_specs ; ++i ) + for (i = 0 ; i < n_var_specs ; ++i) { free (var_spec[i].firstval.type); free (var_spec[i].firstval.value); @@ -925,16 +925,16 @@ ods_file_casereader_read (struct casereader *reader UNUSED, void *r_) /* Advance to the start of a row. (If there is one) */ while (r->rsd.state != STATE_ROW && 1 == xmlTextReaderRead (r->rsd.xtr) - ) + ) { process_node (r, &r->rsd); } - if ( ! reading_target_sheet (r, &r->rsd) + if (! reading_target_sheet (r, &r->rsd) || r->rsd.state < STATE_TABLE || (r->stop_row != -1 && r->rsd.row > r->stop_row + 1) - ) +) { return NULL; } @@ -946,7 +946,7 @@ ods_file_casereader_read (struct casereader *reader UNUSED, void *r_) { process_node (r, &r->rsd); - if ( r->stop_row != -1 && r->rsd.row > r->stop_row + 1) + if (r->stop_row != -1 && r->rsd.row > r->stop_row + 1) break; if (r->rsd.state == STATE_CELL && @@ -973,7 +973,7 @@ ods_file_casereader_read (struct casereader *reader UNUSED, void *r_) const int idx = r->rsd.col - col - r->start_col - 1; if (idx < 0) continue; - if (r->stop_col != -1 && idx > r->stop_col - r->start_col ) + if (r->stop_col != -1 && idx > r->stop_col - r->start_col) break; if (idx >= dict_get_var_cnt (r->dict)) break; @@ -987,7 +987,7 @@ ods_file_casereader_read (struct casereader *reader UNUSED, void *r_) xmlFree (xmv->type); free (xmv); } - if ( r->rsd.state <= STATE_TABLE) + if (r->rsd.state <= STATE_TABLE) break; } diff --git a/src/data/por-file-writer.c b/src/data/por-file-writer.c index 5795b817dc..672add4101 100644 --- a/src/data/por-file-writer.c +++ b/src/data/por-file-writer.c @@ -812,7 +812,7 @@ format_trig_double (long double value, int base_10_precision, char output[]) value -= chunk; /* Append the chunk, in base 30, to trigs[]. */ - for (trigs_left = CHUNK_SIZE; chunk > 0 && trigs_left > 0; ) + for (trigs_left = CHUNK_SIZE; chunk > 0 && trigs_left > 0;) { trigs[trig_cnt + --trigs_left] = chunk % 30; chunk /= 30; diff --git a/src/data/psql-reader.c b/src/data/psql-reader.c index c6f03250dd..a6062a0941 100644 --- a/src/data/psql-reader.c +++ b/src/data/psql-reader.c @@ -128,7 +128,7 @@ data_to_native (const void *in_, void *out_, int len) int i; const unsigned char *in = in_; unsigned char *out = out_; - for (i = 0 ; i < len ; ++i ) + for (i = 0 ; i < len ; ++i) out[i] = in[i]; } #else @@ -138,7 +138,7 @@ data_to_native (const void *in_, void *out_, int len) int i; const unsigned char *in = in_; unsigned char *out = out_; - for (i = 0 ; i < len ; ++i ) + for (i = 0 ; i < len ; ++i) out[len - i - 1] = in[i]; } #endif @@ -166,7 +166,7 @@ dump (const unsigned char *x, int l) for (i = 0; i < l ; ++i) { - if ( isprint (x[i])) + if (isprint (x[i])) printf ("%c ", x[i]); else printf (" "); @@ -190,7 +190,7 @@ create_var (struct psql_reader *r, const struct fmt_spec *fmt, var_set_both_formats (var, fmt); - if ( col != -1) + if (col != -1) { r->vmap = xrealloc (r->vmap, (col + 1) * sizeof (*r->vmap)); @@ -237,13 +237,13 @@ psql_open_reader (struct psql_read_info *info, struct dictionary **dict) struct string query ; r->conn = PQconnectdb (info->conninfo); - if ( NULL == r->conn) + if (NULL == r->conn) { msg (ME, _("Memory error whilst opening psql source")); goto error; } - if ( PQstatus (r->conn) != CONNECTION_OK ) + if (PQstatus (r->conn) != CONNECTION_OK) { msg (ME, _("Error opening psql source: %s."), PQerrorMessage (r->conn)); @@ -257,7 +257,7 @@ psql_open_reader (struct psql_read_info *info, struct dictionary **dict) sscanf (vers, "%d", &ver_num); - if ( ver_num < 8) + if (ver_num < 8) { msg (ME, _("Postgres server is version %s." @@ -271,11 +271,11 @@ psql_open_reader (struct psql_read_info *info, struct dictionary **dict) { const char *dt = PQparameterStatus (r->conn, "integer_datetimes"); - r->integer_datetimes = ( 0 == c_strcasecmp (dt, "on")); + r->integer_datetimes = (0 == c_strcasecmp (dt, "on")); } #if USE_SSL - if ( PQgetssl (r->conn) == NULL) + if (PQgetssl (r->conn) == NULL) #endif { if (! info->allow_clear) @@ -319,7 +319,7 @@ psql_open_reader (struct psql_read_info *info, struct dictionary **dict) qres = PQexec (r->conn, ds_cstr (&query)); ds_destroy (&query); - if ( PQresultStatus (qres) != PGRES_COMMAND_OK ) + if (PQresultStatus (qres) != PGRES_COMMAND_OK) { msg (ME, _("Error from psql source: %s."), PQresultErrorMessage (qres)); @@ -344,7 +344,7 @@ psql_open_reader (struct psql_read_info *info, struct dictionary **dict) qres = PQexec (r->conn, ds_cstr (&query)); ds_destroy (&query); - if ( PQresultStatus (qres) != PGRES_TUPLES_OK ) + if (PQresultStatus (qres) != PGRES_TUPLES_OK) { msg (ME, _("Error from psql source: %s."), PQresultErrorMessage (qres)); @@ -354,7 +354,7 @@ psql_open_reader (struct psql_read_info *info, struct dictionary **dict) PQclear (qres); qres = PQexec (r->conn, "FETCH FIRST FROM pspp"); - if ( PQresultStatus (qres) != PGRES_TUPLES_OK ) + if (PQresultStatus (qres) != PGRES_TUPLES_OK) { msg (ME, _("Error from psql source: %s."), PQresultErrorMessage (qres)); @@ -368,7 +368,7 @@ psql_open_reader (struct psql_read_info *info, struct dictionary **dict) r->vmap = NULL; r->vmapsize = 0; - for (i = 0 ; i < n_fields ; ++i ) + for (i = 0 ; i < n_fields ; ++i) { struct variable *var; struct fmt_spec fmt = {FMT_F, 8, 2}; @@ -378,7 +378,7 @@ psql_open_reader (struct psql_read_info *info, struct dictionary **dict) /* If there are no data then make a finger in the air guess at the contents */ - if ( n_tuples > 0 ) + if (n_tuples > 0) length = PQgetlength (qres, 0, i); else length = PSQL_DEFAULT_WIDTH; @@ -459,12 +459,12 @@ psql_open_reader (struct psql_read_info *info, struct dictionary **dict) break; } - if ( width == 0 && fmt_is_string (fmt.type)) + if (width == 0 && fmt_is_string (fmt.type)) fmt.w = width = PSQL_DEFAULT_WIDTH; var = create_var (r, &fmt, width, PQfname (qres, i), i); - if ( type == NUMERICOID && n_tuples > 0) + if (type == NUMERICOID && n_tuples > 0) { const uint8_t *vptr = (const uint8_t *) PQgetvalue (qres, 0, i); struct fmt_spec fmt; @@ -522,7 +522,7 @@ psql_open_reader (struct psql_read_info *info, struct dictionary **dict) PQclear (qres); qres = PQexec (r->conn, "MOVE BACKWARD 1 FROM pspp"); - if ( PQresultStatus (qres) != PGRES_COMMAND_OK) + if (PQresultStatus (qres) != PGRES_COMMAND_OK) { PQclear (qres); goto error; @@ -574,9 +574,9 @@ psql_casereader_read (struct casereader *reader UNUSED, void *r_) { struct psql_reader *r = r_; - if ( NULL == r->res || r->tuple >= r->cache_size) + if (NULL == r->res || r->tuple >= r->cache_size) { - if ( ! reload_cache (r) ) + if (! reload_cache (r)) return false; } @@ -594,14 +594,14 @@ set_value (struct psql_reader *r) n_vars = PQnfields (r->res); - if ( r->tuple >= PQntuples (r->res)) + if (r->tuple >= PQntuples (r->res)) return NULL; c = case_create (r->proto); case_set_missing (c); - for (i = 0 ; i < n_vars ; ++i ) + for (i = 0 ; i < n_vars ; ++i) { Oid type = PQftype (r->res, i); const struct variable *v = r->vmap[i]; @@ -728,7 +728,7 @@ set_value (struct psql_reader *r) case INTERVALOID: { - if ( r->integer_datetimes ) + if (r->integer_datetimes) { uint32_t months; uint32_t days; @@ -774,7 +774,7 @@ set_value (struct psql_reader *r) case TIMEOID: { - if ( r->integer_datetimes) + if (r->integer_datetimes) { uint64_t x; GET_VALUE (&vptr, x); @@ -792,7 +792,7 @@ set_value (struct psql_reader *r) case TIMETZOID: { int32_t zone; - if ( r->integer_datetimes) + if (r->integer_datetimes) { uint64_t x; @@ -816,7 +816,7 @@ set_value (struct psql_reader *r) case TIMESTAMPOID: case TIMESTAMPTZOID: { - if ( r->integer_datetimes) + if (r->integer_datetimes) { int64_t x; @@ -824,7 +824,7 @@ set_value (struct psql_reader *r) x /= 1000000; - val->f = (x + r->postgres_epoch * 24 * 3600 ); + val->f = (x + r->postgres_epoch * 24 * 3600); } else { @@ -832,7 +832,7 @@ set_value (struct psql_reader *r) GET_VALUE (&vptr, x); - val->f = (x + r->postgres_epoch * 24 * 3600 ); + val->f = (x + r->postgres_epoch * 24 * 3600); } } break; @@ -873,10 +873,10 @@ set_value (struct psql_reader *r) f += x * pow (10000, weight--); } - if ( sign == 0x4000) + if (sign == 0x4000) f *= -1.0; - if ( sign == 0xC000) + if (sign == 0xC000) val->f = SYSMIS; else val->f = f; diff --git a/src/data/settings.c b/src/data/settings.c index f4efb99fa8..db9c3a1632 100644 --- a/src/data/settings.c +++ b/src/data/settings.c @@ -190,7 +190,7 @@ settings_get_input_float_format (void) /* Sets the floating-point format used for RB and RBHEX input to FORMAT. */ void -settings_set_input_float_format ( enum float_format format) +settings_set_input_float_format (enum float_format format) { the_settings.input_float_format = format; } @@ -205,7 +205,7 @@ settings_get_input_integer_format (void) /* Sets the integer format used for IB and PIB input to FORMAT. */ void -settings_set_input_integer_format ( enum integer_format format) +settings_set_input_integer_format (enum integer_format format) { the_settings.input_integer_format = format; } @@ -234,7 +234,7 @@ settings_get_output_float_format (void) /* Sets the output float format to FLOAT_FORMAT. */ void -settings_set_output_float_format ( enum float_format float_format) +settings_set_output_float_format (enum float_format float_format) { the_settings.output_float_format = float_format; } @@ -248,7 +248,7 @@ settings_get_viewlength (void) /* Sets the view length. */ void -settings_set_viewlength ( int viewlength_) +settings_set_viewlength (int viewlength_) { the_settings.viewlength = viewlength_; } @@ -262,7 +262,7 @@ settings_get_viewwidth(void) /* Sets the screen width. */ void -settings_set_viewwidth ( int viewwidth_) +settings_set_viewwidth (int viewwidth_) { the_settings.viewwidth = viewwidth_; } @@ -290,7 +290,7 @@ settings_get_include (void) /* Set include file echo. */ void -settings_set_include ( bool include) +settings_set_include (bool include) { the_settings.include = include; } @@ -306,7 +306,7 @@ settings_get_epoch (void) /* Sets the year that starts the epoch. */ void -settings_set_epoch ( int epoch) +settings_set_epoch (int epoch) { if (epoch < 0) { @@ -328,7 +328,7 @@ settings_get_scompression (void) /* Set system file default compression. */ void -settings_set_scompression ( bool scompress) +settings_set_scompression (bool scompress) { the_settings.scompress = scompress; } @@ -342,7 +342,7 @@ settings_get_undefined (void) /* Set whether to warn on undefined values. */ void -settings_set_undefined ( bool undefined) +settings_set_undefined (bool undefined) { the_settings.undefined = undefined; } @@ -357,7 +357,7 @@ settings_get_blanks (void) /* Set the value that blank numeric fields are set to when read in. */ void -settings_set_blanks ( double blanks) +settings_set_blanks (double blanks) { the_settings.blanks = blanks; } @@ -385,13 +385,13 @@ settings_set_max_messages (enum msg_severity severity, int max) if (severity == MSG_S_WARNING) { - if ( max == 0) + if (max == 0) { msg (MW, _("MXWARNS set to zero. No further warnings will be given even when potentially problematic situations are encountered.")); msg_ui_disable_warnings (true); } - else if ( the_settings.max_messages [MSG_S_WARNING] == 0) + else if (the_settings.max_messages [MSG_S_WARNING] == 0) { msg_ui_disable_warnings (false); the_settings.max_messages[MSG_S_WARNING] = max; @@ -413,7 +413,7 @@ settings_get_mprint (void) /* Sets whether the commands generated by macro invocations are displayed. */ void -settings_set_mprint ( bool mprint) +settings_set_mprint (bool mprint) { the_settings.mprint = mprint; } @@ -427,7 +427,7 @@ settings_get_mxloops (void) /* Set implied limit of unbounded loop. */ void -settings_set_mxloops ( int mxloops) +settings_set_mxloops (int mxloops) { the_settings.mxloops = mxloops; } @@ -469,7 +469,7 @@ settings_get_format (void) /* Set default format for variables created by transformations and by DATA LIST {FREE,LIST}. */ void -settings_set_format ( const struct fmt_spec *default_format) +settings_set_format (const struct fmt_spec *default_format) { the_settings.default_format = *default_format; } @@ -484,7 +484,7 @@ settings_get_testing_mode (void) /* Set testing mode. */ void -settings_set_testing_mode ( bool testing_mode) +settings_set_testing_mode (bool testing_mode) { the_settings.testing_mode = testing_mode; } @@ -517,7 +517,7 @@ settings_set_algorithm (enum behavior_mode mode) /* Set the algorithm option for this command only */ void -settings_set_cmd_algorithm ( enum behavior_mode mode) +settings_set_cmd_algorithm (enum behavior_mode mode) { the_settings.cmd_algorithm = mode; } @@ -538,7 +538,7 @@ settings_get_syntax (void) /* Set the syntax option */ void -settings_set_syntax ( enum behavior_mode mode) +settings_set_syntax (enum behavior_mode mode) { the_settings.syntax = mode; } @@ -674,7 +674,7 @@ settings_dollar_template (const struct fmt_spec *fmt) fns = fmt_settings_get_style (the_settings.styles, fmt->type); ds_put_byte (&str, '$'); - for (c = MAX (fmt->w - fmt->d - 1, 0); c > 0; ) + for (c = MAX (fmt->w - fmt->d - 1, 0); c > 0;) { ds_put_byte (&str, '#'); if (--c % 4 == 0 && c > 0) diff --git a/src/data/settings.h b/src/data/settings.h index cc16576d31..8ab7357d0a 100644 --- a/src/data/settings.h +++ b/src/data/settings.h @@ -36,14 +36,14 @@ void settings_set (const struct settings *); void settings_destroy (struct settings *); enum float_format settings_get_input_float_format (void); -void settings_set_input_float_format ( enum float_format); +void settings_set_input_float_format (enum float_format); /* Returns the integer format used for IB and PIB input. */ enum integer_format settings_get_input_integer_format (void); /* Sets the integer format used for IB and PIB input to FORMAT. */ -void settings_set_input_integer_format ( enum integer_format); +void settings_set_input_integer_format (enum integer_format); /* Returns the current output integer format. */ @@ -61,19 +61,19 @@ void settings_set_output_float_format (enum float_format float_format); int settings_get_viewlength (void); -void settings_set_viewlength ( int); +void settings_set_viewlength (int); int settings_get_viewwidth (void); -void settings_set_viewwidth ( int); +void settings_set_viewwidth (int); bool settings_get_safer_mode (void); void settings_set_safer_mode (void); bool settings_get_include (void); -void settings_set_include ( bool); +void settings_set_include (bool); int settings_get_epoch (void); -void settings_set_epoch ( int); +void settings_set_epoch (int); bool settings_get_scompression (void); void settings_set_scompression (bool); @@ -90,14 +90,14 @@ bool settings_get_mprint (void); void settings_set_mprint (bool); int settings_get_mxloops (void); -void settings_set_mxloops ( int); +void settings_set_mxloops (int); size_t settings_get_workspace (void); size_t settings_get_workspace_cases (const struct caseproto *); void settings_set_workspace (size_t); const struct fmt_spec *settings_get_format (void); -void settings_set_format ( const struct fmt_spec *); +void settings_set_format (const struct fmt_spec *); bool settings_get_testing_mode (void); void settings_set_testing_mode (bool); diff --git a/src/data/spreadsheet-reader.c b/src/data/spreadsheet-reader.c index 08a37157e4..9cd118c758 100644 --- a/src/data/spreadsheet-reader.c +++ b/src/data/spreadsheet-reader.c @@ -58,10 +58,10 @@ struct casereader * spreadsheet_make_reader (struct spreadsheet *s, const struct spreadsheet_read_options *opts) { - if ( s->type == SPREADSHEET_ODS) + if (s->type == SPREADSHEET_ODS) return ods_make_reader (s, opts); - if ( s->type == SPREADSHEET_GNUMERIC) + if (s->type == SPREADSHEET_GNUMERIC) return gnumeric_make_reader (s, opts); return NULL; @@ -70,10 +70,10 @@ spreadsheet_make_reader (struct spreadsheet *s, const char * spreadsheet_get_sheet_name (struct spreadsheet *s, int n) { - if ( s->type == SPREADSHEET_ODS) + if (s->type == SPREADSHEET_ODS) return ods_get_sheet_name (s, n); - if ( s->type == SPREADSHEET_GNUMERIC) + if (s->type == SPREADSHEET_GNUMERIC) return gnumeric_get_sheet_name (s, n); return NULL; @@ -83,10 +83,10 @@ spreadsheet_get_sheet_name (struct spreadsheet *s, int n) char * spreadsheet_get_sheet_range (struct spreadsheet *s, int n) { - if ( s->type == SPREADSHEET_ODS) + if (s->type == SPREADSHEET_ODS) return ods_get_sheet_range (s, n); - if ( s->type == SPREADSHEET_GNUMERIC) + if (s->type == SPREADSHEET_GNUMERIC) return gnumeric_get_sheet_range (s, n); return NULL; @@ -185,8 +185,8 @@ create_cell_ref (int col0, int row0) char *cs0 ; char *s ; - if ( col0 < 0) return NULL; - if ( row0 < 0) return NULL; + if (col0 < 0) return NULL; + if (row0 < 0) return NULL; cs0 = int_to_ps26 (col0); s = c_xasprintf ("%s%d", cs0, row0 + 1); @@ -229,7 +229,7 @@ convert_cell_ref (const char *ref, int n = sscanf (ref, "%4[a-zA-Z]%d:%4[a-zA-Z]%d", startcol, &startrow, stopcol, &stoprow); - if ( n != 4) + if (n != 4) return false; str_uppercase (startcol); diff --git a/src/data/sys-file-reader.c b/src/data/sys-file-reader.c index e0b43b9205..155b91373c 100644 --- a/src/data/sys-file-reader.c +++ b/src/data/sys-file-reader.c @@ -1035,7 +1035,7 @@ read_header (struct sfm_reader *r, struct any_read_info *info, if (!read_int (r, &r->case_cnt)) return false; - if ( r->case_cnt > INT_MAX / 2) + if (r->case_cnt > INT_MAX / 2) r->case_cnt = -1; /* Identify floating-point format and obtain compression bias. */ @@ -1424,7 +1424,7 @@ parse_variable_records (struct sfm_reader *r, struct dictionary *dict, struct sfm_var_record *rec; int n_warnings = 0; - for (rec = var_recs; rec < &var_recs[n_var_recs]; ) + for (rec = var_recs; rec < &var_recs[n_var_recs];) { struct variable *var; size_t n_values; diff --git a/src/data/sys-file-writer.c b/src/data/sys-file-writer.c index eb9f8e93b6..7a0fb5a691 100644 --- a/src/data/sys-file-writer.c +++ b/src/data/sys-file-writer.c @@ -411,7 +411,7 @@ write_header (struct sfm_writer *w, const struct dictionary *d) if (time (&t) == (time_t) -1) { creation_date = xstrdup ("01 Jan 70"); - creation_time = xstrdup ( "00:00:00"); + creation_time = xstrdup ("00:00:00"); } else { diff --git a/src/data/transformations.c b/src/data/transformations.c index 209d13f82b..c0fc35c2c8 100644 --- a/src/data/transformations.c +++ b/src/data/transformations.c @@ -191,7 +191,7 @@ trns_chain_execute (const struct trns_chain *chain, enum trns_result start, size_t i; assert (chain->finalized); - for (i = start < 0 ? 0 : start; i < chain->trns_cnt; ) + for (i = start < 0 ? 0 : start; i < chain->trns_cnt;) { struct transformation *trns = &chain->trns[i]; int retval = trns->execute (trns->aux, c, case_nr); diff --git a/src/language/command.c b/src/language/command.c index cfe4ecf14b..2fa05ad742 100644 --- a/src/language/command.c +++ b/src/language/command.c @@ -442,7 +442,7 @@ report_state_mismatch (const struct command *command, enum cmd_state state) } else if (state == CMD_STATE_INPUT_PROGRAM) msg (SE, _("%s is not allowed inside %s."), - command->name, "INPUT PROGRAM" ); + command->name, "INPUT PROGRAM"); else if (state == CMD_STATE_FILE_TYPE) msg (SE, _("%s is not allowed inside %s."), command->name, "FILE TYPE"); diff --git a/src/language/data-io/combine-files.c b/src/language/data-io/combine-files.c index 4e6ae4f884..c63901d3dc 100644 --- a/src/language/data-io/combine-files.c +++ b/src/language/data-io/combine-files.c @@ -517,7 +517,7 @@ merge_dictionary (struct dictionary *const m, struct comb_file *f) The correct thing to do would be to convert to an encoding which can cope with all the input files (eg UTF-8). */ - if ( 0 != strcmp (dict_get_encoding (f->dict), dict_get_encoding (m))) + if (0 != strcmp (dict_get_encoding (f->dict), dict_get_encoding (m))) msg (MW, _("Combining files with incompatible encodings. String data may " "not be represented correctly.")); @@ -717,7 +717,7 @@ execute_match_files (struct comb_proc *proc) size_t i; output = create_output_case (proc); - for (i = proc->n_files; i-- > 0; ) + for (i = proc->n_files; i-- > 0;) { struct comb_file *file = &proc->files[i]; if (file->type == COMB_FILE) diff --git a/src/language/data-io/data-reader.c b/src/language/data-io/data-reader.c index 1e06d28773..ab3e065789 100644 --- a/src/language/data-io/data-reader.c +++ b/src/language/data-io/data-reader.c @@ -554,7 +554,7 @@ dfm_eof (struct dfm_reader *r) { r->flags &= ~DFM_ADVANCE; - if (r->eof_cnt == 0 && read_record (r) ) + if (r->eof_cnt == 0 && read_record (r)) { r->pos = 0; return 0; diff --git a/src/language/data-io/get-data.c b/src/language/data-io/get-data.c index a4514135c8..66dd19f239 100644 --- a/src/language/data-io/get-data.c +++ b/src/language/data-io/get-data.c @@ -98,9 +98,9 @@ cmd_get_data (struct lexer *lexer, struct dataset *ds) goto error; struct spreadsheet *spreadsheet = NULL; - if ( 0 == strncasecmp (tok, "GNM", 3)) + if (0 == strncasecmp (tok, "GNM", 3)) spreadsheet = gnumeric_probe (filename, true); - else if ( 0 == strncasecmp (tok, "ODS", 3)) + else if (0 == strncasecmp (tok, "ODS", 3)) spreadsheet = ods_probe (filename, true); if (spreadsheet == NULL) @@ -159,9 +159,9 @@ parse_get_psql (struct lexer *lexer, struct dataset *ds) lex_get (lexer); - while (lex_match (lexer, T_SLASH) ) + while (lex_match (lexer, T_SLASH)) { - if ( lex_match_id (lexer, "ASSUMEDSTRWIDTH")) + if (lex_match_id (lexer, "ASSUMEDSTRWIDTH")) { lex_match (lexer, T_EQUALS); if (lex_force_int (lexer)) @@ -170,7 +170,7 @@ parse_get_psql (struct lexer *lexer, struct dataset *ds) lex_get (lexer); } } - else if ( lex_match_id (lexer, "BSIZE")) + else if (lex_match_id (lexer, "BSIZE")) { lex_match (lexer, T_EQUALS); if (lex_force_int (lexer)) @@ -179,14 +179,14 @@ parse_get_psql (struct lexer *lexer, struct dataset *ds) lex_get (lexer); } } - else if ( lex_match_id (lexer, "UNENCRYPTED")) + else if (lex_match_id (lexer, "UNENCRYPTED")) { psql.allow_clear = true; } else if (lex_match_id (lexer, "SQL")) { lex_match (lexer, T_EQUALS); - if ( ! lex_force_string (lexer) ) + if (! lex_force_string (lexer)) goto error; ds_put_substring (&psql.sql, lex_tokss (lexer)); @@ -197,7 +197,7 @@ parse_get_psql (struct lexer *lexer, struct dataset *ds) struct dictionary *dict = NULL; struct casereader *reader = psql_open_reader (&psql, &dict); - if ( reader ) + if (reader) { dataset_set_dict (ds, dict); dataset_set_source (ds, reader); @@ -243,9 +243,9 @@ parse_spreadsheet (struct lexer *lexer, char **filename, lex_get (lexer); - while (lex_match (lexer, T_SLASH) ) + while (lex_match (lexer, T_SLASH)) { - if ( lex_match_id (lexer, "ASSUMEDSTRWIDTH")) + if (lex_match_id (lexer, "ASSUMEDSTRWIDTH")) { lex_match (lexer, T_EQUALS); if (lex_force_int (lexer)) @@ -259,7 +259,7 @@ parse_spreadsheet (struct lexer *lexer, char **filename, lex_match (lexer, T_EQUALS); if (lex_match_id (lexer, "NAME")) { - if ( ! lex_force_string (lexer) ) + if (! lex_force_string (lexer)) goto error; opts->sheet_name = ss_xstrdup (lex_tokss (lexer)); @@ -297,7 +297,7 @@ parse_spreadsheet (struct lexer *lexer, char **filename, } else if (lex_match_id (lexer, "RANGE")) { - if ( ! lex_force_string (lexer) ) + if (! lex_force_string (lexer)) goto error; opts->cell_range = ss_xstrdup (lex_tokss (lexer)); @@ -314,7 +314,7 @@ parse_spreadsheet (struct lexer *lexer, char **filename, { lex_match (lexer, T_EQUALS); - if ( lex_match_id (lexer, "ON")) + if (lex_match_id (lexer, "ON")) { opts->read_names = true; } diff --git a/src/language/data-io/list.c b/src/language/data-io/list.c index d9798852c1..2fc9baaf43 100644 --- a/src/language/data-io/list.c +++ b/src/language/data-io/list.c @@ -158,23 +158,23 @@ cmd_list (struct lexer *lexer, struct dataset *ds) while (lex_token (lexer) != T_ENDCMD) { lex_match (lexer, T_SLASH); - if (lex_match_id (lexer, "VARIABLES") ) + if (lex_match_id (lexer, "VARIABLES")) { lex_match (lexer, T_EQUALS); - if (! parse_variables_const (lexer, dict, &cmd.v_variables, &cmd.n_variables, 0 )) + if (! parse_variables_const (lexer, dict, &cmd.v_variables, &cmd.n_variables, 0)) { msg (SE, _("No variables specified.")); return CMD_FAILURE; } } - else if (lex_match_id (lexer, "FORMAT") ) + else if (lex_match_id (lexer, "FORMAT")) { lex_match (lexer, T_EQUALS); - if (lex_match_id (lexer, "NUMBERED") ) + if (lex_match_id (lexer, "NUMBERED")) { cmd.numbering = format_numbered; } - else if (lex_match_id (lexer, "UNNUMBERED") ) + else if (lex_match_id (lexer, "UNNUMBERED")) { cmd.numbering = format_unnumbered; } @@ -207,7 +207,7 @@ cmd_list (struct lexer *lexer, struct dataset *ds) lex_get (lexer); } } - else if (! parse_variables_const (lexer, dict, &cmd.v_variables, &cmd.n_variables, 0 )) + else if (! parse_variables_const (lexer, dict, &cmd.v_variables, &cmd.n_variables, 0)) { return CMD_FAILURE; } diff --git a/src/language/data-io/matrix-reader.c b/src/language/data-io/matrix-reader.c index 963f4a24f1..1dfe638882 100644 --- a/src/language/data-io/matrix-reader.c +++ b/src/language/data-io/matrix-reader.c @@ -220,7 +220,7 @@ next_matrix_from_reader (struct matrix_material *mm, } struct ccase *c; - for ( ; (c = casereader_read (group) ); case_unref (c)) + for (; (c = casereader_read (group)); case_unref (c)) { const union value *uv = case_data (c, mr->rowtype); const char *row_type = CHAR_CAST (const char *, uv->s); diff --git a/src/language/data-io/placement-parser.c b/src/language/data-io/placement-parser.c index d946d65de4..443b9b5916 100644 --- a/src/language/data-io/placement-parser.c +++ b/src/language/data-io/placement-parser.c @@ -119,7 +119,7 @@ fixed_parse_columns (struct lexer *lexer, struct pool *pool, size_t var_cnt, int fc, lc; size_t i; - if ( !parse_column_range (lexer, 1, &fc, &lc, NULL) ) + if (!parse_column_range (lexer, 1, &fc, &lc, NULL)) return false; /* Divide columns evenly. */ diff --git a/src/language/dictionary/modify-variables.c b/src/language/dictionary/modify-variables.c index a1fe6d75df..58853abd36 100644 --- a/src/language/dictionary/modify-variables.c +++ b/src/language/dictionary/modify-variables.c @@ -295,7 +295,7 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds) "not be given in conjunction with the %s " "subcommand."), "DROP", "KEEP" - ); + ); goto done; } already_encountered |= 4; diff --git a/src/language/dictionary/numeric.c b/src/language/dictionary/numeric.c index e306d6b9d2..c04e8eba7a 100644 --- a/src/language/dictionary/numeric.c +++ b/src/language/dictionary/numeric.c @@ -58,7 +58,7 @@ cmd_numeric (struct lexer *lexer, struct dataset *ds) if (!parse_format_specifier (lexer, &f)) goto fail; - if ( ! fmt_check_output (&f)) + if (! fmt_check_output (&f)) goto fail; if (fmt_is_string (f.type)) diff --git a/src/language/dictionary/split-file.c b/src/language/dictionary/split-file.c index 73cc20a057..48eec29581 100644 --- a/src/language/dictionary/split-file.c +++ b/src/language/dictionary/split-file.c @@ -50,7 +50,7 @@ cmd_split_file (struct lexer *lexer, struct dataset *ds) size_t n; /* For now, ignore SEPARATE and LAYERED. */ - (void) ( lex_match_id (lexer, "SEPARATE") || lex_match_id (lexer, "LAYERED") ); + (void) (lex_match_id (lexer, "SEPARATE") || lex_match_id (lexer, "LAYERED")); lex_match (lexer, T_BY); if (!parse_variables (lexer, dataset_dict (ds), &v, &n, PV_NO_DUPLICATE)) diff --git a/src/language/dictionary/variable-display.c b/src/language/dictionary/variable-display.c index 657e317a4c..1fa17017e0 100644 --- a/src/language/dictionary/variable-display.c +++ b/src/language/dictionary/variable-display.c @@ -51,13 +51,13 @@ cmd_variable_alignment (struct lexer *lexer, struct dataset *ds) if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE)) return CMD_FAILURE; - if ( lex_force_match (lexer, T_LPAREN) ) + if (lex_force_match (lexer, T_LPAREN)) { - if ( lex_match_id (lexer, "LEFT")) + if (lex_match_id (lexer, "LEFT")) align = ALIGN_LEFT; - else if ( lex_match_id (lexer, "RIGHT")) + else if (lex_match_id (lexer, "RIGHT")) align = ALIGN_RIGHT; - else if ( lex_match_id (lexer, "CENTER")) + else if (lex_match_id (lexer, "CENTER")) align = ALIGN_CENTRE; else { @@ -74,7 +74,7 @@ cmd_variable_alignment (struct lexer *lexer, struct dataset *ds) return CMD_FAILURE; } - for( i = 0 ; i < nv ; ++i ) + for(i = 0 ; i < nv ; ++i) var_set_alignment (v[i], align); while (lex_token (lexer) == T_SLASH) @@ -124,7 +124,7 @@ cmd_variable_width (struct lexer *lexer, struct dataset *ds) } width = MIN (width, 2 * MAX_STRING); - for( i = 0 ; i < nv ; ++i ) + for(i = 0 ; i < nv ; ++i) var_set_display_width (v[i], width); while (lex_token (lexer) == T_SLASH) @@ -150,13 +150,13 @@ cmd_variable_level (struct lexer *lexer, struct dataset *ds) if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE)) return CMD_FAILURE; - if ( lex_force_match (lexer, T_LPAREN) ) + if (lex_force_match (lexer, T_LPAREN)) { - if ( lex_match_id (lexer, "SCALE")) + if (lex_match_id (lexer, "SCALE")) level = MEASURE_SCALE; - else if ( lex_match_id (lexer, "ORDINAL")) + else if (lex_match_id (lexer, "ORDINAL")) level = MEASURE_ORDINAL; - else if ( lex_match_id (lexer, "NOMINAL")) + else if (lex_match_id (lexer, "NOMINAL")) level = MEASURE_NOMINAL; else { @@ -173,7 +173,7 @@ cmd_variable_level (struct lexer *lexer, struct dataset *ds) return CMD_FAILURE; } - for( i = 0 ; i < nv ; ++i ) + for(i = 0 ; i < nv ; ++i) var_set_measure (v[i], level); @@ -197,17 +197,17 @@ cmd_variable_role (struct lexer *lexer, struct dataset *ds) enum var_role role; size_t i; - if ( lex_match_id (lexer, "INPUT")) + if (lex_match_id (lexer, "INPUT")) role = ROLE_INPUT; - else if ( lex_match_id (lexer, "TARGET")) + else if (lex_match_id (lexer, "TARGET")) role = ROLE_TARGET; - else if ( lex_match_id (lexer, "BOTH")) + else if (lex_match_id (lexer, "BOTH")) role = ROLE_BOTH; - else if ( lex_match_id (lexer, "NONE")) + else if (lex_match_id (lexer, "NONE")) role = ROLE_NONE; - else if ( lex_match_id (lexer, "PARTITION")) + else if (lex_match_id (lexer, "PARTITION")) role = ROLE_PARTITION; - else if ( lex_match_id (lexer, "SPLIT")) + else if (lex_match_id (lexer, "SPLIT")) role = ROLE_SPLIT; else { diff --git a/src/language/expressions/evaluate.c b/src/language/expressions/evaluate.c index 07621a84b8..aa85f2c354 100644 --- a/src/language/expressions/evaluate.c +++ b/src/language/expressions/evaluate.c @@ -152,7 +152,7 @@ cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED) goto done; } - if ( ds == NULL ) + if (ds == NULL) { ds = dataset_create (NULL, ""); d = dataset_dict (ds); diff --git a/src/language/expressions/parse.c b/src/language/expressions/parse.c index 5054b69321..9064236507 100644 --- a/src/language/expressions/parse.c +++ b/src/language/expressions/parse.c @@ -885,7 +885,7 @@ parse_primary (struct lexer *lexer, struct expression *e) case T_POS_NUM: case T_NEG_NUM: { - union any_node *node = expr_allocate_number (e, lex_tokval (lexer) ); + union any_node *node = expr_allocate_number (e, lex_tokval (lexer)); lex_get (lexer); return node; } diff --git a/src/language/lexer/q2c.c b/src/language/lexer/q2c.c index 58b9cd19f6..28099d1635 100644 --- a/src/language/lexer/q2c.c +++ b/src/language/lexer/q2c.c @@ -732,7 +732,7 @@ parse_specifier (specifier *spec, subcommand *sbc) } skip_token (':'); - if ( sbc->type == SBC_ARRAY && token == T_ID ) + if (sbc->type == SBC_ARRAY && token == T_ID) { spec->varname = xstrdup (st_lower (tokstr)); spec->index = sbc->narray; @@ -794,7 +794,7 @@ parse_subcommand (subcommand *sbc) } sbc->arity = ARITY_ONCE_ONLY; - if ( match_token('+')) + if (match_token('+')) sbc->arity = ARITY_MANY; else if (match_token('^')) sbc->arity = ARITY_ONCE_EXACTLY ; @@ -859,7 +859,7 @@ parse_subcommand (subcommand *sbc) sbc->type = SBC_PINT; else if (match_id ("DOUBLE")) { - if ( match_id ("LIST") ) + if (match_id ("LIST")) sbc->type = SBC_DBL_LIST; else sbc->type = SBC_DBL; @@ -1278,7 +1278,7 @@ dump_vars_init (int persistent) int f = 0; dump (0, "p->sbc_%s = 0;", st_lower (sbc->name)); - if ( ! persistent ) + if (! persistent) { switch (sbc->type) { @@ -1291,7 +1291,7 @@ dump_vars_init (int persistent) sbc->type == SBC_INT_LIST ? "int" : "double", sbc->type == SBC_INT_LIST ? 'i' : 'd', st_lower (sbc->name) - ); + ); dump (-2, "}"); break; @@ -1443,7 +1443,7 @@ dump_specifier_parse (const specifier *spec, const subcommand *sbc) dump (0, "p->%s%s = %s%s;", sbc->prefix, spec->varname, st_upper (prefix), find_symbol (s->con)->name); - if ( sbc->type == SBC_ARRAY ) + if (sbc->type == SBC_ARRAY) dump (0, "p->a_%s[%s%s%s] = 1;", st_lower (sbc->name), st_upper (prefix), st_upper (sbc->prefix), @@ -1637,7 +1637,7 @@ dump_subcommand (const subcommand *sbc) dump (1, "if (!lex_force_string (lexer))"); dump (0, "return false;"); outdent (); - dump (0, "free(p->s_%s);", st_lower(sbc->name) ); + dump (0, "free(p->s_%s);", st_lower(sbc->name)); dump (0, "p->s_%s = ss_xstrdup (lex_tokss (lexer));", st_lower (sbc->name)); dump (0, "lex_get (lexer);"); @@ -1647,7 +1647,7 @@ dump_subcommand (const subcommand *sbc) dump (1, "if (!lex_force_num (lexer))"); dump (0, "goto lossage;"); dump (-1, "p->n_%s[p->sbc_%s - 1] = lex_number (lexer);", - st_lower (sbc->name), st_lower (sbc->name) ); + st_lower (sbc->name), st_lower (sbc->name)); dump (0, "lex_get(lexer);"); } else if (sbc->type == SBC_INT) @@ -1658,7 +1658,7 @@ dump_subcommand (const subcommand *sbc) dump (0, "goto lossage;"); dump (-1, "x = lex_integer (lexer);"); dump (0, "lex_get(lexer);"); - dump (0, "p->n_%s[p->sbc_%s - 1] = x;", st_lower (sbc->name), st_lower(sbc->name) ); + dump (0, "p->n_%s[p->sbc_%s - 1] = x;", st_lower (sbc->name), st_lower(sbc->name)); dump (-1,"}"); } else if (sbc->type == SBC_PINT) @@ -1671,7 +1671,7 @@ dump_subcommand (const subcommand *sbc) } else if (sbc->type == SBC_DBL_LIST || sbc->type == SBC_INT_LIST) { - dump (0, "if ( p->sbc_%s > MAXLISTS)",st_lower(sbc->name)); + dump (0, "if (p->sbc_%s > MAXLISTS)",st_lower(sbc->name)); dump (1, "{"); dump (0, "subc_list_error (lexer, \"%s\", MAXLISTS);", st_lower(sbc->name)); @@ -1728,7 +1728,7 @@ dump_parser (int persistent) dump (0, "static int"); dump (0, "parse_%s (struct lexer *lexer, struct dataset *ds%s, struct cmd_%s *p, void *aux UNUSED)", make_identifier (cmdname), - (def && ( def->type == SBC_VARLIST || def->type == SBC_CUSTOM))?"":" UNUSED", + (def && (def->type == SBC_VARLIST || def->type == SBC_CUSTOM))?"":" UNUSED", make_identifier (cmdname)); dump (1, "{"); @@ -1811,7 +1811,7 @@ dump_parser (int persistent) /* Now deal with the /ALGORITHM subcommand implicit to all commands */ - dump(1,"else if ( settings_get_syntax () != COMPATIBLE && lex_match_id(lexer, \"ALGORITHM\"))"); + dump(1,"else if (settings_get_syntax () != COMPATIBLE && lex_match_id(lexer, \"ALGORITHM\"))"); dump(1,"{"); dump (0, "lex_match (lexer, T_EQUALS);"); @@ -1848,9 +1848,9 @@ dump_parser (int persistent) for (sbc = subcommands; sbc; sbc = sbc->next) { - if ( sbc->arity == ARITY_ONCE_EXACTLY ) + if (sbc->arity == ARITY_ONCE_EXACTLY) { - dump (0, "if ( 0 == p->sbc_%s)", st_lower (sbc->name)); + dump (0, "if (0 == p->sbc_%s)", st_lower (sbc->name)); dump (1, "{"); dump (0, "lex_sbc_missing (\"%s\");", sbc->name); dump (0, "goto lossage;"); @@ -1893,7 +1893,7 @@ dump_free (int persistent) indent = 0; used = 0; - if ( ! persistent ) + if (! persistent) { for (sbc = subcommands; sbc; sbc = sbc->next) used = (sbc->type == SBC_STRING @@ -1906,7 +1906,7 @@ dump_free (int persistent) make_identifier (cmdname), used ? "" : " UNUSED"); dump (1, "{"); - if ( ! persistent ) + if (! persistent) { for (sbc = subcommands; sbc; sbc = sbc->next) diff --git a/src/language/lexer/subcommand-list.c b/src/language/lexer/subcommand-list.c index 289179b239..33deac0bb6 100644 --- a/src/language/lexer/subcommand-list.c +++ b/src/language/lexer/subcommand-list.c @@ -51,7 +51,7 @@ subc_list_double_push(subc_list_double *l, double d) { l->data[l->n_data++] = d; - if (l->n_data >= l->sz ) + if (l->n_data >= l->sz) { l->sz += CHUNKSIZE; l->data = xnrealloc (l->data, l->sz, sizeof *l->data); @@ -64,7 +64,7 @@ subc_list_int_push(subc_list_int *l, int d) { l->data[l->n_data++] = d; - if (l->n_data >= l->sz ) + if (l->n_data >= l->sz) { l->sz += CHUNKSIZE; l->data = xnrealloc (l->data, l->sz, sizeof *l->data); diff --git a/src/language/lexer/variable-parser.c b/src/language/lexer/variable-parser.c index aba30702d8..d80c25ee6b 100644 --- a/src/language/lexer/variable-parser.c +++ b/src/language/lexer/variable-parser.c @@ -921,7 +921,7 @@ lex_match_variable (struct lexer *lexer, const struct dictionary *dict, const st *var = parse_variable_const (lexer, dict); - if ( *var == NULL) + if (*var == NULL) return false; return true; } @@ -957,12 +957,12 @@ parse_internal_interaction (struct lexer *lexer, const struct dictionary *dict, assert (v); - if ( *iact == NULL) + if (*iact == NULL) *iact = interaction_create (v); else interaction_add_variable (*iact, v); - if ( lex_match (lexer, T_ASTERISK) || lex_match (lexer, T_BY)) + if (lex_match (lexer, T_ASTERISK) || lex_match (lexer, T_BY)) { return parse_internal_interaction (lexer, dict, iact, iact); } diff --git a/src/language/lexer/variable-parser.h b/src/language/lexer/variable-parser.h index 06704d3f4d..8a6772d031 100644 --- a/src/language/lexer/variable-parser.h +++ b/src/language/lexer/variable-parser.h @@ -124,7 +124,7 @@ parse_const_var_set_vars (struct lexer *l, const struct const_var_set *vs, static inline void const_var_set_destroy (struct const_var_set *vs) { - var_set_destroy ( (struct var_set *) vs); + var_set_destroy ((struct var_set *) vs); } /* Match a variable. diff --git a/src/language/stats/aggregate.c b/src/language/stats/aggregate.c index c0d1438ecb..965e6e3903 100644 --- a/src/language/stats/aggregate.c +++ b/src/language/stats/aggregate.c @@ -206,7 +206,7 @@ cmd_aggregate (struct lexer *lexer, struct dataset *ds) goto error; } - if ( agr.add_variables ) + if (agr.add_variables) agr.dict = dict_clone (dict); else agr.dict = dict_create (dict_get_encoding (dict)); @@ -312,7 +312,7 @@ cmd_aggregate (struct lexer *lexer, struct dataset *ds) initialize_aggregate_info (&agr); - if ( agr.add_variables ) + if (agr.add_variables) placeholder = casereader_clone (group); { @@ -934,7 +934,7 @@ dump_aggregate_info (const struct agr_proc *agr, struct casewriter *output, cons { struct ccase *c = case_create (dict_get_proto (agr->dict)); - if ( agr->add_variables) + if (agr->add_variables) { case_copy (c, 0, break_case, 0, dict_get_var_cnt (agr->src_dict)); } @@ -980,7 +980,7 @@ dump_aggregate_info (const struct agr_proc *agr, struct casewriter *output, cons break; case MEDIAN: { - if ( i->writer) + if (i->writer) { struct percentile *median = percentile_create (0.5, i->cc); struct order_stats *os = &median->parent; @@ -1112,10 +1112,10 @@ initialize_aggregate_info (struct agr_proc *agr) proto = caseproto_add_width (proto, 0); proto = caseproto_add_width (proto, 0); - if ( ! iter->subject) + if (! iter->subject) iter->subject = dict_create_internal_var (0, 0); - if ( ! iter->weight) + if (! iter->weight) iter->weight = dict_create_internal_var (1, 0); subcase_init_var (&ordering, iter->subject, SC_ASCEND); diff --git a/src/language/stats/binomial.c b/src/language/stats/binomial.c index 0ab004364d..e799d16884 100644 --- a/src/language/stats/binomial.c +++ b/src/language/stats/binomial.c @@ -60,8 +60,8 @@ static double calculate_binomial (double n1, double n2, double p) { const double n = n1 + n2; - const bool test_reversed = (n1 / n > p ) ; - if ( test_reversed ) + const bool test_reversed = (n1 / n > p) ; + if (test_reversed) { p = 1 - p ; swap (&n1, &n2); @@ -78,7 +78,7 @@ calculate_binomial_internal (double n1, double n2, double p) double sig1tailed = gsl_cdf_binomial_P (n1, p, n1 + n2); - if ( p == 0.5 ) + if (p == 0.5) return sig1tailed > 0.5 ? 1.0 :sig1tailed * 2.0; return sig1tailed ; @@ -91,7 +91,7 @@ do_binomial (const struct dictionary *dict, struct freq *cat1, struct freq *cat2, enum mv_class exclude - ) + ) { const struct binomial_test *bst = UP_CAST (ost, const struct binomial_test, parent); bool warn = true; @@ -103,7 +103,7 @@ do_binomial (const struct dictionary *dict, int v; double w = dict_get_case_weight (dict, c, &warn); - for (v = 0 ; v < ost->n_vars ; ++v ) + for (v = 0 ; v < ost->n_vars ; ++v) { const struct variable *var = ost->vars[v]; double value = case_num (c, var); @@ -113,28 +113,28 @@ do_binomial (const struct dictionary *dict, if (bst->cutpoint != SYSMIS) { - if ( cat1[v].values[0].f >= value ) + if (cat1[v].values[0].f >= value) cat1[v].count += w; else cat2[v].count += w; } else { - if ( SYSMIS == cat1[v].values[0].f ) + if (SYSMIS == cat1[v].values[0].f) { cat1[v].values[0].f = value; cat1[v].count = w; } - else if ( cat1[v].values[0].f == value ) + else if (cat1[v].values[0].f == value) cat1[v].count += w; - else if ( SYSMIS == cat2[v].values[0].f ) + else if (SYSMIS == cat2[v].values[0].f) { cat2[v].values[0].f = value; cat2[v].count = w; } - else if ( cat2[v].values[0].f == value ) + else if (cat2[v].values[0].f == value) cat2[v].count += w; - else if ( bst->category1 == SYSMIS) + else if (bst->category1 == SYSMIS) msg (ME, _("Variable %s is not dichotomous"), var_get_name (var)); } } diff --git a/src/language/stats/chisquare.c b/src/language/stats/chisquare.c index ffb75dd3e0..eb21644d4a 100644 --- a/src/language/stats/chisquare.c +++ b/src/language/stats/chisquare.c @@ -70,7 +70,7 @@ create_freq_hash_with_range (const struct dictionary *dict, /* Populate the hash with zero entries */ entries = xnmalloc (hi - lo + 1, sizeof *entries); - for (i_d = lo; i_d <= hi; i_d += 1.0 ) + for (i_d = lo; i_d <= hi; i_d += 1.0) { size_t ofs = i_d - lo; union value value = { i_d }; @@ -145,12 +145,12 @@ chisquare_execute (const struct dataset *ds, double *xsq = xzalloc (sizeof (*df) * ost->n_vars); bool ok; - for ( i = 0 ; i < cst->n_expected ; ++i ) + for (i = 0 ; i < cst->n_expected ; ++i) total_expected += cst->expected[i]; - if ( cst->ranged == false ) + if (cst->ranged == false) { - for ( v = 0 ; v < ost->n_vars ; ++v ) + for (v = 0 ; v < ost->n_vars ; ++v) { const struct variable *var = ost->vars[v]; @@ -244,19 +244,19 @@ chisquare_execute (const struct dataset *ds, struct pivot_dimension *var_dim = pivot_dimension_create (table, PIVOT_AXIS_COLUMN, N_("Variable")); - for ( size_t i = 0 ; i < ost->n_vars ; ++i ) + for (size_t i = 0 ; i < ost->n_vars ; ++i) pivot_category_create_leaf (var_dim->root, pivot_value_new_variable (ost->vars[i])); struct pivot_dimension *category_dim = pivot_dimension_create (table, PIVOT_AXIS_ROW, N_("Category")); size_t n_cells = cst->hi - cst->lo + 1; - for (size_t i = 0 ; i < n_cells; ++i ) + for (size_t i = 0 ; i < n_cells; ++i) pivot_category_create_leaf (category_dim->root, pivot_value_new_integer (i + 1)); pivot_category_create_leaves (category_dim->root, N_("Total")); - for ( size_t v = 0 ; v < ost->n_vars ; ++v ) + for (size_t v = 0 ; v < ost->n_vars ; ++v) { const struct variable *var = ost->vars[v]; struct casereader *reader = @@ -274,11 +274,11 @@ chisquare_execute (const struct dataset *ds, struct freq **ff = freq_hmap_sort (&freq_hash, var_get_width (var)); double total_obs = 0.0; - for ( size_t i = 0 ; i < hmap_count (&freq_hash) ; ++i ) + for (size_t i = 0 ; i < hmap_count (&freq_hash) ; ++i) total_obs += ff[i]->count; xsq[v] = 0.0; - for ( size_t i = 0 ; i < hmap_count (&freq_hash) ; ++i ) + for (size_t i = 0 ; i < hmap_count (&freq_hash) ; ++i) { /* Category. */ pivot_table_put3 (table, 0, v, i, @@ -327,7 +327,7 @@ chisquare_execute (const struct dataset *ds, struct pivot_dimension *variables = pivot_dimension_create ( table, PIVOT_AXIS_ROW, N_("Variable")); - for ( size_t v = 0 ; v < ost->n_vars ; ++v ) + for (size_t v = 0 ; v < ost->n_vars ; ++v) { const struct variable *var = ost->vars[v]; diff --git a/src/language/stats/cochran.c b/src/language/stats/cochran.c index 480248637f..4b881f393c 100644 --- a/src/language/stats/cochran.c +++ b/src/language/stats/cochran.c @@ -86,10 +86,10 @@ cochran_execute (const struct dataset *ds, const struct variable *var = ct->vars[v]; const union value *val = case_data (c, var); - if ( var_is_value_missing (var, val, exclude)) + if (var_is_value_missing (var, val, exclude)) continue; - if ( ch.success == SYSMIS) + if (ch.success == SYSMIS) { ch.success = val->f; } @@ -97,12 +97,12 @@ cochran_execute (const struct dataset *ds, { ch.failure = val->f; } - if ( ch.success == val->f) + if (ch.success == val->f) { ch.hits[v] += w; case_hits += w; } - else if ( ch.failure == val->f) + else if (ch.failure == val->f) { ch.misses[v] += w; } diff --git a/src/language/stats/correlations.c b/src/language/stats/correlations.c index 826a640a8e..b33baf5758 100644 --- a/src/language/stats/correlations.c +++ b/src/language/stats/correlations.c @@ -217,12 +217,12 @@ run_corr (struct casereader *r, const struct corr_opts *opts, const struct corr true); struct casereader *rc = casereader_clone (r); - for ( ; (c = casereader_read (r) ); case_unref (c)) + for (; (c = casereader_read (r)); case_unref (c)) { covariance_accumulate_pass1 (cov, c); } - for ( ; (c = casereader_read (rc) ); case_unref (c)) + for (; (c = casereader_read (rc)); case_unref (c)) { covariance_accumulate_pass2 (cov, c); } @@ -241,7 +241,7 @@ run_corr (struct casereader *r, const struct corr_opts *opts, const struct corr corr_matrix = correlation_from_covariance (cov_matrix, var_matrix); - if ( opts->statistics & STATS_DESCRIPTIVES) + if (opts->statistics & STATS_DESCRIPTIVES) output_descriptives (corr, opts, mean_matrix, var_matrix, samples_matrix); output_correlation (corr, opts, corr_matrix, @@ -307,7 +307,7 @@ cmd_correlation (struct lexer *lexer, struct dataset *ds) lex_match (lexer, T_EQUALS); while (lex_token (lexer) != T_ENDCMD && lex_token (lexer) != T_SLASH) { - if ( lex_match_id (lexer, "TWOTAIL")) + if (lex_match_id (lexer, "TWOTAIL")) opts.tails = 2; else if (lex_match_id (lexer, "ONETAIL")) opts.tails = 1; @@ -329,7 +329,7 @@ cmd_correlation (struct lexer *lexer, struct dataset *ds) lex_match (lexer, T_EQUALS); while (lex_token (lexer) != T_ENDCMD && lex_token (lexer) != T_SLASH) { - if ( lex_match_id (lexer, "DESCRIPTIVES")) + if (lex_match_id (lexer, "DESCRIPTIVES")) opts.statistics = STATS_DESCRIPTIVES; else if (lex_match_id (lexer, "XPROD")) opts.statistics = STATS_XPROD; @@ -357,7 +357,7 @@ cmd_correlation (struct lexer *lexer, struct dataset *ds) corr = xrealloc (corr, sizeof (*corr) * (n_corrs + 1)); corr[n_corrs].n_vars_total = corr[n_corrs].n_vars1 = 0; - if ( ! parse_variables_const (lexer, dict, &corr[n_corrs].vars, + if (! parse_variables_const (lexer, dict, &corr[n_corrs].vars, &corr[n_corrs].n_vars_total, PV_NUMERIC)) { @@ -368,9 +368,9 @@ cmd_correlation (struct lexer *lexer, struct dataset *ds) corr[n_corrs].n_vars1 = corr[n_corrs].n_vars_total; - if ( lex_match (lexer, T_WITH)) + if (lex_match (lexer, T_WITH)) { - if ( ! parse_variables_const (lexer, dict, + if (! parse_variables_const (lexer, dict, &corr[n_corrs].vars, &corr[n_corrs].n_vars_total, PV_NUMERIC | PV_APPEND)) { @@ -416,7 +416,7 @@ cmd_correlation (struct lexer *lexer, struct dataset *ds) /* FIXME: No need to iterate the data multiple times */ struct casereader *r = casereader_clone (group); - if ( opts.missing_type == CORR_LISTWISE) + if (opts.missing_type == CORR_LISTWISE) r = casereader_create_filter_missing (r, all_vars, n_all_vars, opts.exclude, NULL, NULL); diff --git a/src/language/stats/descriptives.c b/src/language/stats/descriptives.c index a4b8e53b83..0cee83e06b 100644 --- a/src/language/stats/descriptives.c +++ b/src/language/stats/descriptives.c @@ -272,7 +272,7 @@ cmd_descriptives (struct lexer *lexer, struct dataset *ds) else { enum dsc_statistic s = match_statistic (lexer); - if (s == DSC_NONE ) + if (s == DSC_NONE) { lex_error (lexer, NULL); goto error; @@ -292,7 +292,7 @@ cmd_descriptives (struct lexer *lexer, struct dataset *ds) else { dsc->sort_by_stat = match_statistic (lexer); - if (dsc->sort_by_stat == DSC_NONE ) + if (dsc->sort_by_stat == DSC_NONE) dsc->sort_by_stat = DSC_MEAN; } if (lex_match (lexer, T_LPAREN)) @@ -727,7 +727,7 @@ setup_z_trns (struct dsc_proc *dsc, struct dataset *ds) t->z_score_cnt = cnt; t->missing_type = dsc->missing_type; t->exclude = dsc->exclude; - if ( t->missing_type == DSC_LISTWISE ) + if (t->missing_type == DSC_LISTWISE) { t->var_cnt = dsc->var_cnt; t->vars = xnmalloc (t->var_cnt, sizeof *t->vars); diff --git a/src/language/stats/examine.c b/src/language/stats/examine.c index a9deed66b9..c17b322dd5 100644 --- a/src/language/stats/examine.c +++ b/src/language/stats/examine.c @@ -71,7 +71,7 @@ static void append_value_name (const struct variable *var, const union value *val, struct string *str) { var_append_value_name (var, val, str); - if ( var_is_value_missing (var, val, MV_ANY)) + if (var_is_value_missing (var, val, MV_ANY)) ds_put_cstr (str, _(" (missing)")); } @@ -235,10 +235,10 @@ show_boxplot_grouped (const struct examine *cmd, int iact_idx) const struct exploratory_stats *es = categoricals_get_user_data_by_category_real (cmd->cats, iact_idx, grp); - if ( y_min > es[v].minimum) + if (y_min > es[v].minimum) y_min = es[v].minimum; - if ( y_max < es[v].maximum) + if (y_max < es[v].maximum) y_max = es[v].maximum; } @@ -310,14 +310,14 @@ show_boxplot_variabled (const struct examine *cmd, int iact_idx) const struct exploratory_stats *es = categoricals_get_user_data_by_category_real (cmd->cats, iact_idx, grp); - if ( y_min > es[v].minimum) + if (y_min > es[v].minimum) y_min = es[v].minimum; - if ( y_max < es[v].maximum) + if (y_max < es[v].maximum) y_max = es[v].maximum; } - if ( iact->n_vars == 0) + if (iact->n_vars == 0) ds_put_format (&title, _("Boxplot")); else { @@ -389,7 +389,7 @@ show_npplot (const struct examine *cmd, int iact_idx) ds_init_cstr (&label, var_to_string (cmd->dep_vars[v])); - if ( iact->n_vars > 0) + if (iact->n_vars > 0) { ds_put_cstr (&label, " ("); for (ivar_idx = 0; ivar_idx < iact->n_vars; ++ivar_idx) @@ -514,7 +514,7 @@ show_histogram (const struct examine *cmd, int iact_idx) ds_init_cstr (&label, var_to_string (cmd->dep_vars[v])); - if ( iact->n_vars > 0) + if (iact->n_vars > 0) { ds_put_cstr (&label, " ("); for (ivar_idx = 0; ivar_idx < iact->n_vars; ++ivar_idx) @@ -535,7 +535,7 @@ show_histogram (const struct examine *cmd, int iact_idx) moments_calculate (es[v].mom, &n, &mean, &var, NULL, NULL); chart_item_submit - ( histogram_chart_create (es[v].histogram->gsl_hist, + (histogram_chart_create (es[v].histogram->gsl_hist, ds_cstr (&label), n, mean, sqrt (var), false)); @@ -562,7 +562,7 @@ create_interaction_dimensions (struct pivot_table *table, const struct interaction *iact, struct pivot_footnote *missing_footnote) { - for (size_t i = iact->n_vars; i-- > 0; ) + for (size_t i = iact->n_vars; i-- > 0;) { const struct variable *var = iact->vars[i]; struct pivot_dimension *d = pivot_dimension_create__ ( @@ -996,7 +996,7 @@ parse_interaction (struct lexer *lexer, struct examine *ex) const struct variable *v = NULL; struct interaction *iact = NULL; - if ( lex_match_variable (lexer, ex->dict, &v)) + if (lex_match_variable (lexer, ex->dict, &v)) { iact = interaction_create (v); @@ -1491,7 +1491,7 @@ cmd_examine (struct lexer *lexer, struct dataset *ds) lex_match (lexer, T_SLASH); if (lex_match_id (lexer, "VARIABLES")) { - if (! lex_force_match (lexer, T_EQUALS) ) + if (! lex_force_match (lexer, T_EQUALS)) goto error; } @@ -1581,7 +1581,7 @@ cmd_examine (struct lexer *lexer, struct dataset *ds) { double p = lex_number (lexer); - if ( p <= 0 || p >= 100.0) + if (p <= 0 || p >= 100.0) { lex_error (lexer, _("Percentiles must lie in the range (0, 100)")); @@ -1752,7 +1752,7 @@ cmd_examine (struct lexer *lexer, struct dataset *ds) } else if (lex_match_id (lexer, "CINTERVAL")) { - if ( !lex_force_num (lexer)) + if (!lex_force_num (lexer)) goto error; examine.conf = lex_number (lexer); @@ -1772,7 +1772,7 @@ cmd_examine (struct lexer *lexer, struct dataset *ds) } - if ( totals_seen && nototals_seen) + if (totals_seen && nototals_seen) { msg (SE, _("%s and %s are mutually exclusive"), "TOTAL", "NOTOTAL"); goto error; @@ -1780,7 +1780,7 @@ cmd_examine (struct lexer *lexer, struct dataset *ds) /* If totals have been requested or if there are no factors in this analysis, then the totals need to be included. */ - if ( !nototals_seen || examine.n_iacts == 1) + if (!nototals_seen || examine.n_iacts == 1) { examine.iacts = &iacts_mem[0]; } @@ -1792,7 +1792,7 @@ cmd_examine (struct lexer *lexer, struct dataset *ds) } - if ( examine.id_var ) + if (examine.id_var) { examine.id_idx = var_get_case_index (examine.id_var); examine.id_width = var_get_width (examine.id_var); diff --git a/src/language/stats/factor.c b/src/language/stats/factor.c index 18341b8db5..f37930aca5 100644 --- a/src/language/stats/factor.c +++ b/src/language/stats/factor.c @@ -107,13 +107,13 @@ enum rotation_type typedef void (*rotation_coefficients) (double *x, double *y, double a, double b, double c, double d, - const gsl_matrix *loadings ); + const gsl_matrix *loadings); static void varimax_coefficients (double *x, double *y, double a, double b, double c, double d, - const gsl_matrix *loadings ) + const gsl_matrix *loadings) { *x = d - 2 * a * b / loadings->size1; *y = c - (a * a - b * b) / loadings->size1; @@ -122,7 +122,7 @@ varimax_coefficients (double *x, double *y, static void equamax_coefficients (double *x, double *y, double a, double b, double c, double d, - const gsl_matrix *loadings ) + const gsl_matrix *loadings) { *x = d - loadings->size2 * a * b / loadings->size1; *y = c - loadings->size2 * (a * a - b * b) / (2 * loadings->size1); @@ -286,7 +286,7 @@ ssq_row_od_n (const gsl_matrix *m, int j) for (i = 0; i < m->size1; ++i) { - if (i == j ) continue; + if (i == j) continue; ss += pow2 (gsl_matrix_get (m, i, j)); } @@ -416,7 +416,7 @@ n_extracted_factors (const struct cmd_factor *factor, struct idata *idata) int i; /* If there is a cached value, then return that. */ - if ( idata->n_extractions != 0) + if (idata->n_extractions != 0) return idata->n_extractions; /* Otherwise, if the number of factors has been explicitly requested, @@ -645,7 +645,7 @@ sort_matrix_indirect (const gsl_matrix *input, gsl_permutation *perm) gsl_vector_view row = gsl_matrix_row (mat, p->data[n - 1 - i]); size_t maxindex = gsl_vector_max_index (&row.vector); - if ( maxindex > column_n ) + if (maxindex > column_n) break; /* All subsequent elements of this row, are of no interest. @@ -663,7 +663,7 @@ sort_matrix_indirect (const gsl_matrix *input, gsl_permutation *perm) gsl_permutation_free (p); gsl_matrix_free (mat); - assert ( 0 == gsl_permutation_valid (perm)); + assert (0 == gsl_permutation_valid (perm)); /* We want the biggest value to be first */ gsl_permutation_reverse (perm); @@ -720,7 +720,7 @@ initial_sv (const gsl_matrix *fm) l4s += lambda_4; l2s += lambda_sq; } - sv += ( fm->size1 * l4s - (l2s * l2s) ) / (fm->size1 * fm->size1 ); + sv += (fm->size1 * l4s - (l2s * l2s)) / (fm->size1 * fm->size1); } return sv; } @@ -805,7 +805,7 @@ rotate (const struct cmd_factor *cf, const gsl_matrix *unrot, phi = atan2 (x, y) / 4.0 ; /* Don't bother rotating if the angle is small */ - if ( fabs (sin (phi) ) <= pow (10.0, -15.0)) + if (fabs (sin (phi)) <= pow (10.0, -15.0)) continue; for (p = 0; p < normalised->size1; ++p) @@ -825,10 +825,10 @@ rotate (const struct cmd_factor *cf, const gsl_matrix *unrot, l2s += lambda_sq; } } - sv += ( normalised->size1 * l4s - (l2s * l2s) ) / (normalised->size1 * normalised->size1 ); + sv += (normalised->size1 * l4s - (l2s * l2s)) / (normalised->size1 * normalised->size1); } - if ( fabs (sv - prev_sv) <= cf->rconverge) + if (fabs (sv - prev_sv) <= cf->rconverge) break; prev_sv = sv; @@ -991,7 +991,7 @@ rotate (const struct cmd_factor *cf, const gsl_matrix *unrot, gsl_vector_set (rotated_loadings, i, ssq); - if ( sum < 0 ) + if (sum < 0) for (j = 0 ; j < result->size1; ++j) { double *lambda = gsl_matrix_ptr (result, j, i); @@ -1270,7 +1270,7 @@ cmd_factor (struct lexer *lexer, struct dataset *ds) { if (lex_match_id (lexer, "FACTORS")) { - if ( lex_force_match (lexer, T_LPAREN) + if (lex_force_match (lexer, T_LPAREN) && lex_force_int (lexer)) { factor.n_factors = lex_integer (lexer); @@ -1281,7 +1281,7 @@ cmd_factor (struct lexer *lexer, struct dataset *ds) } else if (lex_match_id (lexer, "MINEIGEN")) { - if ( lex_force_match (lexer, T_LPAREN) + if (lex_force_match (lexer, T_LPAREN) && lex_force_num (lexer)) { factor.min_eigen = lex_number (lexer); @@ -1292,7 +1292,7 @@ cmd_factor (struct lexer *lexer, struct dataset *ds) } else if (lex_match_id (lexer, "ECONVERGE")) { - if ( lex_force_match (lexer, T_LPAREN) + if (lex_force_match (lexer, T_LPAREN) && lex_force_num (lexer)) { factor.econverge = lex_number (lexer); @@ -1314,7 +1314,7 @@ cmd_factor (struct lexer *lexer, struct dataset *ds) } else if (lex_match_id (lexer, "ITERATE")) { - if ( lex_force_match (lexer, T_LPAREN) + if (lex_force_match (lexer, T_LPAREN) && lex_force_int (lexer)) { n_iterations = lex_integer (lexer); @@ -1376,7 +1376,7 @@ cmd_factor (struct lexer *lexer, struct dataset *ds) } else if (lex_match_id (lexer, "BLANK")) { - if ( lex_force_match (lexer, T_LPAREN) + if (lex_force_match (lexer, T_LPAREN) && lex_force_num (lexer)) { factor.blank = lex_number (lexer); @@ -1512,7 +1512,7 @@ cmd_factor (struct lexer *lexer, struct dataset *ds) } } - if ( factor.rotation == ROT_NONE ) + if (factor.rotation == ROT_NONE) factor.print &= ~PRINT_ROTATION; if (factor.n_vars < 2) @@ -1546,7 +1546,7 @@ cmd_factor (struct lexer *lexer, struct dataset *ds) idata_free (id); } else - if ( ! run_factor (ds, &factor)) + if (! run_factor (ds, &factor)) goto error; @@ -1574,7 +1574,7 @@ run_factor (struct dataset *ds, const struct cmd_factor *factor) while (casegrouper_get_next_group (grouper, &group)) { - if ( factor->missing_type == MISS_LISTWISE ) + if (factor->missing_type == MISS_LISTWISE) group = casereader_create_filter_missing (group, factor->vars, factor->n_vars, factor->exclude, NULL, NULL); @@ -1627,7 +1627,7 @@ show_scree (const struct cmd_factor *f, const struct idata *idata) struct scree *s; const char *label ; - if ( !(f->plot & PLOT_SCREE) ) + if (!(f->plot & PLOT_SCREE)) return; @@ -1703,7 +1703,7 @@ show_factor_matrix (const struct cmd_factor *factor, const struct idata *idata, /* Initialise to the identity permutation */ gsl_permutation *perm = gsl_permutation_calloc (factor->n_vars); - if ( factor->sort) + if (factor->sort) sort_matrix_indirect (fm, perm); for (size_t i = 0 ; i < factor->n_vars; ++i) @@ -1716,7 +1716,7 @@ show_factor_matrix (const struct cmd_factor *factor, const struct idata *idata, for (size_t j = 0 ; j < n_factors; ++j) { double x = gsl_matrix_get (fm, matrix_row, j); - if ( fabs (x) < factor->blank) + if (fabs (x) < factor->blank) continue; pivot_table_put2 (table, j, var_idx, pivot_value_new_number (x)); @@ -1977,7 +1977,7 @@ do_factor (const struct cmd_factor *factor, struct casereader *r) idata->cvm = covariance_1pass_create (factor->n_vars, factor->vars, factor->wv, factor->exclude, true); - for ( ; (c = casereader_read (r) ); case_unref (c)) + for (; (c = casereader_read (r)); case_unref (c)) { covariance_accumulate (idata->cvm, c); } @@ -2058,7 +2058,7 @@ do_factor_by_matrix (const struct cmd_factor *factor, struct idata *idata) gsl_matrix_free (tmp); } - if ( factor->print & PRINT_UNIVARIATE) + if (factor->print & PRINT_UNIVARIATE) { struct pivot_table *table = pivot_table_create ( N_("Descriptive Statistics")); @@ -2175,7 +2175,7 @@ do_factor_by_matrix (const struct cmd_factor *factor, struct idata *idata) struct factor_matrix_workspace *fmw = factor_matrix_workspace_alloc (idata->msr->size, idata->n_extractions); gsl_matrix *factor_matrix = gsl_matrix_calloc (factor->n_vars, fmw->n_factors); - if ( factor->extraction == EXTRACTION_PAF) + if (factor->extraction == EXTRACTION_PAF) { gsl_vector *diff = gsl_vector_alloc (idata->msr->size); struct smr_workspace *ws = ws_create (idata->analysis_matrix); @@ -2201,7 +2201,7 @@ do_factor_by_matrix (const struct cmd_factor *factor, struct idata *idata) gsl_vector_minmax (diff, &min, &max); - if ( fabs (min) < factor->econverge && fabs (max) < factor->econverge) + if (fabs (min) < factor->econverge && fabs (max) < factor->econverge) break; } gsl_vector_free (diff); @@ -2228,7 +2228,7 @@ do_factor_by_matrix (const struct cmd_factor *factor, struct idata *idata) show_aic (factor, idata); show_communalities (factor, initial_communalities, extracted_communalities); - if ( factor->rotation != ROT_NONE) + if (factor->rotation != ROT_NONE) { rotated_factors = gsl_matrix_calloc (factor_matrix->size1, factor_matrix->size2); rotated_loadings = gsl_vector_calloc (factor_matrix->size2); @@ -2253,14 +2253,14 @@ do_factor_by_matrix (const struct cmd_factor *factor, struct idata *idata) ? N_("Component Matrix") : N_("Factor Matrix")), factor_matrix); - if ( factor->rotation == ROT_PROMAX) + if (factor->rotation == ROT_PROMAX) { show_factor_matrix (factor, idata, N_("Pattern Matrix"), pattern_matrix); gsl_matrix_free (pattern_matrix); } - if ( factor->rotation != ROT_NONE) + if (factor->rotation != ROT_NONE) { show_factor_matrix (factor, idata, (factor->rotation == ROT_PROMAX @@ -2273,7 +2273,7 @@ do_factor_by_matrix (const struct cmd_factor *factor, struct idata *idata) gsl_matrix_free (rotated_factors); } - if ( factor->rotation == ROT_PROMAX) + if (factor->rotation == ROT_PROMAX) { show_factor_correlation (factor, fcm); gsl_matrix_free (fcm); diff --git a/src/language/stats/flip.c b/src/language/stats/flip.c index 7f4841d293..e39e85fd5f 100644 --- a/src/language/stats/flip.c +++ b/src/language/stats/flip.c @@ -349,7 +349,7 @@ flip_file (struct flip_pgm *flip) return false; } - for (case_idx = 0; case_idx < flip->n_cases; ) + for (case_idx = 0; case_idx < flip->n_cases;) { unsigned long read_cases = MIN (flip->n_cases - case_idx, case_capacity); diff --git a/src/language/stats/frequencies.c b/src/language/stats/frequencies.c index ef1b7592dc..0404ceb799 100644 --- a/src/language/stats/frequencies.c +++ b/src/language/stats/frequencies.c @@ -443,7 +443,7 @@ postprocess_freq_tab (const struct frq_proc *frq, struct var_freqs *vf) /* Summary statistics. */ ft->valid_cases = 0.0; - for(i = 0 ; i < ft->n_valid ; ++i ) + for(i = 0 ; i < ft->n_valid ; ++i) { f = &ft->valid[i]; ft->valid_cases += f->count; @@ -451,7 +451,7 @@ postprocess_freq_tab (const struct frq_proc *frq, struct var_freqs *vf) } ft->total_cases = ft->valid_cases ; - for(i = 0 ; i < ft->n_missing ; ++i ) + for(i = 0 ; i < ft->n_missing ; ++i) { f = &ft->missing[i]; ft->total_cases += f->count; @@ -545,7 +545,7 @@ postcalc (struct frq_proc *frq, const struct dataset *ds) histogram = freq_tab_to_hist (frq, &vf->tab, vf->var); - if ( histogram) + if (histogram) { chart_item_submit (histogram_chart_create ( histogram->gsl_hist, var_to_string(vf->var), @@ -622,7 +622,7 @@ cmd_frequencies (struct lexer *lexer, struct dataset *ds) lex_match (lexer, T_SLASH); if (lex_match_id (lexer, "VARIABLES")) { - if (! lex_force_match (lexer, T_EQUALS) ) + if (! lex_force_match (lexer, T_EQUALS)) goto error; } @@ -1037,7 +1037,7 @@ cmd_frequencies (struct lexer *lexer, struct dataset *ds) } else if (lex_match_id (lexer, "FREQ")) { - if ( lex_match (lexer, T_LPAREN)) + if (lex_match (lexer, T_LPAREN)) { if (lex_force_num (lexer)) { @@ -1051,7 +1051,7 @@ cmd_frequencies (struct lexer *lexer, struct dataset *ds) } else if (lex_match_id (lexer, "PERCENT")) { - if ( lex_match (lexer, T_LPAREN)) + if (lex_match (lexer, T_LPAREN)) { if (lex_force_num (lexer)) { @@ -1351,7 +1351,7 @@ freq_tab_to_hist (const struct frq_proc *frq, const struct freq_tab *ft, histogram = histogram_create (bin_width, x_min, x_max); - if ( histogram == NULL) + if (histogram == NULL) return NULL; for (i = 0; i < ft->n_valid; i++) diff --git a/src/language/stats/friedman.c b/src/language/stats/friedman.c index 9ea3cbc516..e2b9354678 100644 --- a/src/language/stats/friedman.c +++ b/src/language/stats/friedman.c @@ -139,7 +139,7 @@ friedman_execute (const struct dataset *ds, { double x = row[v].x; /* Replace value by the Rank */ - if ( prev_x == x) + if (prev_x == x) { /* Deal with ties */ int i; @@ -155,7 +155,7 @@ friedman_execute (const struct dataset *ds, else { row[v].x = v + 1; - if ( run_length > 0) + if (run_length > 0) { double t = run_length + 1; sigma_t += w * (pow3 (t) - t); @@ -164,10 +164,10 @@ friedman_execute (const struct dataset *ds, } prev_x = x; } - if ( run_length > 0) + if (run_length > 0) { double t = run_length + 1; - sigma_t += w * (pow3 (t) - t ); + sigma_t += w * (pow3 (t) - t); } qsort (row, ost->n_vars, sizeof *row, cmp_posn); @@ -186,14 +186,14 @@ friedman_execute (const struct dataset *ds, rsq = numerator; - numerator *= 12.0 / (fr.cc * ost->n_vars * ( ost->n_vars + 1)); - numerator -= 3 * fr.cc * ( ost->n_vars + 1); + numerator *= 12.0 / (fr.cc * ost->n_vars * (ost->n_vars + 1)); + numerator -= 3 * fr.cc * (ost->n_vars + 1); - denominator = 1 - sigma_t / ( fr.cc * ost->n_vars * ( pow2 (ost->n_vars) - 1)); + denominator = 1 - sigma_t / (fr.cc * ost->n_vars * (pow2 (ost->n_vars) - 1)); fr.chi_sq = numerator / denominator; - if ( ft->kendalls_w) + if (ft->kendalls_w) { fr.w = 12 * rsq ; fr.w -= 3 * pow2 (fr.cc) * diff --git a/src/language/stats/glm.c b/src/language/stats/glm.c index c8a3dd36e1..51232fe160 100644 --- a/src/language/stats/glm.c +++ b/src/language/stats/glm.c @@ -234,7 +234,7 @@ cmd_glm (struct lexer *lexer, struct dataset *ds) glm.alpha = lex_number (lexer); lex_get (lexer); - if ( ! lex_force_match (lexer, T_RPAREN)) + if (! lex_force_match (lexer, T_RPAREN)) { lex_error (lexer, NULL); goto error; @@ -250,26 +250,26 @@ cmd_glm (struct lexer *lexer, struct dataset *ds) else if (lex_match_id (lexer, "METHOD")) { lex_match (lexer, T_EQUALS); - if ( !lex_force_match_id (lexer, "SSTYPE")) + if (!lex_force_match_id (lexer, "SSTYPE")) { lex_error (lexer, NULL); goto error; } - if ( ! lex_force_match (lexer, T_LPAREN)) + if (! lex_force_match (lexer, T_LPAREN)) { lex_error (lexer, NULL); goto error; } - if ( ! lex_force_int (lexer)) + if (! lex_force_int (lexer)) { lex_error (lexer, NULL); goto error; } glm.ss_type = lex_integer (lexer); - if (1 > glm.ss_type || 3 < glm.ss_type ) + if (1 > glm.ss_type || 3 < glm.ss_type) { msg (ME, _("Only types 1, 2 & 3 sums of squares are currently implemented")); goto error; @@ -277,7 +277,7 @@ cmd_glm (struct lexer *lexer, struct dataset *ds) lex_get (lexer); - if ( ! lex_force_match (lexer, T_RPAREN)) + if (! lex_force_match (lexer, T_RPAREN)) { lex_error (lexer, NULL); goto error; @@ -307,7 +307,7 @@ cmd_glm (struct lexer *lexer, struct dataset *ds) } } - if ( ! design ) + if (! design) { design_full (&glm); } @@ -423,7 +423,7 @@ ssq_type1 (struct covariance *cov, gsl_vector *ssq, const struct glm_spec *cmd) const struct interaction * x = categoricals_get_interaction_by_subscript (cats, i - cmd->n_dep_vars); - if ( x == cmd->interactions [k]) + if (x == cmd->interactions [k]) { model_dropped[i] = false; n_dropped_model--; @@ -441,7 +441,7 @@ ssq_type1 (struct covariance *cov, gsl_vector *ssq, const struct glm_spec *cmd) gsl_vector_set (ssq, k + 1, gsl_matrix_get (submodel_cov, 0, 0) - gsl_matrix_get (model_cov, 0, 0) - ); + ); gsl_matrix_free (model_cov); gsl_matrix_free (submodel_cov); @@ -484,7 +484,7 @@ ssq_type2 (struct covariance *cov, gsl_vector *ssq, const struct glm_spec *cmd) n_dropped_submodel++; submodel_dropped[i] = true; - if ( cmd->interactions [k]->n_vars < x->n_vars) + if (cmd->interactions [k]->n_vars < x->n_vars) { assert (n_dropped_model < covariance_dim (cov)); n_dropped_model++; @@ -504,7 +504,7 @@ ssq_type2 (struct covariance *cov, gsl_vector *ssq, const struct glm_spec *cmd) gsl_vector_set (ssq, k + 1, gsl_matrix_get (submodel_cov, 0, 0) - gsl_matrix_get (model_cov, 0, 0) - ); + ); gsl_matrix_free (model_cov); gsl_matrix_free (submodel_cov); @@ -548,7 +548,7 @@ ssq_type3 (struct covariance *cov, gsl_vector *ssq, const struct glm_spec *cmd) model_dropped[i] = false; - if ( cmd->interactions [k] == x) + if (cmd->interactions [k] == x) { assert (n_dropped_model < covariance_dim (cov)); n_dropped_model++; @@ -848,15 +848,15 @@ static bool parse_nested_variable (struct lexer *lexer, struct glm_spec *glm) { const struct variable *v = NULL; - if ( ! lex_match_variable (lexer, glm->dict, &v)) + if (! lex_match_variable (lexer, glm->dict, &v)) return false; if (lex_match (lexer, T_LPAREN)) { - if ( ! parse_nested_variable (lexer, glm)) + if (! parse_nested_variable (lexer, glm)) return false; - if ( ! lex_force_match (lexer, T_RPAREN)) + if (! lex_force_match (lexer, T_RPAREN)) return false; } @@ -877,7 +877,7 @@ parse_design_term (struct lexer *lexer, struct glm_spec *glm) return true; } - if ( parse_nested_variable (lexer, glm)) + if (parse_nested_variable (lexer, glm)) return true; return false; @@ -895,7 +895,7 @@ parse_design_spec (struct lexer *lexer, struct glm_spec *glm) if (lex_token (lexer) == T_ENDCMD || lex_token (lexer) == T_SLASH) return true; - if ( ! parse_design_term (lexer, glm)) + if (! parse_design_term (lexer, glm)) return false; lex_match (lexer, T_COMMA); diff --git a/src/language/stats/graph.c b/src/language/stats/graph.c index 0992627593..b60ed2fdff 100644 --- a/src/language/stats/graph.c +++ b/src/language/stats/graph.c @@ -374,7 +374,7 @@ show_histogr (const struct graph *cmd, struct casereader *input) moments_calculate (cmd->es[0].mom, &n, &mean, &var, NULL, NULL); chart_item_submit - ( histogram_chart_create (histogram->gsl_hist, + (histogram_chart_create (histogram->gsl_hist, ds_cstr (&label), n, mean, sqrt (var), cmd->normal)); @@ -402,7 +402,7 @@ run_barchart (struct graph *cmd, struct casereader *input) struct casereader *group; double ccc = 0.0; - if ( cmd->missing_pw == false) + if (cmd->missing_pw == false) input = casereader_create_filter_missing (input, cmd->dep_vars, cmd->n_dep_vars, @@ -587,7 +587,7 @@ run_graph (struct graph *cmd, struct casereader *input) /* Always remove cases listwise. This is correct for */ /* the histogram because there is only one variable */ /* and a simple bivariate scatterplot */ - /* if ( cmd->missing_pw == false) */ + /* if (cmd->missing_pw == false) */ input = casereader_create_filter_missing (input, cmd->dep_vars, cmd->n_dep_vars, diff --git a/src/language/stats/jonckheere-terpstra.c b/src/language/stats/jonckheere-terpstra.c index 7e8406f382..bc5c76f58e 100644 --- a/src/language/stats/jonckheere-terpstra.c +++ b/src/language/stats/jonckheere-terpstra.c @@ -125,7 +125,7 @@ u (const struct group_data *grp0, const struct group_data *grp1) else { #if 1 - usum += w0 * ( (grp1->cc - prev_cc1) / 2.0); + usum += w0 * ((grp1->cc - prev_cc1) / 2.0); #else usum += w0 * (grp1->cc - (prev_cc1 + cc1) / 2.0); #endif @@ -285,7 +285,7 @@ jonckheere_terpstra_execute (const struct dataset *ds, jt.levels = 0; jt.n = 0; for (; casegrouper_get_next_group (grouper, &group); - casereader_destroy (group) ) + casereader_destroy (group)) { struct casewriter *writer = autopaging_writer_create (proto); struct ccase *c; diff --git a/src/language/stats/jonckheere-terpstra.h b/src/language/stats/jonckheere-terpstra.h index 5bd54b1473..82b560a991 100644 --- a/src/language/stats/jonckheere-terpstra.h +++ b/src/language/stats/jonckheere-terpstra.h @@ -36,6 +36,6 @@ void jonckheere_terpstra_execute (const struct dataset *ds, const struct npar_test *test, bool exact, double timer - ); + ); #endif diff --git a/src/language/stats/kruskal-wallis.c b/src/language/stats/kruskal-wallis.c index ae6fffe205..61a05061fd 100644 --- a/src/language/stats/kruskal-wallis.c +++ b/src/language/stats/kruskal-wallis.c @@ -183,7 +183,7 @@ kruskal_wallis_execute (const struct dataset *ds, const size_t group_var_width = var_get_width (nst->indep_var); struct rank_entry *rank = find_rank_entry (&kw[i].map, group, group_var_width); - if ( NULL == rank) + if (NULL == rank) { rank = xzalloc (sizeof *rank); value_clone (&rank->group, group, group_var_width); @@ -214,7 +214,7 @@ kruskal_wallis_execute (const struct dataset *ds, total_n_groups ++; } - kw[i].h *= 12 / (n * ( n + 1)); + kw[i].h *= 12 / (n * (n + 1)); kw[i].h -= 3 * (n + 1) ; kw[i].h /= 1 - tiebreaker/ (pow3 (n) - n); diff --git a/src/language/stats/kruskal-wallis.h b/src/language/stats/kruskal-wallis.h index b067d3fdb2..1e16007f37 100644 --- a/src/language/stats/kruskal-wallis.h +++ b/src/language/stats/kruskal-wallis.h @@ -36,6 +36,6 @@ void kruskal_wallis_execute (const struct dataset *ds, const struct npar_test *test, bool exact, double timer - ); + ); #endif diff --git a/src/language/stats/logistic.c b/src/language/stats/logistic.c index 9794ed62c8..2cf440c31f 100644 --- a/src/language/stats/logistic.c +++ b/src/language/stats/logistic.c @@ -242,7 +242,7 @@ predictor_value (const struct ccase *c, /* - Return the probability beta_hat (that is the estimator logit(y) ) + Return the probability beta_hat (that is the estimator logit(y)) corresponding to the coefficient estimator for case C */ static double @@ -321,7 +321,7 @@ hessian (const struct lr_spec *cmd, } casereader_destroy (reader); - if ( max_w < cmd->min_epsilon) + if (max_w < cmd->min_epsilon) { *converged = true; msg (MN, _("All predicted values are either 1 or 0")); @@ -509,7 +509,7 @@ initial_pass (const struct lr_spec *cmd, struct lr_result *res, struct casereade } else if (!v1set) { - if ( !value_equal (&res->y0, depval, width)) + if (!value_equal (&res->y0, depval, width)) { value_clone (&res->y1, depval, width); v1set = true; @@ -520,7 +520,7 @@ initial_pass (const struct lr_spec *cmd, struct lr_result *res, struct casereade if (! value_equal (&res->y0, depval, width) && ! value_equal (&res->y1, depval, width) - ) + ) { msg (ME, _("Dependent variable's values are not dichotomous.")); case_unref (c); @@ -640,7 +640,7 @@ run_lr (const struct lr_spec *cmd, struct casereader *input, work.hessian = gsl_matrix_calloc (work.beta_hat->size, work.beta_hat->size); /* Start the Newton Raphson iteration process... */ - for( i = 0 ; i < cmd->max_iter ; ++i) + for(i = 0 ; i < cmd->max_iter ; ++i) { double min, max; gsl_vector *v ; @@ -669,7 +669,7 @@ run_lr (const struct lr_spec *cmd, struct casereader *input, gsl_vector_minmax (delta, &min, &max); - if ( fabs (min) < cmd->bcon && fabs (max) < cmd->bcon) + if (fabs (min) < cmd->bcon && fabs (max) < cmd->bcon) { msg (MN, _("Estimation terminated at iteration number %d because parameter estimates changed by less than %g"), i + 1, cmd->bcon); @@ -697,8 +697,8 @@ run_lr (const struct lr_spec *cmd, struct casereader *input, - if ( ! converged) - msg (MW, _("Estimation terminated at iteration number %d because maximum iterations has been reached"), i ); + if (! converged) + msg (MW, _("Estimation terminated at iteration number %d because maximum iterations has been reached"), i); output_model_summary (&work, initial_log_likelihood, log_likelihood); @@ -883,7 +883,7 @@ cmd_logistic (struct lexer *lexer, struct dataset *ds) } lr.confidence = lex_number (lexer); lex_get (lexer); - if ( ! lex_force_match (lexer, T_RPAREN)) + if (! lex_force_match (lexer, T_RPAREN)) { lex_error (lexer, NULL); goto error; @@ -917,7 +917,7 @@ cmd_logistic (struct lexer *lexer, struct dataset *ds) } lr.bcon = lex_number (lexer); lex_get (lexer); - if ( ! lex_force_match (lexer, T_RPAREN)) + if (! lex_force_match (lexer, T_RPAREN)) { lex_error (lexer, NULL); goto error; @@ -935,7 +935,7 @@ cmd_logistic (struct lexer *lexer, struct dataset *ds) } lr.max_iter = lex_integer (lexer); lex_get (lexer); - if ( ! lex_force_match (lexer, T_RPAREN)) + if (! lex_force_match (lexer, T_RPAREN)) { lex_error (lexer, NULL); goto error; @@ -953,7 +953,7 @@ cmd_logistic (struct lexer *lexer, struct dataset *ds) } lr.lcon = lex_number (lexer); lex_get (lexer); - if ( ! lex_force_match (lexer, T_RPAREN)) + if (! lex_force_match (lexer, T_RPAREN)) { lex_error (lexer, NULL); goto error; @@ -971,7 +971,7 @@ cmd_logistic (struct lexer *lexer, struct dataset *ds) } lr.min_epsilon = lex_number (lexer); lex_get (lexer); - if ( ! lex_force_match (lexer, T_RPAREN)) + if (! lex_force_match (lexer, T_RPAREN)) { lex_error (lexer, NULL); goto error; @@ -995,7 +995,7 @@ cmd_logistic (struct lexer *lexer, struct dataset *ds) goto error; } lex_get (lexer); - if ( ! lex_force_match (lexer, T_RPAREN)) + if (! lex_force_match (lexer, T_RPAREN)) { lex_error (lexer, NULL); goto error; @@ -1312,7 +1312,7 @@ output_model_summary (const struct lr_result *res, double entries[] = { -2 * log_likelihood, cox, - cox / ( 1.0 - exp(initial_log_likelihood * (2 / res->cc))) + cox / (1.0 - exp(initial_log_likelihood * (2 / res->cc))) }; for (size_t i = 0; i < sizeof entries / sizeof *entries; i++) pivot_table_put2 (table, i, 0, pivot_value_new_number (entries[i])); diff --git a/src/language/stats/mann-whitney.c b/src/language/stats/mann-whitney.c index ad3a95733e..eced71f911 100644 --- a/src/language/stats/mann-whitney.c +++ b/src/language/stats/mann-whitney.c @@ -68,10 +68,10 @@ belongs_to_test (const struct ccase *c, void *aux) const union value *group = case_data (c, nst->indep_var); const size_t group_var_width = var_get_width (nst->indep_var); - if ( value_equal (group, &nst->val1, group_var_width)) + if (value_equal (group, &nst->val1, group_var_width)) return true; - if ( value_equal (group, &nst->val2, group_var_width)) + if (value_equal (group, &nst->val2, group_var_width)) return true; return false; @@ -129,12 +129,12 @@ mann_whitney_execute (const struct dataset *ds, const size_t group_var_width = var_get_width (nst->indep_var); const double rank = case_data_idx (c, rank_idx)->f; - if ( value_equal (group, &nst->val1, group_var_width)) + if (value_equal (group, &nst->val1, group_var_width)) { mw[i].rank_sum[0] += rank; mw[i].n[0] += dict_get_case_weight (dict, c, &warn); } - else if ( value_equal (group, &nst->val2, group_var_width)) + else if (value_equal (group, &nst->val2, group_var_width)) { mw[i].rank_sum[1] += rank; mw[i].n[1] += dict_get_case_weight (dict, c, &warn); @@ -152,7 +152,7 @@ mann_whitney_execute (const struct dataset *ds, mwv->u -= mwv->rank_sum[0]; mwv->w = mwv->rank_sum[1]; - if ( mwv->u > mwv->n[0] * mwv->n[1] / 2.0) + if (mwv->u > mwv->n[0] * mwv->n[1] / 2.0) { mwv->u = mwv->n[0] * mwv->n[1] - mwv->u; mwv->w = mwv->rank_sum[0]; diff --git a/src/language/stats/mann-whitney.h b/src/language/stats/mann-whitney.h index aad691c60d..e261955889 100644 --- a/src/language/stats/mann-whitney.h +++ b/src/language/stats/mann-whitney.h @@ -36,6 +36,6 @@ void mann_whitney_execute (const struct dataset *ds, const struct npar_test *test, bool exact, double timer - ); + ); #endif diff --git a/src/language/stats/mcnemar.c b/src/language/stats/mcnemar.c index 7ee52f4313..dbe5813ae4 100644 --- a/src/language/stats/mcnemar.c +++ b/src/language/stats/mcnemar.c @@ -85,7 +85,7 @@ mcnemar_execute (const struct dataset *ds, struct mcnemar *mc = xcalloc (t2s->n_pairs, sizeof *mc); - for (i = 0 ; i < t2s->n_pairs; ++i ) + for (i = 0 ; i < t2s->n_pairs; ++i) { mc[i].val0.f = mc[i].val1.f = SYSMIS; } @@ -94,7 +94,7 @@ mcnemar_execute (const struct dataset *ds, { const double weight = dict_get_case_weight (dict, c, &warn); - for (i = 0 ; i < t2s->n_pairs; ++i ) + for (i = 0 ; i < t2s->n_pairs; ++i) { variable_pair *vp = &t2s->pairs[i]; const union value *value0 = case_data (c, (*vp)[0]); @@ -107,7 +107,7 @@ mcnemar_execute (const struct dataset *ds, continue; - if ( mc[i].val0.f == SYSMIS) + if (mc[i].val0.f == SYSMIS) { if (mc[i].val1.f != value0->f) mc[i].val0.f = value0->f; @@ -115,7 +115,7 @@ mcnemar_execute (const struct dataset *ds, mc[i].val0.f = value1->f; } - if ( mc[i].val1.f == SYSMIS) + if (mc[i].val1.f == SYSMIS) { if (mc[i].val0.f != value1->f) mc[i].val1.f = value1->f; @@ -127,15 +127,15 @@ mcnemar_execute (const struct dataset *ds, { mc[i].n00 += weight; } - else if ( mc[i].val0.f == value0->f && mc[i].val1.f == value1->f) + else if (mc[i].val0.f == value0->f && mc[i].val1.f == value1->f) { mc[i].n10 += weight; } - else if ( mc[i].val1.f == value0->f && mc[i].val0.f == value1->f) + else if (mc[i].val1.f == value0->f && mc[i].val0.f == value1->f) { mc[i].n01 += weight; } - else if ( mc[i].val1.f == value0->f && mc[i].val1.f == value1->f) + else if (mc[i].val1.f == value0->f && mc[i].val1.f == value1->f) { mc[i].n11 += weight; } diff --git a/src/language/stats/means-calc.c b/src/language/stats/means-calc.c index eb613ba48d..6aabbf50cb 100644 --- a/src/language/stats/means-calc.c +++ b/src/language/stats/means-calc.c @@ -91,7 +91,7 @@ simple_destroy (struct statistic *stat UNUSED) /* HARMONIC MEAN: The reciprocal of the sum of the reciprocals: - 1 / ( 1/(x_0) + 1/(x_1) + ... + 1/(x_{n-1}) ) */ + 1 / (1/(x_0) + 1/(x_1) + ... + 1/(x_{n-1})) */ struct harmonic_mean { diff --git a/src/language/stats/means-parser.c b/src/language/stats/means-parser.c index 0c5916a452..6bbae89385 100644 --- a/src/language/stats/means-parser.c +++ b/src/language/stats/means-parser.c @@ -79,7 +79,7 @@ lex_is_variable (struct lexer *lexer, const struct dictionary *dict, tstr = lex_next_tokcstr (lexer, n); - if (NULL == dict_lookup_var (dict, tstr) ) + if (NULL == dict_lookup_var (dict, tstr)) return false; return true; @@ -111,9 +111,9 @@ means_parse (struct lexer *lexer, struct means *means) /* Look ahead to see if there are more tables to be parsed */ more_tables = false; - if ( T_SLASH == lex_next_token (lexer, 0) ) + if (T_SLASH == lex_next_token (lexer, 0)) { - if (lex_is_variable (lexer, means->dict, 1) ) + if (lex_is_variable (lexer, means->dict, 1)) { more_tables = true; lex_match (lexer, T_SLASH); diff --git a/src/language/stats/median.c b/src/language/stats/median.c index 0f1ecd2948..9cba44dfd5 100644 --- a/src/language/stats/median.c +++ b/src/language/stats/median.c @@ -145,7 +145,7 @@ median_execute (const struct dataset *ds, var_get_width (nst->indep_var), 0)); } - if ( median == SYSMIS) + if (median == SYSMIS) { struct percentile *ptl; struct order_stats *os; @@ -157,9 +157,9 @@ median_execute (const struct dataset *ds, rr = casereader_clone (r); writer = sort_create_writer (&sc, casereader_get_proto (rr)); - for (; (c = casereader_read (rr)) != NULL; ) + for (; (c = casereader_read (rr)) != NULL;) { - if ( var_is_value_missing (var, case_data (c, var), exclude)) + if (var_is_value_missing (var, case_data (c, var), exclude)) { case_unref (c); continue; @@ -196,7 +196,7 @@ median_execute (const struct dataset *ds, const union value *val = case_data (c, var); const union value *indep_val = case_data (c, nst->indep_var); - if ( var_is_value_missing (var, case_data (c, var), exclude)) + if (var_is_value_missing (var, case_data (c, var), exclude)) { continue; } @@ -209,16 +209,16 @@ median_execute (const struct dataset *ds, value_compare_3way (indep_val, &nst->val1, width) < 0 || value_compare_3way (indep_val, &nst->val2, width) > 0 - ) + ) { continue; } } vn = find_value (&map, indep_val, nst->indep_var); - if ( vn == NULL) + if (vn == NULL) { - if ( n_sample_test == true) + if (n_sample_test == true) { int width = var_get_width (nst->indep_var); vn = xzalloc (sizeof *vn); diff --git a/src/language/stats/median.h b/src/language/stats/median.h index 236984cf63..aefa379753 100644 --- a/src/language/stats/median.h +++ b/src/language/stats/median.h @@ -36,6 +36,6 @@ void median_execute (const struct dataset *ds, const struct npar_test *test, bool exact, double timer - ); + ); #endif diff --git a/src/language/stats/npar.c b/src/language/stats/npar.c index 1d369eca44..eada5d1649 100644 --- a/src/language/stats/npar.c +++ b/src/language/stats/npar.c @@ -149,7 +149,7 @@ static int npar_method (struct lexer *, struct npar_specs *); /* Command parsing functions. */ static int parse_npar_tests (struct lexer *lexer, struct dataset *ds, struct cmd_npar_tests *p, - struct npar_specs *npar_specs ); + struct npar_specs *npar_specs); static int parse_npar_tests (struct lexer *lexer, struct dataset *ds, struct cmd_npar_tests *npt, @@ -487,7 +487,7 @@ parse_npar_tests (struct lexer *lexer, struct dataset *ds, struct cmd_npar_tests lex_match (lexer, T_COMMA); } } - else if ( settings_get_syntax () != COMPATIBLE && lex_match_id (lexer, "ALGORITHM")) + else if (settings_get_syntax () != COMPATIBLE && lex_match_id (lexer, "ALGORITHM")) { lex_match (lexer, T_EQUALS); if (lex_match_id (lexer, "COMPATIBLE")) @@ -528,10 +528,10 @@ npar_execute (struct casereader *input, int t; struct descriptives *summary_descriptives = NULL; - for ( t = 0 ; t < specs->n_tests; ++t ) + for (t = 0 ; t < specs->n_tests; ++t) { const struct npar_test *test = specs->test[t]; - if ( NULL == test->execute ) + if (NULL == test->execute) { msg (SW, _("%s subcommand not currently implemented."), "NPAR"); continue; @@ -551,8 +551,8 @@ npar_execute (struct casereader *input, specs->filter); } - if ( (specs->descriptives || specs->quartiles) - && !taint_has_tainted_successor (casereader_get_taint (input)) ) + if ((specs->descriptives || specs->quartiles) + && !taint_has_tainted_successor (casereader_get_taint (input))) do_summary_box (summary_descriptives, specs->vv, specs->n_vars, dict_get_weight_format (dataset_dict (ds))); @@ -577,13 +577,13 @@ cmd_npar_tests (struct lexer *lexer, struct dataset *ds) npar_specs.n_vars = -1; npar_specs.vv = NULL; - if ( ! parse_npar_tests (lexer, ds, &cmd, &npar_specs) ) + if (! parse_npar_tests (lexer, ds, &cmd, &npar_specs)) { pool_destroy (npar_specs.pool); return CMD_FAILURE; } - for (i = 0; i < npar_specs.n_tests; ++i ) + for (i = 0; i < npar_specs.n_tests; ++i) { const struct npar_test *test = npar_specs.test[i]; test->insert_variables (test, &var_map); @@ -605,15 +605,15 @@ cmd_npar_tests (struct lexer *lexer, struct dataset *ds) sort (npar_specs.vv, npar_specs.n_vars, sizeof (*npar_specs.vv), compare_var_ptrs_by_name, NULL); - if ( cmd.statistics ) + if (cmd.statistics) { int i; - for ( i = 0 ; i < NPAR_ST_count; ++i ) + for (i = 0 ; i < NPAR_ST_count; ++i) { - if ( cmd.a_statistics[i] ) + if (cmd.a_statistics[i]) { - switch ( i ) + switch (i) { case NPAR_ST_DESCRIPTIVES: npar_specs.descriptives = true; @@ -633,7 +633,7 @@ cmd_npar_tests (struct lexer *lexer, struct dataset *ds) } input = proc_open (ds); - if ( cmd.miss == MISS_LISTWISE ) + if (cmd.miss == MISS_LISTWISE) { input = casereader_create_filter_missing (input, npar_specs.vv, @@ -666,9 +666,9 @@ npar_runs (struct lexer *lexer, struct dataset *ds, nt->execute = runs_execute; nt->insert_variables = one_sample_insert_variables; - if ( lex_force_match (lexer, T_LPAREN) ) + if (lex_force_match (lexer, T_LPAREN)) { - if ( lex_match_id (lexer, "MEAN")) + if (lex_match_id (lexer, "MEAN")) { rt->cp_mode = CP_MEAN; } @@ -830,16 +830,16 @@ npar_chisquare (struct lexer *lexer, struct dataset *ds, cstp->ranged = false; - if ( lex_match (lexer, T_LPAREN)) + if (lex_match (lexer, T_LPAREN)) { cstp->ranged = true; - if ( ! lex_force_num (lexer)) return 0; + if (! lex_force_num (lexer)) return 0; cstp->lo = lex_number (lexer); lex_get (lexer); if (! lex_force_match (lexer, T_COMMA)) return 0; - if (! lex_force_num (lexer) ) return 0; + if (! lex_force_num (lexer)) return 0; cstp->hi = lex_number (lexer); - if ( cstp->lo >= cstp->hi ) + if (cstp->lo >= cstp->hi) { msg (ME, _("The specified value of HI (%d) is " @@ -856,17 +856,17 @@ npar_chisquare (struct lexer *lexer, struct dataset *ds, if (lex_match_phrase (lexer, "/EXPECTED")) { if (! lex_force_match (lexer, T_EQUALS)) return 0; - if (! lex_match_id (lexer, "EQUAL") ) + if (! lex_match_id (lexer, "EQUAL")) { double f; int n; - while ( lex_is_number (lexer) ) + while (lex_is_number (lexer)) { int i; n = 1; f = lex_number (lexer); lex_get (lexer); - if ( lex_match (lexer, T_ASTERISK)) + if (lex_match (lexer, T_ASTERISK)) { n = f; if (!lex_force_num (lexer)) @@ -881,17 +881,17 @@ npar_chisquare (struct lexer *lexer, struct dataset *ds, cstp->expected, sizeof (double) * cstp->n_expected); - for ( i = cstp->n_expected - n ; + for (i = cstp->n_expected - n ; i < cstp->n_expected; - ++i ) + ++i) cstp->expected[i] = f; } } } - if ( cstp->ranged && cstp->n_expected > 0 && - cstp->n_expected != cstp->hi - cstp->lo + 1 ) + if (cstp->ranged && cstp->n_expected > 0 && + cstp->n_expected != cstp->hi - cstp->lo + 1) { msg (ME, _("%d expected values were given, but the specified " @@ -928,10 +928,10 @@ npar_binomial (struct lexer *lexer, struct dataset *ds, btp->p = 0.5; - if ( lex_match (lexer, T_LPAREN) ) + if (lex_match (lexer, T_LPAREN)) { equals = false; - if ( lex_force_num (lexer) ) + if (lex_force_num (lexer)) { btp->p = lex_number (lexer); lex_get (lexer); @@ -951,7 +951,7 @@ npar_binomial (struct lexer *lexer, struct dataset *ds, { if (parse_variables_const_pool (lexer, specs->pool, dataset_dict (ds), &tp->vars, &tp->n_vars, - PV_NUMERIC | PV_NO_SCRATCH | PV_NO_DUPLICATE) ) + PV_NUMERIC | PV_NO_SCRATCH | PV_NO_DUPLICATE)) { if (lex_match (lexer, T_LPAREN)) { @@ -959,9 +959,9 @@ npar_binomial (struct lexer *lexer, struct dataset *ds, return 2; btp->category1 = lex_number (lexer); lex_get (lexer); - if ( lex_match (lexer, T_COMMA)) + if (lex_match (lexer, T_COMMA)) { - if ( ! lex_force_num (lexer) ) return 2; + if (! lex_force_num (lexer)) return 2; btp->category2 = lex_number (lexer); lex_get (lexer); } @@ -1002,7 +1002,7 @@ ks_one_sample_parse_params (struct lexer *lexer, struct ks_one_sample_test *kst, kst->p[0] = lex_number (lexer); lex_get (lexer); - if ( params == 2) + if (params == 2) { lex_match (lexer, T_COMMA); if (lex_force_num (lexer)) @@ -1059,7 +1059,7 @@ npar_ks_one_sample (struct lexer *lexer, struct dataset *ds, struct npar_specs * if (! parse_variables_const_pool (lexer, specs->pool, dataset_dict (ds), &tp->vars, &tp->n_vars, - PV_NUMERIC | PV_NO_SCRATCH | PV_NO_DUPLICATE) ) + PV_NUMERIC | PV_NO_SCRATCH | PV_NO_DUPLICATE)) return 2; specs->n_tests++; @@ -1093,15 +1093,15 @@ parse_two_sample_related_test (struct lexer *lexer, if (!parse_variables_const_pool (lexer, pool, dict, &vlist1, &n_vlist1, - PV_NUMERIC | PV_NO_SCRATCH | PV_DUPLICATE) ) + PV_NUMERIC | PV_NO_SCRATCH | PV_DUPLICATE)) return false; - if ( lex_match (lexer, T_WITH)) + if (lex_match (lexer, T_WITH)) { with = true; - if ( !parse_variables_const_pool (lexer, pool, dict, + if (!parse_variables_const_pool (lexer, pool, dict, &vlist2, &n_vlist2, - PV_NUMERIC | PV_NO_SCRATCH | PV_DUPLICATE) ) + PV_NUMERIC | PV_NO_SCRATCH | PV_DUPLICATE)) return false; paired = (lex_match (lexer, T_LPAREN) && @@ -1109,11 +1109,11 @@ parse_two_sample_related_test (struct lexer *lexer, } - if ( with ) + if (with) { if (paired) { - if ( n_vlist1 != n_vlist2) + if (n_vlist1 != n_vlist2) { msg (SE, _("PAIRED was specified but the number of variables " "preceding WITH (%zu) did not match the number " @@ -1134,15 +1134,15 @@ parse_two_sample_related_test (struct lexer *lexer, } test_parameters->pairs = - pool_alloc (pool, sizeof ( variable_pair) * test_parameters->n_pairs); + pool_alloc (pool, sizeof (variable_pair) * test_parameters->n_pairs); - if ( with ) + if (with) { if (paired) { int i; assert (n_vlist1 == n_vlist2); - for ( i = 0 ; i < n_vlist1; ++i ) + for (i = 0 ; i < n_vlist1; ++i) { test_parameters->pairs[n][0] = vlist1[i]; test_parameters->pairs[n][1] = vlist2[i]; @@ -1152,9 +1152,9 @@ parse_two_sample_related_test (struct lexer *lexer, else { int i,j; - for ( i = 0 ; i < n_vlist1; ++i ) + for (i = 0 ; i < n_vlist1; ++i) { - for ( j = 0 ; j < n_vlist2; ++j ) + for (j = 0 ; j < n_vlist2; ++j) { test_parameters->pairs[n][0] = vlist1[i]; test_parameters->pairs[n][1] = vlist2[j]; @@ -1166,11 +1166,11 @@ parse_two_sample_related_test (struct lexer *lexer, else { int i,j; - for ( i = 0 ; i < n_vlist1 - 1; ++i ) + for (i = 0 ; i < n_vlist1 - 1; ++i) { - for ( j = i + 1 ; j < n_vlist1; ++j ) + for (j = i + 1 ; j < n_vlist1; ++j) { - assert ( n < test_parameters->n_pairs); + assert (n < test_parameters->n_pairs); test_parameters->pairs[n][0] = vlist1[i]; test_parameters->pairs[n][1] = vlist1[j]; n++; @@ -1178,7 +1178,7 @@ parse_two_sample_related_test (struct lexer *lexer, } } - assert ( n == test_parameters->n_pairs); + assert (n == test_parameters->n_pairs); return true; } @@ -1189,26 +1189,26 @@ parse_n_sample_related_test (struct lexer *lexer, const struct dictionary *dict, struct n_sample_test *nst, struct pool *pool - ) + ) { if (!parse_variables_const_pool (lexer, pool, dict, &nst->vars, &nst->n_vars, - PV_NUMERIC | PV_NO_SCRATCH | PV_NO_DUPLICATE) ) + PV_NUMERIC | PV_NO_SCRATCH | PV_NO_DUPLICATE)) return false; - if ( ! lex_force_match (lexer, T_BY)) + if (! lex_force_match (lexer, T_BY)) return false; nst->indep_var = parse_variable_const (lexer, dict); if (!nst->indep_var) return false; - if ( ! lex_force_match (lexer, T_LPAREN)) + if (! lex_force_match (lexer, T_LPAREN)) return false; value_init (&nst->val1, var_get_width (nst->indep_var)); - if ( ! parse_value (lexer, &nst->val1, nst->indep_var)) + if (! parse_value (lexer, &nst->val1, nst->indep_var)) { value_destroy (&nst->val1, var_get_width (nst->indep_var)); return false; @@ -1217,13 +1217,13 @@ parse_n_sample_related_test (struct lexer *lexer, lex_match (lexer, T_COMMA); value_init (&nst->val2, var_get_width (nst->indep_var)); - if ( ! parse_value (lexer, &nst->val2, nst->indep_var)) + if (! parse_value (lexer, &nst->val2, nst->indep_var)) { value_destroy (&nst->val2, var_get_width (nst->indep_var)); return false; } - if ( ! lex_force_match (lexer, T_RPAREN)) + if (! lex_force_match (lexer, T_RPAREN)) return false; return true; @@ -1232,14 +1232,14 @@ parse_n_sample_related_test (struct lexer *lexer, static int npar_wilcoxon (struct lexer *lexer, struct dataset *ds, - struct npar_specs *specs ) + struct npar_specs *specs) { struct two_sample_test *tp = pool_alloc (specs->pool, sizeof (*tp)); struct npar_test *nt = &tp->parent; nt->execute = wilcoxon_execute; if (!parse_two_sample_related_test (lexer, dataset_dict (ds), - tp, specs->pool) ) + tp, specs->pool)) return 0; specs->n_tests++; @@ -1255,7 +1255,7 @@ npar_wilcoxon (struct lexer *lexer, static int npar_mann_whitney (struct lexer *lexer, struct dataset *ds, - struct npar_specs *specs ) + struct npar_specs *specs) { struct n_sample_test *tp = pool_alloc (specs->pool, sizeof (*tp)); struct npar_test *nt = &tp->parent; @@ -1264,7 +1264,7 @@ npar_mann_whitney (struct lexer *lexer, nt->execute = mann_whitney_execute; if (!parse_n_sample_related_test (lexer, dataset_dict (ds), - tp, specs->pool) ) + tp, specs->pool)) return 0; specs->n_tests++; @@ -1288,7 +1288,7 @@ npar_median (struct lexer *lexer, mt->median = SYSMIS; - if ( lex_match (lexer, T_LPAREN) && lex_force_num (lexer)) + if (lex_match (lexer, T_LPAREN) && lex_force_num (lexer)) { mt->median = lex_number (lexer); lex_get (lexer); @@ -1302,7 +1302,7 @@ npar_median (struct lexer *lexer, nt->execute = median_execute; if (!parse_n_sample_related_test (lexer, dataset_dict (ds), - tp, specs->pool) ) + tp, specs->pool)) return 0; specs->n_tests++; @@ -1325,7 +1325,7 @@ npar_sign (struct lexer *lexer, struct dataset *ds, nt->execute = sign_execute; if (!parse_two_sample_related_test (lexer, dataset_dict (ds), - tp, specs->pool) ) + tp, specs->pool)) return 0; specs->n_tests++; @@ -1348,7 +1348,7 @@ npar_mcnemar (struct lexer *lexer, struct dataset *ds, nt->execute = mcnemar_execute; if (!parse_two_sample_related_test (lexer, dataset_dict (ds), - tp, specs->pool) ) + tp, specs->pool)) return 0; specs->n_tests++; @@ -1373,7 +1373,7 @@ npar_jonckheere_terpstra (struct lexer *lexer, struct dataset *ds, nt->execute = jonckheere_terpstra_execute; if (!parse_n_sample_related_test (lexer, dataset_dict (ds), - tp, specs->pool) ) + tp, specs->pool)) return 0; specs->n_tests++; @@ -1397,7 +1397,7 @@ npar_kruskal_wallis (struct lexer *lexer, struct dataset *ds, nt->execute = kruskal_wallis_execute; if (!parse_n_sample_related_test (lexer, dataset_dict (ds), - tp, specs->pool) ) + tp, specs->pool)) return 0; specs->n_tests++; @@ -1418,7 +1418,7 @@ insert_variable_into_map (struct hmapx *var_map, const struct variable *var) HMAPX_FOR_EACH_WITH_HASH (v, node, hash, var_map) { - if ( v == var) + if (v == var) return ; } @@ -1433,7 +1433,7 @@ one_sample_insert_variables (const struct npar_test *test, int i; const struct one_sample_test *ost = UP_CAST (test, const struct one_sample_test, parent); - for ( i = 0 ; i < ost->n_vars ; ++i ) + for (i = 0 ; i < ost->n_vars ; ++i) insert_variable_into_map (var_map, ost->vars[i]); } @@ -1445,7 +1445,7 @@ two_sample_insert_variables (const struct npar_test *test, int i; const struct two_sample_test *tst = UP_CAST (test, const struct two_sample_test, parent); - for ( i = 0 ; i < tst->n_pairs ; ++i ) + for (i = 0 ; i < tst->n_pairs ; ++i) { variable_pair *pair = &tst->pairs[i]; @@ -1461,7 +1461,7 @@ n_sample_insert_variables (const struct npar_test *test, int i; const struct n_sample_test *tst = UP_CAST (test, const struct n_sample_test, parent); - for ( i = 0 ; i < tst->n_vars ; ++i ) + for (i = 0 ; i < tst->n_vars ; ++i) insert_variable_into_map (var_map, tst->vars[i]); insert_variable_into_map (var_map, tst->indep_var); @@ -1471,7 +1471,7 @@ n_sample_insert_variables (const struct npar_test *test, static int npar_method (struct lexer *lexer, struct npar_specs *specs) { - if ( lex_match_id (lexer, "EXACT") ) + if (lex_match_id (lexer, "EXACT")) { specs->exact = true; specs->timer = 0.0; @@ -1479,9 +1479,9 @@ npar_method (struct lexer *lexer, struct npar_specs *specs) { specs->timer = 5.0; - if ( lex_match (lexer, T_LPAREN)) + if (lex_match (lexer, T_LPAREN)) { - if (lex_force_num (lexer) ) + if (lex_force_num (lexer)) { specs->timer = lex_number (lexer); lex_get (lexer); diff --git a/src/language/stats/oneway.c b/src/language/stats/oneway.c index c33d333ce4..3665211a1c 100644 --- a/src/language/stats/oneway.c +++ b/src/language/stats/oneway.c @@ -168,7 +168,7 @@ df_individual (const struct per_var_ws *pvw UNUSED, const struct moments1 *mom_i moments1_calculate (mom_i, &n_i, NULL, &var_i, 0, 0); moments1_calculate (mom_j, &n_j, NULL, &var_j, 0, 0); - if ( n_i <= 1.0 || n_j <= 1.0) + if (n_i <= 1.0 || n_j <= 1.0) return SYSMIS; nom = pow2 (var_i/n_i + var_j/n_j); @@ -191,13 +191,13 @@ static double bonferroni_pinv (double std_err, double alpha, double df, int k, c static double sidak_pinv (double std_err, double alpha, double df, int k, const struct moments1 *mom_i UNUSED, const struct moments1 *mom_j UNUSED) { const double m = k * (k - 1) / 2; - double lp = 1.0 - exp (log (1.0 - alpha) / m ) ; + double lp = 1.0 - exp (log (1.0 - alpha) / m) ; return std_err * gsl_cdf_tdist_Pinv (1.0 - lp / 2.0, df); } static double tukey_pinv (double std_err, double alpha, double df, int k, const struct moments1 *mom_i UNUSED, const struct moments1 *mom_j UNUSED) { - if ( k < 2 || df < 2) + if (k < 2 || df < 2) return SYSMIS; return std_err / sqrt (2.0) * qtukey (1 - alpha, 1.0, k, df, 1, 0); @@ -220,7 +220,7 @@ static double gh_pinv (double std_err UNUSED, double alpha, double df, int k, co m = sqrt ((var_i/n_i + var_j/n_j) / 2.0); - if ( k < 2 || df < 2) + if (k < 2 || df < 2) return SYSMIS; return m * qtukey (1 - alpha, 1.0, k, df, 1, 0); @@ -236,7 +236,7 @@ multiple_comparison_sig (double std_err, int k = pvw->n_groups; double df = ph->dff (pvw, dd_i->mom, dd_j->mom); double ts = ph->tsf (k, dd_i->mom, dd_j->mom, std_err); - if ( df == SYSMIS) + if (df == SYSMIS) return SYSMIS; return ph->p1f (ts, k - 1, df); } @@ -246,7 +246,7 @@ mc_half_range (const struct oneway_spec *cmd, const struct per_var_ws *pvw, doub { int k = pvw->n_groups; double df = ph->dff (pvw, dd_i->mom, dd_j->mom); - if ( df == SYSMIS) + if (df == SYSMIS) return SYSMIS; return ph->pinv (std_err, cmd->alpha, df, k, dd_i->mom, dd_j->mom); @@ -438,7 +438,7 @@ cmd_oneway (struct lexer *lexer, struct dataset *ds) ll_init (&oneway.contrast_list); - if ( lex_match (lexer, T_SLASH)) + if (lex_match (lexer, T_SLASH)) { if (!lex_force_match_id (lexer, "VARIABLES")) { @@ -501,17 +501,17 @@ cmd_oneway (struct lexer *lexer, struct dataset *ds) break; } } - if ( method == false) + if (method == false) { if (lex_match_id (lexer, "ALPHA")) { - if ( !lex_force_match (lexer, T_LPAREN)) + if (!lex_force_match (lexer, T_LPAREN)) goto error; if (! lex_force_num (lexer)) goto error; oneway.alpha = lex_number (lexer); lex_get (lexer); - if ( !lex_force_match (lexer, T_RPAREN)) + if (!lex_force_match (lexer, T_RPAREN)) goto error; } else @@ -534,7 +534,7 @@ cmd_oneway (struct lexer *lexer, struct dataset *ds) while (lex_token (lexer) != T_ENDCMD && lex_token (lexer) != T_SLASH) { - if ( lex_is_number (lexer)) + if (lex_is_number (lexer)) { struct coeff_node *cc = xmalloc (sizeof *cc); cc->coeff = lex_number (lexer); @@ -550,7 +550,7 @@ cmd_oneway (struct lexer *lexer, struct dataset *ds) } } - if ( ll_count (coefficient_list) <= 0) + if (ll_count (coefficient_list) <= 0) { destroy_coeff_list (cl); goto error; @@ -769,9 +769,9 @@ run_oneway (const struct oneway_spec *cmd, const struct variable *v = cmd->vars[i]; const union value *val = case_data (c, v); - if ( MISS_ANALYSIS == cmd->missing_type) + if (MISS_ANALYSIS == cmd->missing_type) { - if ( var_is_value_missing (v, val, cmd->exclude)) + if (var_is_value_missing (v, val, cmd->exclude)) continue; } @@ -782,7 +782,7 @@ run_oneway (const struct oneway_spec *cmd, casereader_destroy (reader); reader = casereader_clone (input); - for ( ; (c = casereader_read (reader) ); case_unref (c)) + for (; (c = casereader_read (reader)); case_unref (c)) { int i; double w = dict_get_case_weight (dict, c, NULL); @@ -792,9 +792,9 @@ run_oneway (const struct oneway_spec *cmd, const struct variable *v = cmd->vars[i]; const union value *val = case_data (c, v); - if ( MISS_ANALYSIS == cmd->missing_type) + if (MISS_ANALYSIS == cmd->missing_type) { - if ( var_is_value_missing (v, val, cmd->exclude)) + if (var_is_value_missing (v, val, cmd->exclude)) continue; } @@ -805,7 +805,7 @@ run_oneway (const struct oneway_spec *cmd, casereader_destroy (reader); reader = casereader_clone (input); - for ( ; (c = casereader_read (reader) ); case_unref (c)) + for (; (c = casereader_read (reader)); case_unref (c)) { int i; double w = dict_get_case_weight (dict, c, NULL); @@ -816,9 +816,9 @@ run_oneway (const struct oneway_spec *cmd, const struct variable *v = cmd->vars[i]; const union value *val = case_data (c, v); - if ( MISS_ANALYSIS == cmd->missing_type) + if (MISS_ANALYSIS == cmd->missing_type) { - if ( var_is_value_missing (v, val, cmd->exclude)) + if (var_is_value_missing (v, val, cmd->exclude)) continue; } @@ -836,7 +836,7 @@ run_oneway (const struct oneway_spec *cmd, const struct categoricals *cats = covariance_get_categoricals (pvw->cov); const bool ok = categoricals_sane (cats); - if ( ! ok) + if (! ok) { msg (MW, _("Dependent variable %s has no non-missing values. No analysis for this variable will be done."), @@ -869,7 +869,7 @@ run_oneway (const struct oneway_spec *cmd, { const struct categoricals *cats = covariance_get_categoricals (ws.vws[v].cov); - if ( ! categoricals_is_complete (cats)) + if (! categoricals_is_complete (cats)) { continue; } @@ -932,7 +932,7 @@ output_oneway (const struct oneway_spec *cmd, struct oneway_workspace *ws) ll_for_each (cn, struct coeff_node, ll, cl) sum += cn->coeff; - if ( sum != 0.0 ) + if (sum != 0.0) msg (SW, _("Coefficients for contrast %zu do not total zero"), i); } @@ -950,14 +950,14 @@ output_oneway (const struct oneway_spec *cmd, struct oneway_workspace *ws) show_contrast_tests (cmd, ws); } - if ( cmd->posthoc ) + if (cmd->posthoc) { int v; for (v = 0 ; v < cmd->n_vars; ++v) { const struct categoricals *cats = covariance_get_categoricals (ws->vws[v].cov); - if ( categoricals_is_complete (cats)) + if (categoricals_is_complete (cats)) show_comparisons (cmd, ws, v); } } diff --git a/src/language/stats/quick-cluster.c b/src/language/stats/quick-cluster.c index fe9f40a0ae..04d05d27bf 100644 --- a/src/language/stats/quick-cluster.c +++ b/src/language/stats/quick-cluster.c @@ -196,7 +196,7 @@ diff_matrix (const gsl_matrix *m1, const gsl_matrix *m2) double diff = 0; for (j = 0; j < m1->size2; ++j) { - diff += pow2 (gsl_matrix_get (m1,i,j) - gsl_matrix_get (m2,i,j) ); + diff += pow2 (gsl_matrix_get (m1,i,j) - gsl_matrix_get (m2,i,j)); } if (diff > max_diff) max_diff = diff; @@ -247,7 +247,7 @@ dist_from_case (const struct Kmeans *kmeans, const struct ccase *c, for (j = 0; j < qc->n_vars; j++) { const union value *val = case_data (c, qc->vars[j]); - if ( var_is_value_missing (qc->vars[j], val, qc->exclude)) + if (var_is_value_missing (qc->vars[j], val, qc->exclude)) NOT_REACHED (); dist += pow2 (gsl_matrix_get (kmeans->centers, which, j) - val->f); @@ -302,7 +302,7 @@ kmeans_initial_centers (struct Kmeans *kmeans, for (j = 0; j < qc->n_vars; ++j) { const union value *val = case_data (c, qc->vars[j]); - if ( var_is_value_missing (qc->vars[j], val, qc->exclude)) + if (var_is_value_missing (qc->vars[j], val, qc->exclude)) { missing = true; break; @@ -385,7 +385,7 @@ kmeans_get_nearest_group (const struct Kmeans *kmeans, struct ccase *c, for (j = 0; j < qc->n_vars; j++) { const union value *val = case_data (c, qc->vars[j]); - if ( var_is_value_missing (qc->vars[j], val, qc->exclude)) + if (var_is_value_missing (qc->vars[j], val, qc->exclude)) continue; dist += pow2 (gsl_matrix_get (kmeans->centers, i, j) - val->f); @@ -462,7 +462,7 @@ kmeans_cluster (struct Kmeans *kmeans, struct casereader *reader, for (j = 0; j < qc->n_vars; j++) { const union value *val = case_data (c, qc->vars[j]); - if ( var_is_value_missing (qc->vars[j], val, qc->exclude)) + if (var_is_value_missing (qc->vars[j], val, qc->exclude)) missing = true; } @@ -488,7 +488,7 @@ kmeans_cluster (struct Kmeans *kmeans, struct casereader *reader, for (j = 0; j < qc->n_vars; ++j) { const union value *val = case_data (c, qc->vars[j]); - if ( var_is_value_missing (qc->vars[j], val, qc->exclude)) + if (var_is_value_missing (qc->vars[j], val, qc->exclude)) continue; double *x = gsl_matrix_ptr (kmeans->updated_centers, group, j); *x += val->f * (qc->wv ? case_data (c, qc->wv)->f : 1.0); @@ -529,7 +529,7 @@ kmeans_cluster (struct Kmeans *kmeans, struct casereader *reader, for (j = 0; j < qc->n_vars; ++j) { const union value *val = case_data (c, qc->vars[j]); - if ( var_is_value_missing (qc->vars[j], val, qc->exclude)) + if (var_is_value_missing (qc->vars[j], val, qc->exclude)) continue; double *x = gsl_matrix_ptr (kmeans->updated_centers, group, j); @@ -1016,7 +1016,7 @@ cmd_quick_cluster (struct lexer *lexer, struct dataset *ds) while (casegrouper_get_next_group (grouper, &group)) { - if ( qc.missing_type == MISS_LISTWISE ) + if (qc.missing_type == MISS_LISTWISE) { group = casereader_create_filter_missing (group, qc.vars, qc.n_vars, qc.exclude, diff --git a/src/language/stats/rank.c b/src/language/stats/rank.c index 4b6a2034aa..48eda85474 100644 --- a/src/language/stats/rank.c +++ b/src/language/stats/rank.c @@ -287,16 +287,16 @@ parse_into (struct lexer *lexer, struct rank *cmd, } else if (lex_match_id (lexer, "NTILES")) { - if ( !lex_force_match (lexer, T_LPAREN)) + if (!lex_force_match (lexer, T_LPAREN)) return false; - if (! lex_force_int (lexer) ) + if (! lex_force_int (lexer)) return false; cmd->k_ntiles = lex_integer (lexer); lex_get (lexer); - if ( !lex_force_match (lexer, T_RPAREN)) + if (!lex_force_match (lexer, T_RPAREN)) return false; rs->rfunc = NTILES; @@ -313,13 +313,13 @@ parse_into (struct lexer *lexer, struct rank *cmd, if (lex_match_id (lexer, "INTO")) { - while( lex_token (lexer) == T_ID ) + while(lex_token (lexer) == T_ID) { const char *name = lex_tokcstr (lexer); - if ( var_count >= subcase_get_n_fields (&cmd->sc) ) + if (var_count >= subcase_get_n_fields (&cmd->sc)) msg (SE, _("Too many variables in %s clause."), "INTO"); - else if ( dict_lookup_var (cmd->dict, name) != NULL ) + else if (dict_lookup_var (cmd->dict, name) != NULL) msg (SE, _("Variable %s already exists."), name); else if (string_set_contains (new_names, name)) msg (SE, _("Duplicate variable name %s."), name); @@ -354,7 +354,7 @@ rank_rank (const struct rank *cmd, double c, double cc, double cc_1, { double rank; - if ( c >= 1.0 ) + if (c >= 1.0) { switch (cmd->ties) { @@ -423,7 +423,7 @@ rank_proportion (const struct rank *cmd, double c, double cc, double cc_1, double f; - switch ( cmd->fraction ) + switch (cmd->fraction) { case FRAC_BLOM: f = (r - 3.0/8.0) / (w + 0.25); @@ -435,7 +435,7 @@ rank_proportion (const struct rank *cmd, double c, double cc, double cc_1, f = (r - 1.0/3.0) / (w + 1.0/3.0); break; case FRAC_VW: - f = r / ( w + 1.0); + f = r / (w + 1.0); break; default: NOT_REACHED (); @@ -461,7 +461,7 @@ rank_ntiles (const struct rank *cmd, double c, double cc, double cc_1, double r = rank_rank (cmd, c, cc, cc_1, i, w); - return ( floor (( r * cmd->k_ntiles) / ( w + 1) ) + 1); + return (floor ((r * cmd->k_ntiles) / (w + 1)) + 1); } /* Expected value of the order statistics from an exponential distribution */ @@ -472,7 +472,7 @@ ee (int j, double w_star) double sum = 0.0; for (k = 1 ; k <= j; k++) - sum += 1.0 / ( w_star + 1 - k ); + sum += 1.0 / (w_star + 1 - k); return sum; } @@ -486,29 +486,29 @@ rank_savage (const struct rank *cmd UNUSED, double c, double cc, double cc_1, const int i_1 = floor (cc_1); const int i_2 = floor (cc); - const double w_star = (modf (w, &int_part) == 0 ) ? w : floor (w) + 1; + const double w_star = (modf (w, &int_part) == 0) ? w : floor (w) + 1; const double g_1 = cc_1 - i_1; const double g_2 = cc - i_2; /* The second factor is infinite, when the first is zero. Therefore, evaluate the second, only when the first is non-zero */ - const double expr1 = (1 - g_1) ? (1 - g_1) * ee(i_1+1, w_star) : ( 1 - g_1); + const double expr1 = (1 - g_1) ? (1 - g_1) * ee(i_1+1, w_star) : (1 - g_1); const double expr2 = g_2 ? g_2 * ee (i_2+1, w_star) : g_2 ; - if ( i_1 == i_2 ) + if (i_1 == i_2) return ee (i_1 + 1, w_star) - 1; - if ( i_1 + 1 == i_2 ) - return ( ( expr1 + expr2 )/c ) - 1; + if (i_1 + 1 == i_2) + return ((expr1 + expr2)/c) - 1; - if ( i_1 + 2 <= i_2 ) + if (i_1 + 2 <= i_2) { int j; double sigma = 0.0; - for (j = i_1 + 2 ; j <= i_2; ++j ) + for (j = i_1 + 2 ; j <= i_2; ++j) sigma += ee (j, w_star); - return ( (expr1 + expr2 + sigma) / c) -1; + return ((expr1 + expr2 + sigma) / c) -1; } NOT_REACHED(); @@ -595,7 +595,7 @@ rank_cmd (struct dataset *ds, const struct rank *cmd); static const char * fraction_name (const struct rank *cmd) { - switch (cmd->fraction ) + switch (cmd->fraction) { case FRAC_BLOM: return "BLOM"; case FRAC_RANKIT: return "RANKIT"; @@ -615,16 +615,16 @@ create_var_label (struct rank *cmd, const struct variable *src_var, ds_init_empty (&label); - if ( cmd->n_group_vars > 0 ) + if (cmd->n_group_vars > 0) { struct string group_var_str; int g; ds_init_empty (&group_var_str); - for (g = 0 ; g < cmd->n_group_vars ; ++g ) + for (g = 0 ; g < cmd->n_group_vars ; ++g) { - if ( g > 0 ) ds_put_cstr (&group_var_str, " "); + if (g > 0) ds_put_cstr (&group_var_str, " "); ds_put_cstr (&group_var_str, var_get_name (cmd->group_vars[g])); } @@ -676,16 +676,16 @@ cmd_rank (struct lexer *lexer, struct dataset *ds) rank.n_vars = rank.sc.n_fields; - if (lex_match (lexer, T_BY) ) + if (lex_match (lexer, T_BY)) { - if ( ! parse_variables_const (lexer, rank.dict, + if (! parse_variables_const (lexer, rank.dict, &rank.group_vars, &rank.n_group_vars, PV_NO_DUPLICATE | PV_NO_SCRATCH)) goto error; } - while (lex_token (lexer) != T_ENDCMD ) + while (lex_token (lexer) != T_ENDCMD) { if (! lex_force_match (lexer, T_SLASH)) goto error; @@ -783,7 +783,7 @@ cmd_rank (struct lexer *lexer, struct dataset *ds) /* If no rank specs are given, then apply a default */ - if ( rank.n_rs == 0) + if (rank.n_rs == 0) { struct rank_spec *rs; @@ -802,10 +802,10 @@ cmd_rank (struct lexer *lexer, struct dataset *ds) { rs->dest_labels = pool_calloc (rank.pool, rank.n_vars, sizeof *rs->dest_labels); - for (int v = 0 ; v < rank.n_vars ; v ++ ) + for (int v = 0 ; v < rank.n_vars ; v ++) { const char **dst_name = &rs->dest_names[v]; - if ( *dst_name == NULL ) + if (*dst_name == NULL) { *dst_name = rank_choose_dest_name (rank.dict, &new_names, rs->rfunc, @@ -819,7 +819,7 @@ cmd_rank (struct lexer *lexer, struct dataset *ds) } } - if ( rank.print ) + if (rank.print) { struct pivot_table *table = pivot_table_create ( N_("Variables Created by RANK")); @@ -834,15 +834,15 @@ cmd_rank (struct lexer *lexer, struct dataset *ds) N_("Existing Variable")); variables->root->show_label = true; - for (size_t i = 0 ; i < rank.n_rs ; ++i ) + for (size_t i = 0 ; i < rank.n_rs ; ++i) { - for (size_t v = 0 ; v < rank.n_vars ; v ++ ) + for (size_t v = 0 ; v < rank.n_vars ; v ++) { int row_idx = pivot_category_create_leaf ( variables->root, pivot_value_new_variable (rank.vars[v])); struct string group_vars = DS_EMPTY_INITIALIZER; - for (int g = 0 ; g < rank.n_group_vars ; ++g ) + for (int g = 0 ; g < rank.n_group_vars ; ++g) { if (g) ds_put_byte (&group_vars, ' '); @@ -997,7 +997,7 @@ rank_cmd (struct dataset *ds, const struct rank *cmd) /* Open the active file and make one pass per input variable. */ input = proc_open (ds); input = casereader_create_filter_weight (input, d, NULL, NULL); - for (i = 0 ; i < cmd->n_vars ; ++i ) + for (i = 0 ; i < cmd->n_vars ; ++i) { const struct variable *input_var = cmd->vars[i]; struct casereader *input_pass; diff --git a/src/language/stats/reliability.c b/src/language/stats/reliability.c index e1c205f60f..7b73f8a47e 100644 --- a/src/language/stats/reliability.c +++ b/src/language/stats/reliability.c @@ -191,17 +191,17 @@ cmd_reliability (struct lexer *lexer, struct dataset *ds) if (lex_match_id (lexer, "SCALE")) { struct const_var_set *vs; - if ( ! lex_force_match (lexer, T_LPAREN)) + if (! lex_force_match (lexer, T_LPAREN)) goto error; - if ( ! lex_force_string (lexer) ) + if (! lex_force_string (lexer)) goto error; ds_assign_substring (&reliability.scale_name, lex_tokss (lexer)); lex_get (lexer); - if ( ! lex_force_match (lexer, T_RPAREN)) + if (! lex_force_match (lexer, T_RPAREN)) goto error; lex_match (lexer, T_EQUALS); @@ -229,7 +229,7 @@ cmd_reliability (struct lexer *lexer, struct dataset *ds) reliability.model = MODEL_SPLIT; reliability.split_point = -1; - if ( lex_match (lexer, T_LPAREN) + if (lex_match (lexer, T_LPAREN) && lex_force_num (lexer)) { reliability.split_point = lex_number (lexer); @@ -290,12 +290,12 @@ cmd_reliability (struct lexer *lexer, struct dataset *ds) } } - if ( reliability.model == MODEL_SPLIT) + if (reliability.model == MODEL_SPLIT) { int i; const struct cronbach *s; - if ( reliability.split_point >= reliability.n_variables) + if (reliability.split_point >= reliability.n_variables) { msg (ME, _("The split point must be less than the number of variables")); goto error; @@ -326,7 +326,7 @@ cmd_reliability (struct lexer *lexer, struct dataset *ds) } } - if ( reliability.summary & SUMMARY_TOTAL) + if (reliability.summary & SUMMARY_TOTAL) { int i; const int base_sc = reliability.n_sc; @@ -337,7 +337,7 @@ cmd_reliability (struct lexer *lexer, struct dataset *ds) reliability.sc = xrealloc (reliability.sc, sizeof (struct cronbach) * reliability.n_sc); - for (i = 0 ; i < reliability.sc[0].n_items; ++i ) + for (i = 0 ; i < reliability.sc[0].n_items; ++i) { int v_src; int v_dest = 0; @@ -347,14 +347,14 @@ cmd_reliability (struct lexer *lexer, struct dataset *ds) s->items = xzalloc (sizeof (struct variable *) * s->n_items); for (v_src = 0 ; v_src < reliability.sc[0].n_items ; ++v_src) { - if ( v_src != i) + if (v_src != i) s->items[v_dest++] = reliability.sc[0].items[v_src]; } } } - if ( ! run_reliability (ds, &reliability)) + if (! run_reliability (ds, &reliability)) goto error; reliability_destroy (&reliability); @@ -394,7 +394,7 @@ run_reliability (struct dataset *ds, const struct reliability *reliability) s->m = xzalloc (sizeof *s->m * s->n_items); s->total = moments1_create (MOMENT_VARIANCE); - for (i = 0 ; i < s->n_items ; ++i ) + for (i = 0 ; i < s->n_items ; ++i) s->m[i] = moments1_create (MOMENT_VARIANCE); } @@ -405,7 +405,7 @@ run_reliability (struct dataset *ds, const struct reliability *reliability) reliability_statistics (reliability); - if (reliability->summary & SUMMARY_TOTAL ) + if (reliability->summary & SUMMARY_TOTAL) reliability_summary_total (reliability); } @@ -443,7 +443,7 @@ case_processing_summary (casenumber n_valid, casenumber n_missing, static double alpha (int k, double sum_of_variances, double variance_of_sums) { - return k / ( k - 1.0) * ( 1 - sum_of_variances / variance_of_sums); + return k / (k - 1.0) * (1 - sum_of_variances / variance_of_sums); } static void @@ -463,7 +463,7 @@ do_reliability (struct casereader *input, struct dataset *ds, moments1_clear (s->total); - for (i = 0 ; i < s->n_items ; ++i ) + for (i = 0 ; i < s->n_items ; ++i) moments1_clear (s->m[i]); } @@ -494,7 +494,7 @@ do_reliability (struct casereader *input, struct dataset *ds, { struct cronbach *s = &rel->sc[si]; - for (i = 0 ; i < s->n_items ; ++i ) + for (i = 0 ; i < s->n_items ; ++i) moments1_add (s->m[i], case_data (c, s->items[i])->f, weight); moments1_add (s->total, case_data_idx (c, s->totals_idx)->f, weight); @@ -507,7 +507,7 @@ do_reliability (struct casereader *input, struct dataset *ds, struct cronbach *s = &rel->sc[si]; s->sum_of_variances = 0; - for (i = 0 ; i < s->n_items ; ++i ) + for (i = 0 ; i < s->n_items ; ++i) { double weight, mean, variance; moments1_calculate (s->m[i], &weight, &mean, &variance, NULL, NULL); @@ -685,7 +685,7 @@ reliability_statistics (const struct reliability *rel) rel->sc[1].n_items + rel->sc[2].n_items, r1, 2 * r1 / (1.0 + r1), - (sqrt ( pow4 (r1) + 4 * pow2 (r1) * tmp) - pow2 (r1)) / (2 * tmp), + (sqrt (pow4 (r1) + 4 * pow2 (r1) * tmp) - pow2 (r1)) / (2 * tmp), g, }; for (size_t i = 0; i < sizeof entries / sizeof *entries; i++) diff --git a/src/language/stats/roc.c b/src/language/stats/roc.c index eb2430a254..f0e1715ac3 100644 --- a/src/language/stats/roc.c +++ b/src/language/stats/roc.c @@ -102,7 +102,7 @@ cmd_roc (struct lexer *lexer, struct dataset *ds) PV_APPEND | PV_NO_DUPLICATE | PV_NUMERIC)) goto error; - if ( ! lex_force_match (lexer, T_BY)) + if (! lex_force_match (lexer, T_BY)) { goto error; } @@ -113,7 +113,7 @@ cmd_roc (struct lexer *lexer, struct dataset *ds) goto error; } - if ( !lex_force_match (lexer, T_LPAREN)) + if (!lex_force_match (lexer, T_LPAREN)) { goto error; } @@ -123,7 +123,7 @@ cmd_roc (struct lexer *lexer, struct dataset *ds) parse_value (lexer, &roc.state_value, roc.state_var); - if ( !lex_force_match (lexer, T_RPAREN)) + if (!lex_force_match (lexer, T_RPAREN)) { goto error; } @@ -286,16 +286,16 @@ cmd_roc (struct lexer *lexer, struct dataset *ds) } } - if ( ! run_roc (ds, &roc)) + if (! run_roc (ds, &roc)) goto error; - if ( roc.state_var) + if (roc.state_var) value_destroy (&roc.state_value, roc.state_var_width); free (roc.vars); return CMD_SUCCESS; error: - if ( roc.state_var) + if (roc.state_var) value_destroy (&roc.state_value, roc.state_var_width); free (roc.vars); return CMD_FAILURE; @@ -333,7 +333,7 @@ dump_casereader (struct casereader *reader) struct ccase *c; struct casereader *r = casereader_clone (reader); - for ( ; (c = casereader_read (r) ); case_unref (c)) + for (; (c = casereader_read (r)); case_unref (c)) { int i; for (i = 0 ; i < case_get_value_cnt (c); ++i) @@ -362,10 +362,10 @@ match_positives (const struct ccase *c, void *aux) const double weight = wv ? case_data (c, wv)->f : 1.0; const bool positive = - ( 0 == value_compare_3way (case_data (c, roc->state_var), &roc->state_value, + (0 == value_compare_3way (case_data (c, roc->state_var), &roc->state_value, var_get_width (roc->state_var))); - if ( positive ) + if (positive) { roc->pos++; roc->pos_weighted += weight; @@ -426,7 +426,7 @@ accumulate_counts (struct casereader *input, struct ccase *cpc; double prev_cp = SYSMIS; - for ( ; (cpc = casereader_read (input) ); case_unref (cpc)) + for (; (cpc = casereader_read (input)); case_unref (cpc)) { struct ccase *new_case; const double cp = case_data_idx (cpc, ROC_CUTPOINT)->f; @@ -434,12 +434,12 @@ accumulate_counts (struct casereader *input, assert (cp != SYSMIS); /* We don't want duplicates here */ - if ( cp == prev_cp ) + if (cp == prev_cp) continue; new_case = case_clone (cpc); - if ( pos_cond (result, cp)) + if (pos_cond (result, cp)) case_data_rw_idx (new_case, true_index)->f += weight; else case_data_rw_idx (new_case, false_index)->f += weight; @@ -504,7 +504,7 @@ process_group (const struct variable *var, struct casereader *reader, *cc = 0; - for ( ; (c1 = casereader_read (r1) ); case_unref (c1)) + for (; (c1 = casereader_read (r1)); case_unref (c1)) { struct ccase *new_case = case_create (proto); struct ccase *c2; @@ -521,17 +521,17 @@ process_group (const struct variable *var, struct casereader *reader, *cc += weight1; - for ( ; (c2 = casereader_read (r2) ); case_unref (c2)) + for (; (c2 = casereader_read (r2)); case_unref (c2)) { const double d2 = case_data (c2, var)->f; const double weight2 = case_data_idx (c2, weight_idx)->f; - if ( d1 == d2 ) + if (d1 == d2) { n_eq += weight2; continue; } - else if ( pred (d2, d1)) + else if (pred (d2, d1)) { n_pred += weight2; } @@ -679,15 +679,15 @@ prepare_cutpoints (struct cmd_roc *roc, struct roc_state *rs, struct casereader const union value *v = case_data (c, roc->vars[i]); const double result = v->f; - if ( mv_is_value_missing (var_get_missing_values (roc->vars[i]), v, roc->exclude)) + if (mv_is_value_missing (var_get_missing_values (roc->vars[i]), v, roc->exclude)) continue; minimize (&rs[i].min, result); maximize (&rs[i].max, result); - if ( rs[i].prev_result != SYSMIS && rs[i].prev_result != result ) + if (rs[i].prev_result != SYSMIS && rs[i].prev_result != result) { - const double mean = (result + rs[i].prev_result ) / 2.0; + const double mean = (result + rs[i].prev_result) / 2.0; append_cutpoint (rs[i].cutpoint_wtr, mean); } @@ -777,7 +777,7 @@ do_roc (struct cmd_roc *roc, struct casereader *reader, struct dictionary *dict) struct casereader *n_pos_reader = process_positive_group (var, pos, dict, &rs[i]); - if ( negatives == NULL) + if (negatives == NULL) { negatives = casewriter_make_reader (neg_wtr); } @@ -788,7 +788,7 @@ do_roc (struct cmd_roc *roc, struct casereader *reader, struct dictionary *dict) /* Merge the n_pos and n_neg casereaders */ w = sort_create_writer (&up_ordering, n_proto); - for ( ; (cpos = casereader_read (n_pos_reader) ); case_unref (cpos)) + for (; (cpos = casereader_read (n_pos_reader)); case_unref (cpos)) { struct ccase *pos_case = case_create (n_proto); struct ccase *cneg; @@ -811,7 +811,7 @@ do_roc (struct cmd_roc *roc, struct casereader *reader, struct dictionary *dict) casewriter_write (w, nc); case_unref (cneg); - if ( jneg > jpos) + if (jneg > jpos) break; } @@ -839,12 +839,12 @@ do_roc (struct cmd_roc *roc, struct casereader *reader, struct dictionary *dict) double prev_pos_gt = rs[i].n1; w = sort_create_writer (&down_ordering, n_proto); - for ( ; (c = casereader_read (r) ); case_unref (c)) + for (; (c = casereader_read (r)); case_unref (c)) { double n_pos_gt = case_data_idx (c, N_POS_GT)->f; struct ccase *nc = case_clone (c); - if ( n_pos_gt == SYSMIS) + if (n_pos_gt == SYSMIS) { n_pos_gt = prev_pos_gt; case_data_rw_idx (nc, N_POS_GT)->f = n_pos_gt; @@ -864,12 +864,12 @@ do_roc (struct cmd_roc *roc, struct casereader *reader, struct dictionary *dict) double prev_neg_lt = rs[i].n2; w = sort_create_writer (&up_ordering, n_proto); - for ( ; (c = casereader_read (r) ); case_unref (c)) + for (; (c = casereader_read (r)); case_unref (c)) { double n_neg_lt = case_data_idx (c, N_NEG_LT)->f; struct ccase *nc = case_clone (c); - if ( n_neg_lt == SYSMIS) + if (n_neg_lt == SYSMIS) { n_neg_lt = prev_neg_lt; case_data_rw_idx (nc, N_NEG_LT)->f = n_neg_lt; @@ -885,7 +885,7 @@ do_roc (struct cmd_roc *roc, struct casereader *reader, struct dictionary *dict) { struct ccase *prev_case = NULL; - for ( ; (c = casereader_read (r) ); case_unref (c)) + for (; (c = casereader_read (r)); case_unref (c)) { struct ccase *next_case = casereader_peek (r, 0); @@ -895,29 +895,29 @@ do_roc (struct cmd_roc *roc, struct casereader *reader, struct dictionary *dict) double n_neg_eq = case_data_idx (c, N_NEG_EQ)->f; double n_neg_lt = case_data_idx (c, N_NEG_LT)->f; - if ( prev_case && j == case_data_idx (prev_case, VALUE)->f) + if (prev_case && j == case_data_idx (prev_case, VALUE)->f) { - if ( 0 == case_data_idx (c, N_POS_EQ)->f) + if (0 == case_data_idx (c, N_POS_EQ)->f) { n_pos_eq = case_data_idx (prev_case, N_POS_EQ)->f; n_pos_gt = case_data_idx (prev_case, N_POS_GT)->f; } - if ( 0 == case_data_idx (c, N_NEG_EQ)->f) + if (0 == case_data_idx (c, N_NEG_EQ)->f) { n_neg_eq = case_data_idx (prev_case, N_NEG_EQ)->f; n_neg_lt = case_data_idx (prev_case, N_NEG_LT)->f; } } - if ( NULL == next_case || j != case_data_idx (next_case, VALUE)->f) + if (NULL == next_case || j != case_data_idx (next_case, VALUE)->f) { rs[i].auc += n_pos_gt * n_neg_eq + (n_pos_eq * n_neg_eq) / 2.0; rs[i].q1hat += - n_neg_eq * ( pow2 (n_pos_gt) + n_pos_gt * n_pos_eq + pow2 (n_pos_eq) / 3.0); + n_neg_eq * (pow2 (n_pos_gt) + n_pos_gt * n_pos_eq + pow2 (n_pos_eq) / 3.0); rs[i].q2hat += - n_pos_eq * ( pow2 (n_neg_lt) + n_neg_lt * n_neg_eq + pow2 (n_neg_eq) / 3.0); + n_pos_eq * (pow2 (n_neg_lt) + n_neg_lt * n_neg_eq + pow2 (n_neg_eq) / 3.0); } @@ -929,13 +929,13 @@ do_roc (struct cmd_roc *roc, struct casereader *reader, struct dictionary *dict) case_unref (prev_case); rs[i].auc /= rs[i].n1 * rs[i].n2; - if ( roc->invert ) + if (roc->invert) rs[i].auc = 1 - rs[i].auc; - if ( roc->bi_neg_exp ) + if (roc->bi_neg_exp) { - rs[i].q1hat = rs[i].auc / ( 2 - rs[i].auc); - rs[i].q2hat = 2 * pow2 (rs[i].auc) / ( 1 + rs[i].auc); + rs[i].q1hat = rs[i].auc / (2 - rs[i].auc); + rs[i].q2hat = 2 * pow2 (rs[i].auc) / (1 + rs[i].auc); } else { @@ -987,14 +987,14 @@ show_auc (struct roc_state *rs, const struct cmd_roc *roc) table, PIVOT_AXIS_ROW, N_("Variable under test")); variables->root->show_label = true; - for (size_t i = 0 ; i < roc->n_vars ; ++i ) + for (size_t i = 0 ; i < roc->n_vars ; ++i) { int var_idx = pivot_category_create_leaf ( variables->root, pivot_value_new_variable (roc->vars[i])); pivot_table_put2 (table, 0, var_idx, pivot_value_new_number (rs[i].auc)); - if ( roc->print_se ) + if (roc->print_se) { double se = (rs[i].auc * (1 - rs[i].auc) + (rs[i].n1 - 1) * (rs[i].q1hat - pow2 (rs[i].auc)) @@ -1126,7 +1126,7 @@ output_roc (struct roc_state *rs, const struct cmd_roc *roc) { show_summary (roc); - if ( roc->curve ) + if (roc->curve) { struct roc_chart *rc; size_t i; @@ -1140,7 +1140,7 @@ output_roc (struct roc_state *rs, const struct cmd_roc *roc) show_auc (rs, roc); - if ( roc->print_coords ) + if (roc->print_coords) show_coords (rs, roc); } diff --git a/src/language/stats/runs.c b/src/language/stats/runs.c index f23b67867e..f5c9979169 100644 --- a/src/language/stats/runs.c +++ b/src/language/stats/runs.c @@ -78,7 +78,7 @@ runs_statistic (const struct run_state *rs) z = rs->runs - mu; - if ( rs->n < 50) + if (rs->n < 50) { if (z <= -0.5) z += 0.5; @@ -118,7 +118,7 @@ runs_execute (const struct dataset *ds, struct runs_test *rt = UP_CAST (otp, struct runs_test, parent); struct run_state *rs = xcalloc (otp->n_vars, sizeof (*rs)); - switch ( rt->cp_mode) + switch (rt->cp_mode) { case CP_MODE: { @@ -145,20 +145,20 @@ runs_execute (const struct dataset *ds, { const double w = weight ? case_data (c, weight)->f: 1.0; const union value *val = case_data (c, var); - if ( var_is_value_missing (var, val, exclude)) + if (var_is_value_missing (var, val, exclude)) continue; x = val->f; cc += w; } - if ( cc > last_cc) + if (cc > last_cc) { run->cutpoint = x; } - else if ( cc == last_cc) + else if (cc == last_cc) { multimodal = true; - if ( x > run->cutpoint) + if (x > run->cutpoint) run->cutpoint = x; } last_cc = cc; @@ -188,11 +188,11 @@ runs_execute (const struct dataset *ds, subcase_init_var (&sc, var, SC_ASCEND); writer = sort_create_writer (&sc, casereader_get_proto (reader)); - for (; (c = casereader_read (reader)); ) + for (; (c = casereader_read (reader));) { const union value *val = case_data (c, var); const double w = weight ? case_data (c, weight)->f: 1.0; - if ( var_is_value_missing (var, val, exclude)) + if (var_is_value_missing (var, val, exclude)) { case_unref (c); continue; @@ -232,7 +232,7 @@ runs_execute (const struct dataset *ds, const double x = val->f; struct run_state *run = &rs[v]; - if ( var_is_value_missing (var, val, exclude)) + if (var_is_value_missing (var, val, exclude)) continue; run->cutpoint += x * w; @@ -271,7 +271,7 @@ runs_execute (const struct dataset *ds, double d = x - run->cutpoint; short sign = 0; - if ( var_is_value_missing (var, val, exclude)) + if (var_is_value_missing (var, val, exclude)) continue; if (d >= 0) diff --git a/src/language/stats/sign.c b/src/language/stats/sign.c index 30de7d1e9b..a832c98b7e 100644 --- a/src/language/stats/sign.c +++ b/src/language/stats/sign.c @@ -146,7 +146,7 @@ sign_execute (const struct dataset *ds, { const double weight = dict_get_case_weight (dict, c, &warn); - for (i = 0 ; i < t2s->n_pairs; ++i ) + for (i = 0 ; i < t2s->n_pairs; ++i) { variable_pair *vp = &t2s->pairs[i]; const union value *value0 = case_data (c, (*vp)[0]); @@ -159,7 +159,7 @@ sign_execute (const struct dataset *ds, if (var_is_value_missing ((*vp)[1], value1, exclude)) continue; - if ( diff > 0) + if (diff > 0) stp[i].pos += weight; else if (diff < 0) stp[i].neg += weight; @@ -170,7 +170,7 @@ sign_execute (const struct dataset *ds, casereader_destroy (r); - for (i = 0 ; i < t2s->n_pairs; ++i ) + for (i = 0 ; i < t2s->n_pairs; ++i) { int r = MIN (stp[i].pos, stp[i].neg); stp[i].one_tailed_sig = gsl_cdf_binomial_P (r, diff --git a/src/language/stats/t-test-indep.c b/src/language/stats/t-test-indep.c index fff8c968c5..b4cb430f19 100644 --- a/src/language/stats/t-test-indep.c +++ b/src/language/stats/t-test-indep.c @@ -60,7 +60,7 @@ which_group (const union value *v, const struct indep_samples *is) { int width = var_get_width (is->gvar); int cmp = value_compare_3way (v, is->gval0, width); - if ( is->cut ) + if (is->cut) return (cmp < 0); if (cmp == 0) @@ -99,14 +99,14 @@ indep_run (struct tt *tt, const struct variable *gvar, is.cut = cut; r = casereader_clone (reader); - for ( ; (c = casereader_read (r) ); case_unref (c)) + for (; (c = casereader_read (r)); case_unref (c)) { double w = dict_get_case_weight (tt->dict, c, NULL); const union value *gv = case_data (c, gvar); int grp = which_group (gv, &is); - if ( grp < 0) + if (grp < 0) continue; for (v = 0; v < tt->n_vars; ++v) @@ -122,14 +122,14 @@ indep_run (struct tt *tt, const struct variable *gvar, casereader_destroy (r); r = casereader_clone (reader); - for ( ; (c = casereader_read (r) ); case_unref (c)) + for (; (c = casereader_read (r)); case_unref (c)) { double w = dict_get_case_weight (tt->dict, c, NULL); const union value *gv = case_data (c, gvar); int grp = which_group (gv, &is); - if ( grp < 0) + if (grp < 0) continue; for (v = 0; v < tt->n_vars; ++v) @@ -145,14 +145,14 @@ indep_run (struct tt *tt, const struct variable *gvar, casereader_destroy (r); r = reader; - for ( ; (c = casereader_read (r) ); case_unref (c)) + for (; (c = casereader_read (r)); case_unref (c)) { double w = dict_get_case_weight (tt->dict, c, NULL); const union value *gv = case_data (c, gvar); int grp = which_group (gv, &is); - if ( grp < 0) + if (grp < 0) continue; for (v = 0; v < tt->n_vars; ++v) diff --git a/src/language/stats/t-test-one-sample.c b/src/language/stats/t-test-one-sample.c index 20914c9223..b946566212 100644 --- a/src/language/stats/t-test-one-sample.c +++ b/src/language/stats/t-test-one-sample.c @@ -167,7 +167,7 @@ one_sample_run (const struct tt *tt, double testval, struct casereader *reader) struct casereader *r = casereader_clone (reader); struct ccase *c; - for ( ; (c = casereader_read (r) ); case_unref (c)) + for (; (c = casereader_read (r)); case_unref (c)) { double w = dict_get_case_weight (tt->dict, c, NULL); for (size_t i = 0; i < os.n_stats; i++) @@ -184,7 +184,7 @@ one_sample_run (const struct tt *tt, double testval, struct casereader *reader) casereader_destroy (r); r = reader; - for ( ; (c = casereader_read (r) ); case_unref (c)) + for (; (c = casereader_read (r)); case_unref (c)) { double w = dict_get_case_weight (tt->dict, c, NULL); for (size_t i = 0; i < os.n_stats; i++) diff --git a/src/language/stats/t-test-paired.c b/src/language/stats/t-test-paired.c index a1608cf2cf..bf6545e3bb 100644 --- a/src/language/stats/t-test-paired.c +++ b/src/language/stats/t-test-paired.c @@ -78,7 +78,7 @@ paired_run (const struct tt *tt, size_t n_pairs, vp *pairs, struct casereader *r } r = casereader_clone (reader); - for ( ; (c = casereader_read (r) ); case_unref (c)) + for (; (c = casereader_read (r)); case_unref (c)) { double w = dict_get_case_weight (tt->dict, c, NULL); @@ -101,7 +101,7 @@ paired_run (const struct tt *tt, size_t n_pairs, vp *pairs, struct casereader *r casereader_destroy (r); r = reader; - for ( ; (c = casereader_read (r) ); case_unref (c)) + for (; (c = casereader_read (r)); case_unref (c)) { double w = dict_get_case_weight (tt->dict, c, NULL); diff --git a/src/language/stats/t-test-parser.c b/src/language/stats/t-test-parser.c index d3ea93aefc..8810301c67 100644 --- a/src/language/stats/t-test-parser.c +++ b/src/language/stats/t-test-parser.c @@ -73,7 +73,7 @@ cmd_t_test (struct lexer *lexer, struct dataset *ds) lex_match (lexer, T_EQUALS); - for (; lex_token (lexer) != T_ENDCMD; ) + for (; lex_token (lexer) != T_ENDCMD;) { lex_match (lexer, T_SLASH); if (lex_match_id (lexer, "TESTVAL")) @@ -155,7 +155,7 @@ cmd_t_test (struct lexer *lexer, struct dataset *ds) PV_NO_DUPLICATE | PV_NUMERIC)) goto exit; - if ( lex_match (lexer, T_WITH)) + if (lex_match (lexer, T_WITH)) { with = true; if (!parse_variables_const (lexer, dict, @@ -181,16 +181,16 @@ cmd_t_test (struct lexer *lexer, struct dataset *ds) { int i; - if ( !with ) + if (!with) n_pairs = (n_v1 * (n_v1 - 1)) / 2.0; - else if ( paired ) + else if (paired) n_pairs = n_v1; else n_pairs = n_v1 * n_v2; pairs = xcalloc (n_pairs, sizeof *pairs); - if ( with) + if (with) { int x = 0; if (paired) @@ -236,7 +236,7 @@ cmd_t_test (struct lexer *lexer, struct dataset *ds) } else if (lex_match_id (lexer, "VARIABLES")) { - if ( tt.mode == MODE_PAIRED) + if (tt.mode == MODE_PAIRED) { msg (SE, _("%s subcommand may not be used with %s."), "VARIABLES", "PAIRS"); goto exit; @@ -250,7 +250,7 @@ cmd_t_test (struct lexer *lexer, struct dataset *ds) PV_NO_DUPLICATE | PV_NUMERIC)) goto exit; } - else if ( lex_match_id (lexer, "MISSING")) + else if (lex_match_id (lexer, "MISSING")) { lex_match (lexer, T_EQUALS); while (lex_token (lexer) != T_ENDCMD && lex_token (lexer) != T_SLASH) @@ -282,8 +282,8 @@ cmd_t_test (struct lexer *lexer, struct dataset *ds) else if (lex_match_id (lexer, "CRITERIA")) { lex_match (lexer, T_EQUALS); - if ( lex_match_id (lexer, "CIN") || lex_force_match_id (lexer, "CI")) - if ( lex_force_match (lexer, T_LPAREN)) + if (lex_match_id (lexer, "CIN") || lex_force_match_id (lexer, "CI")) + if (lex_force_match (lexer, T_LPAREN)) { if (!lex_force_num (lexer)) goto exit; @@ -300,7 +300,7 @@ cmd_t_test (struct lexer *lexer, struct dataset *ds) } } - if ( mode_count != 1) + if (mode_count != 1) { msg (SE, _("Exactly one of TESTVAL, GROUPS and PAIRS subcommands " "must be specified.")); @@ -322,18 +322,18 @@ cmd_t_test (struct lexer *lexer, struct dataset *ds) while (casegrouper_get_next_group (grouper, &group)) { - if ( tt.mode == MODE_SINGLE) + if (tt.mode == MODE_SINGLE) { - if ( tt.missing_type == MISS_LISTWISE ) + if (tt.missing_type == MISS_LISTWISE) group = casereader_create_filter_missing (group, tt.vars, tt.n_vars, tt.exclude, NULL, NULL); one_sample_run (&tt, testval, group); } - else if ( tt.mode == MODE_PAIRED) + else if (tt.mode == MODE_PAIRED) { - if ( tt.missing_type == MISS_LISTWISE ) + if (tt.missing_type == MISS_LISTWISE) { group = casereader_create_filter_missing (group, v1, n_v1, @@ -349,7 +349,7 @@ cmd_t_test (struct lexer *lexer, struct dataset *ds) } else /* tt.mode == MODE_INDEP */ { - if ( tt.missing_type == MISS_LISTWISE ) + if (tt.missing_type == MISS_LISTWISE) { group = casereader_create_filter_missing (group, tt.vars, tt.n_vars, diff --git a/src/language/stats/wilcoxon.c b/src/language/stats/wilcoxon.c index 230e97df57..0d86bd6c31 100644 --- a/src/language/stats/wilcoxon.c +++ b/src/language/stats/wilcoxon.c @@ -99,7 +99,7 @@ wilcoxon_execute (const struct dataset *ds, if (weight != NULL) proto = caseproto_add_width (proto, 0); - for (i = 0 ; i < t2s->n_pairs; ++i ) + for (i = 0 ; i < t2s->n_pairs; ++i) { struct casereader *r = casereader_clone (input); struct casewriter *writer; @@ -156,7 +156,7 @@ wilcoxon_execute (const struct dataset *ds, } caseproto_unref (proto); - for (i = 0 ; i < t2s->n_pairs; ++i ) + for (i = 0 ; i < t2s->n_pairs; ++i) { struct casereader *rr ; struct ccase *c; @@ -165,7 +165,7 @@ wilcoxon_execute (const struct dataset *ds, rr = casereader_create_append_rank (ws[i].reader, ws[i].absdiff, weight ? weightx : NULL, &err, distinct_callback, &ws[i] - ); + ); for (; (c = casereader_read (rr)) != NULL; case_unref (c)) { @@ -175,7 +175,7 @@ wilcoxon_execute (const struct dataset *ds, if (weight) w = case_data (c, weightx)->f; - if ( sign > 0 ) + if (sign > 0) { ws[i].positives.sum += rank * w; ws[i].positives.n += w; @@ -199,7 +199,7 @@ wilcoxon_execute (const struct dataset *ds, show_ranks_box (ws, t2s, dict); show_tests_box (ws, t2s, exact, timer); - for (i = 0 ; i < t2s->n_pairs; ++i ) + for (i = 0 ; i < t2s->n_pairs; ++i) { dict_destroy_internal_var (ws[i].sign); dict_destroy_internal_var (ws[i].absdiff); diff --git a/src/language/stats/wilcoxon.h b/src/language/stats/wilcoxon.h index 1650badd00..d90dc0906c 100644 --- a/src/language/stats/wilcoxon.h +++ b/src/language/stats/wilcoxon.h @@ -58,7 +58,7 @@ void wilcoxon_execute (const struct dataset *ds, const struct npar_test *test, bool exact, double timer - ); + ); diff --git a/src/language/utilities/cd.c b/src/language/utilities/cd.c index d28c0a30aa..9f7eaa1f02 100644 --- a/src/language/utilities/cd.c +++ b/src/language/utilities/cd.c @@ -34,12 +34,12 @@ cmd_cd (struct lexer *lexer, struct dataset *ds UNUSED) { char *path = 0; - if ( ! lex_force_string (lexer)) + if (! lex_force_string (lexer)) goto error; path = utf8_to_filename (lex_tokcstr (lexer)); - if ( -1 == chdir (path) ) + if (-1 == chdir (path)) { int err = errno; msg (SE, _("Cannot change directory to %s: %s "), path, diff --git a/src/language/utilities/include.c b/src/language/utilities/include.c index 1efa3bd2e3..19a5baa465 100644 --- a/src/language/utilities/include.c +++ b/src/language/utilities/include.c @@ -68,7 +68,7 @@ do_insert (struct lexer *lexer, struct dataset *ds, enum variant variant) filename = include_path_search (relative_name); free (relative_name); - if ( ! filename) + if (! filename) { msg (SE, _("Can't find `%s' in include file search path."), lex_tokcstr (lexer)); @@ -82,7 +82,7 @@ do_insert (struct lexer *lexer, struct dataset *ds, enum variant variant) status = CMD_FAILURE; encoding = xstrdup (session_get_default_syntax_encoding ( dataset_session (ds))); - while ( T_ENDCMD != lex_token (lexer)) + while (T_ENDCMD != lex_token (lexer)) { if (lex_match_id (lexer, "ENCODING")) { @@ -97,11 +97,11 @@ do_insert (struct lexer *lexer, struct dataset *ds, enum variant variant) else if (variant == INSERT && lex_match_id (lexer, "SYNTAX")) { lex_match (lexer, T_EQUALS); - if ( lex_match_id (lexer, "INTERACTIVE") ) + if (lex_match_id (lexer, "INTERACTIVE")) syntax_mode = LEX_SYNTAX_INTERACTIVE; - else if ( lex_match_id (lexer, "BATCH")) + else if (lex_match_id (lexer, "BATCH")) syntax_mode = LEX_SYNTAX_BATCH; - else if ( lex_match_id (lexer, "AUTO")) + else if (lex_match_id (lexer, "AUTO")) syntax_mode = LEX_SYNTAX_AUTO; else { @@ -112,11 +112,11 @@ do_insert (struct lexer *lexer, struct dataset *ds, enum variant variant) else if (variant == INSERT && lex_match_id (lexer, "CD")) { lex_match (lexer, T_EQUALS); - if ( lex_match_id (lexer, "YES") ) + if (lex_match_id (lexer, "YES")) { cd = true; } - else if ( lex_match_id (lexer, "NO")) + else if (lex_match_id (lexer, "NO")) { cd = false; } @@ -129,11 +129,11 @@ do_insert (struct lexer *lexer, struct dataset *ds, enum variant variant) else if (variant == INSERT && lex_match_id (lexer, "ERROR")) { lex_match (lexer, T_EQUALS); - if ( lex_match_id (lexer, "CONTINUE") ) + if (lex_match_id (lexer, "CONTINUE")) { error_mode = LEX_ERROR_CONTINUE; } - else if ( lex_match_id (lexer, "STOP")) + else if (lex_match_id (lexer, "STOP")) { error_mode = LEX_ERROR_STOP; } @@ -152,7 +152,7 @@ do_insert (struct lexer *lexer, struct dataset *ds, enum variant variant) } status = lex_end_of_command (lexer); - if ( status == CMD_SUCCESS) + if (status == CMD_SUCCESS) { struct lex_reader *reader; @@ -163,7 +163,7 @@ do_insert (struct lexer *lexer, struct dataset *ds, enum variant variant) lex_discard_rest_of_command (lexer); lex_include (lexer, reader); - if ( cd ) + if (cd) { char *directory = dir_name (filename); chdir (directory); diff --git a/src/language/utilities/permissions.c b/src/language/utilities/permissions.c index e151645037..771eb72832 100644 --- a/src/language/utilities/permissions.c +++ b/src/language/utilities/permissions.c @@ -59,19 +59,19 @@ cmd_permissions (struct lexer *lexer, struct dataset *ds UNUSED) lex_match (lexer, T_SLASH); - if ( ! lex_match_id (lexer, "PERMISSIONS")) + if (! lex_match_id (lexer, "PERMISSIONS")) goto error; lex_match (lexer, T_EQUALS); - if ( lex_match_id (lexer, "READONLY")) + if (lex_match_id (lexer, "READONLY")) { if (! change_permissions (fn, PER_RO)) goto error; } else if (lex_match_id (lexer, "WRITEABLE")) { - if (! change_permissions (fn, PER_RW )) + if (! change_permissions (fn, PER_RW)) goto error; } else @@ -107,7 +107,7 @@ change_permissions (const char *file_name, enum PER per) } locale_file_name = utf8_to_filename (file_name); - if ( -1 == stat(locale_file_name, &buf) ) + if (-1 == stat(locale_file_name, &buf)) { const int errnum = errno; msg (SE, _("Cannot stat %s: %s"), file_name, strerror(errnum)); @@ -115,12 +115,12 @@ change_permissions (const char *file_name, enum PER per) return 0; } - if ( per == PER_RW ) + if (per == PER_RW) mode = buf.st_mode | 0200; else mode = buf.st_mode & ~0222; - if ( -1 == chmod(locale_file_name, mode)) + if (-1 == chmod(locale_file_name, mode)) { const int errnum = errno; diff --git a/src/language/xforms/recode.c b/src/language/xforms/recode.c index 4f8acf6bbb..94c5e4c7f2 100644 --- a/src/language/xforms/recode.c +++ b/src/language/xforms/recode.c @@ -158,7 +158,7 @@ cmd_recode (struct lexer *lexer, struct dataset *ds) as the widest destination variable. */ if (trns->dst_type == VAL_STRING) { - if ( ! enlarge_dst_widths (trns)) + if (! enlarge_dst_widths (trns)) { recode_trns_free (trns); return CMD_FAILURE; diff --git a/src/libpspp/abt.h b/src/libpspp/abt.h index fced0179ae..f0a412773a 100644 --- a/src/libpspp/abt.h +++ b/src/libpspp/abt.h @@ -121,7 +121,7 @@ find_by_position (struct abt *abt, int position) { struct abt_node *p; - for (p = abt->root; p != NULL; ) + for (p = abt->root; p != NULL;) { int p_pos = p->down[0] ? node_to_element (p->down[0])->count : 0; if (position == p_pos) diff --git a/src/libpspp/ext-array.c b/src/libpspp/ext-array.c index 9129d365d6..c03d0c23c0 100644 --- a/src/libpspp/ext-array.c +++ b/src/libpspp/ext-array.c @@ -124,7 +124,7 @@ do_read (const struct ext_array *ea_, void *buffer, size_t bytes) if (ferror (ea->file)) msg_error (errno, _("reading temporary file")); else if (feof (ea->file)) - msg_error ( 0, _("unexpected end of file reading temporary file")); + msg_error (0, _("unexpected end of file reading temporary file")); else NOT_REACHED (); return false; diff --git a/src/libpspp/i18n.c b/src/libpspp/i18n.c index d3fca6a168..fe749dff18 100644 --- a/src/libpspp/i18n.c +++ b/src/libpspp/i18n.c @@ -264,10 +264,10 @@ recode_string_pool (const char *to, const char *from, { struct substring out; - if ( text == NULL ) + if (text == NULL) return NULL; - if ( length == -1 ) + if (length == -1) length = strlen (text); out = recode_substring_pool (to, from, ss_buffer (text, length), pool); @@ -563,7 +563,7 @@ recode_substring_pool__ (const char *to, const char *from, conv = create_iconv (to, from); - if ( NULL == conv ) + if (NULL == conv) { if (fallbackchar) { @@ -685,7 +685,7 @@ set_encoding_from_locale (const char *loc) loc_encoding = xstrdup (locale_charset ()); - if ( 0 == strcmp (loc_encoding, c_encoding)) + if (0 == strcmp (loc_encoding, c_encoding)) { ok = false; } @@ -737,7 +737,7 @@ valid_encoding (const char *enc) { iconv_t conv = iconv_open (UTF8, enc); - if ( conv == (iconv_t) -1) + if (conv == (iconv_t) -1) return false; iconv_close (conv); diff --git a/src/libpspp/i18n.h b/src/libpspp/i18n.h index 0e77444bed..ea16cfe0fa 100644 --- a/src/libpspp/i18n.h +++ b/src/libpspp/i18n.h @@ -92,7 +92,7 @@ char *utf8_to_title (const char *); a b c d e f g h i j k l m n o p q r s t u v w x y z 0 1 2 3 4 5 6 7 8 9 - ! " # % & ' ( ) * + , - . / : + ! " # % & ' () * + , - . / : ; < = > ? [ \ ] ^ _ { | } ~ space \a \b \r \n \t \v \f \0 diff --git a/src/libpspp/ll.c b/src/libpspp/ll.c index a7f8027085..619adfac24 100644 --- a/src/libpspp/ll.c +++ b/src/libpspp/ll.c @@ -121,7 +121,7 @@ ll_remove_equal (struct ll *r0, struct ll *r1, struct ll *target, size_t count; count = 0; - for (x = r0; x != r1; ) + for (x = r0; x != r1;) if (compare (x, target, aux) == 0) { x = ll_remove (x); @@ -144,7 +144,7 @@ ll_remove_if (struct ll *r0, struct ll *r1, size_t count; count = 0; - for (x = r0; x != r1; ) + for (x = r0; x != r1;) if (predicate (x, aux)) { x = ll_remove (x); diff --git a/src/libpspp/llx.c b/src/libpspp/llx.c index b2e9ead3a6..43704e314e 100644 --- a/src/libpspp/llx.c +++ b/src/libpspp/llx.c @@ -164,7 +164,7 @@ llx_remove_range (struct llx *r0, struct llx *r1, { struct llx *llx; - for (llx = r0; llx != r1; ) + for (llx = r0; llx != r1;) llx = llx_remove (llx, manager); } @@ -181,7 +181,7 @@ llx_remove_equal (struct llx *r0, struct llx *r1, const void *target, size_t count; count = 0; - for (x = r0; x != r1; ) + for (x = r0; x != r1;) if (compare (llx_data (x), target, aux) == 0) { x = llx_remove (x, manager); @@ -206,7 +206,7 @@ llx_remove_if (struct llx *r0, struct llx *r1, size_t count; count = 0; - for (x = r0; x != r1; ) + for (x = r0; x != r1;) if (predicate (llx_data (x), aux)) { x = llx_remove (x, manager); diff --git a/src/libpspp/message.c b/src/libpspp/message.c index de3dab8df7..2a2f543f7e 100644 --- a/src/libpspp/message.c +++ b/src/libpspp/message.c @@ -273,7 +273,7 @@ static void ship_message (struct msg *m) { entrances++; - if ( ! m->shipped ) + if (! m->shipped) { if (msg_handler && entrances <= 1) msg_handler (m, msg_aux); @@ -309,7 +309,7 @@ process_msg (struct msg *m) if (too_many_errors || (too_many_notes && m->severity == MSG_S_NOTE) - || (warnings_off && m->severity == MSG_S_WARNING) ) + || (warnings_off && m->severity == MSG_S_WARNING)) return; ship_message (m); @@ -396,7 +396,7 @@ request_bug_report (const char *msg) #else "Unknown" #endif - ); +); fprintf (stderr, "******************************************************\n"); } diff --git a/src/libpspp/str.c b/src/libpspp/str.c index 57386cbfc4..d855150b35 100644 --- a/src/libpspp/str.c +++ b/src/libpspp/str.c @@ -1621,7 +1621,7 @@ ds_relocate (struct string *st) const char *orig = ds_cstr (st); const char *rel = relocate (orig); - if ( orig != rel) + if (orig != rel) { ds_clear (st); ds_put_cstr (st, rel); diff --git a/src/libpspp/taint.c b/src/libpspp/taint.c index c655d60a61..abe21a3c90 100644 --- a/src/libpspp/taint.c +++ b/src/libpspp/taint.c @@ -96,7 +96,7 @@ taint_clone (const struct taint *taint_) bool taint_destroy (struct taint *taint) { - if ( taint ) + if (taint) { bool was_tainted = taint_is_tainted (taint); if (--taint->ref_cnt == 0) diff --git a/src/libpspp/zip-private.h b/src/libpspp/zip-private.h index 5c956dd8ae..2fe9fb6795 100644 --- a/src/libpspp/zip-private.h +++ b/src/libpspp/zip-private.h @@ -17,10 +17,10 @@ #ifndef ZIP_PRIVATE_H #define ZIP_PRIVATE_H 1 -#define MAGIC_EOCD ( (uint32_t) 0x06054b50) /* End of directory */ -#define MAGIC_SOCD ( (uint32_t) 0x02014b50) /* Start of directory */ -#define MAGIC_LHDR ( (uint32_t) 0x04034b50) /* Local Header */ -#define MAGIC_DDHD ( (uint32_t) 0x08074b50) /* Data Descriptor Header */ +#define MAGIC_EOCD ((uint32_t) 0x06054b50) /* End of directory */ +#define MAGIC_SOCD ((uint32_t) 0x02014b50) /* Start of directory */ +#define MAGIC_LHDR ((uint32_t) 0x04034b50) /* Local Header */ +#define MAGIC_DDHD ((uint32_t) 0x08074b50) /* Data Descriptor Header */ #endif diff --git a/src/libpspp/zip-reader.c b/src/libpspp/zip-reader.c index 6c7c4e41bc..f6d4830ab1 100644 --- a/src/libpspp/zip-reader.c +++ b/src/libpspp/zip-reader.c @@ -220,11 +220,11 @@ zip_member_read (struct zip_member *zm, void *buf, size_t bytes) ds_clear (zm->errmsgs); - if ( bytes > zm->bytes_unread) + if (bytes > zm->bytes_unread) bytes = zm->bytes_unread; bytes_read = zm->decompressor->read (zm, buf, bytes); - if ( bytes_read < 0) + if (bytes_read < 0) return bytes_read; zm->bytes_unread -= bytes_read; @@ -281,7 +281,7 @@ zip_header_read_next (FILE *file, const char *file_name, uint32_t eattr; uint16_t comp_type; - if ( ! check_magic (file, file_name, MAGIC_SOCD, errs)) + if (! check_magic (file, file_name, MAGIC_SOCD, errs)) return false; if (! get_u16 (file, &v)) return false; @@ -320,7 +320,7 @@ zip_reader_create (const char *file_name, struct string *errs) struct zip_reader *zr = xzalloc (sizeof *zr); zr->errs = errs; - if ( zr->errs) + if (zr->errs) ds_init_empty (zr->errs); FILE *file = fopen (file_name, "rb"); @@ -332,14 +332,14 @@ zip_reader_create (const char *file_name, struct string *errs) return NULL; } - if ( ! check_magic (file, file_name, MAGIC_LHDR, zr->errs)) + if (! check_magic (file, file_name, MAGIC_LHDR, zr->errs)) { fclose (file); free (zr); return NULL; } - if ( ! find_eocd (file, &offset)) + if (! find_eocd (file, &offset)) { ds_put_format (zr->errs, _("%s: cannot find central directory"), file_name); @@ -348,7 +348,7 @@ zip_reader_create (const char *file_name, struct string *errs) return NULL; } - if ( 0 != fseeko (file, offset, SEEK_SET)) + if (0 != fseeko (file, offset, SEEK_SET)) { ds_put_format (zr->errs, _("%s: seek failed (%s)"), file_name, strerror (errno)); @@ -358,7 +358,7 @@ zip_reader_create (const char *file_name, struct string *errs) } - if ( ! check_magic (file, file_name, MAGIC_EOCD, zr->errs)) + if (! check_magic (file, file_name, MAGIC_EOCD, zr->errs)) { fclose (file); free (zr); @@ -379,7 +379,7 @@ zip_reader_create (const char *file_name, struct string *errs) return NULL; } - if ( 0 != fseeko (file, central_dir_start, SEEK_SET)) + if (0 != fseeko (file, central_dir_start, SEEK_SET)) { ds_put_format (zr->errs, _("%s: seek failed (%s)"), file_name, strerror (errno)); @@ -436,7 +436,7 @@ struct zip_member * zip_member_open (struct zip_reader *zr, const char *member) { struct zip_entry *ze = zip_entry_find (zr, member); - if ( ze == NULL) + if (ze == NULL) { ds_put_format (zr->errs, _("%s: unknown member \"%s\""), zr->file_name, member); @@ -463,14 +463,14 @@ zip_member_open (struct zip_reader *zr, const char *member) zm->errmsgs = zr->errs; zm->aux = NULL; - if ( 0 != fseeko (zm->fp, zm->offset, SEEK_SET)) + if (0 != fseeko (zm->fp, zm->offset, SEEK_SET)) { ds_put_format (zr->errs, _("%s: seek failed (%s)"), ze->name, strerror (errno)); goto error; } - if ( ! check_magic (zm->fp, zr->file_name, MAGIC_LHDR, zr->errs)) + if (! check_magic (zm->fp, zr->file_name, MAGIC_LHDR, zr->errs)) goto error; uint16_t v, nlen, extra_len; @@ -510,7 +510,7 @@ zip_member_open (struct zip_reader *zr, const char *member) skip_bytes (zm->fp, extra_len); - if (!zm->decompressor->init (zm) ) + if (!zm->decompressor->init (zm)) goto error; return zm; @@ -543,7 +543,7 @@ find_eocd (FILE *fp, off_t *off) because that is the minimum length of the EndOfCentralDirectory record. */ - if ( 0 > fseeko (fp, -22, SEEK_END)) + if (0 > fseeko (fp, -22, SEEK_END)) { return false; } @@ -553,12 +553,12 @@ find_eocd (FILE *fp, off_t *off) { found = probe_magic (fp, magic, start, stop, off); /* FIXME: For extra confidence lookup the directory start record here*/ - if ( start == 0) + if (start == 0) break; stop = start + sizeof (magic); start >>= 1; } - while (!found ); + while (!found); return found; } @@ -577,7 +577,7 @@ probe_magic (FILE *fp, uint32_t magic, off_t start, off_t stop, off_t *off) unsigned char seq[4]; unsigned char byte; - if ( 0 > fseeko (fp, start, SEEK_SET)) + if (0 > fseeko (fp, start, SEEK_SET)) { return -1; } @@ -592,18 +592,18 @@ probe_magic (FILE *fp, uint32_t magic, off_t start, off_t stop, off_t *off) if (1 != fread (&byte, 1, 1, fp)) break; - if ( byte == seq[state]) + if (byte == seq[state]) state++; else state = 0; - if ( state == 4) + if (state == 4) { *off = ftello (fp) - 4; return true; } start++; - if ( start >= stop) + if (start >= stop) break; } while (!feof (fp)); @@ -677,7 +677,7 @@ inflate_init (struct zip_member *zm) cmf |= cinfo << 4; /* Put cinfo into the high nibble */ /* make these into a 16 bit word */ - inf->cmf_flg = (cmf << 8 ) | flg; + inf->cmf_flg = (cmf << 8) | flg; /* Set the check bits */ inf->cmf_flg += 31 - (inf->cmf_flg % 31); @@ -690,7 +690,7 @@ inflate_init (struct zip_member *zm) inf->zss.opaque = Z_NULL; r = inflateInit (&inf->zss); - if ( Z_OK != r) + if (Z_OK != r) { ds_put_format (zm->errmsgs, _("%s: cannot initialize inflator (%s)"), @@ -715,7 +715,7 @@ inflate_read (struct zip_member *zm, void *buf, size_t n) int bytes_to_read; int pad = 0; - if ( inf->state == 0) + if (inf->state == 0) { inf->ucomp[1] = inf->cmf_flg ; inf->ucomp[0] = inf->cmf_flg >> 8 ; @@ -743,7 +743,7 @@ inflate_read (struct zip_member *zm, void *buf, size_t n) inf->zss.next_out = buf; r = inflate (&inf->zss, Z_NO_FLUSH); - if ( Z_OK == r) + if (Z_OK == r) { return n - inf->zss.avail_out; } diff --git a/src/math/box-whisker.c b/src/math/box-whisker.c index f9581be087..53831824a0 100644 --- a/src/math/box-whisker.c +++ b/src/math/box-whisker.c @@ -40,7 +40,7 @@ destroy (struct statistic *s) struct order_stats *os = &bw->parent; struct ll *ll; - for (ll = ll_head (&bw->outliers); ll != ll_null (&bw->outliers); ) + for (ll = ll_head (&bw->outliers); ll != ll_null (&bw->outliers);) { struct outlier *e = ll_data (ll, struct outlier, ll); @@ -63,7 +63,7 @@ acc (struct statistic *s, const struct ccase *cx, bool extreme; struct outlier *o; - if ( y > bw->hinges[2] + bw->step) /* Upper outlier */ + if (y > bw->hinges[2] + bw->step) /* Upper outlier */ { extreme = (y > bw->hinges[2] + 2 * bw->step) ; } diff --git a/src/math/covariance.c b/src/math/covariance.c index dea0055ffa..cd8ec2ffd1 100644 --- a/src/math/covariance.c +++ b/src/math/covariance.c @@ -165,7 +165,7 @@ covariance_1pass_create (size_t n_vars, const struct variable *const *vars, cov->exclude = exclude; - cov->n_cm = (n_vars * (n_vars - 1) ) / 2; + cov->n_cm = (n_vars * (n_vars - 1)) / 2; cov->cm = xcalloc (cov->n_cm, sizeof *cov->cm); @@ -232,13 +232,13 @@ cm_idx (const struct covariance *cov, int i, int j) assert (i >= 0); assert (j < cov->dim); - if ( i == 0) + if (i == 0) return -1; if (j >= cov->dim - 1) return -1; - if ( i <= j) + if (i <= j) return -1 ; as = nj * (nj + 1) ; @@ -269,7 +269,7 @@ is_missing (const struct covariance *cov, int i, const struct ccase *c) static double get_val (const struct covariance *cov, int i, const struct ccase *c) { - if ( i < cov->n_vars) + if (i < cov->n_vars) { const struct variable *var = cov->vars[i]; @@ -317,14 +317,14 @@ covariance_accumulate_pass1 (struct covariance *cov, const struct ccase *c) { double v1 = get_val (cov, i, c); - if ( is_missing (cov, i, c)) + if (is_missing (cov, i, c)) continue; for (j = 0 ; j < cov->dim; ++j) { double pwr = 1.0; - if ( is_missing (cov, j, c)) + if (is_missing (cov, j, c)) continue; for (m = 0 ; m <= MOMENT_MEAN; ++m) @@ -365,7 +365,7 @@ covariance_accumulate_pass2 (struct covariance *cov, const struct ccase *c) if (cov->categoricals) cov->dim += categoricals_df_total (cov->categoricals); - cov->n_cm = (cov->dim * (cov->dim - 1) ) / 2; + cov->n_cm = (cov->dim * (cov->dim - 1)) / 2; cov->cm = xcalloc (cov->n_cm, sizeof *cov->cm); /* Grow the moment matrices so that they're large enough to accommodate the @@ -419,7 +419,7 @@ covariance_accumulate_pass2 (struct covariance *cov, const struct ccase *c) { double v1 = get_val (cov, i, c); - if ( is_missing (cov, i, c)) + if (is_missing (cov, i, c)) continue; for (j = 0 ; j < cov->dim; ++j) @@ -430,7 +430,7 @@ covariance_accumulate_pass2 (struct covariance *cov, const struct ccase *c) const double s = pow2 (v1 - gsl_matrix_get (cov->moments[MOMENT_MEAN], i, j)) * weight; - if ( is_missing (cov, j, c)) + if (is_missing (cov, j, c)) continue; { @@ -468,9 +468,9 @@ covariance_accumulate (struct covariance *cov, const struct ccase *c) assert (cov->passes == 1); - if ( !cov->pass_one_first_case_seen) + if (!cov->pass_one_first_case_seen) { - assert ( cov->state == 0); + assert (cov->state == 0); cov->state = 1; } @@ -478,7 +478,7 @@ covariance_accumulate (struct covariance *cov, const struct ccase *c) { const union value *val1 = case_data (c, cov->vars[i]); - if ( is_missing (cov, i, c)) + if (is_missing (cov, i, c)) continue; for (j = 0 ; j < cov->dim; ++j) @@ -487,7 +487,7 @@ covariance_accumulate (struct covariance *cov, const struct ccase *c) int idx; const union value *val2 = case_data (c, cov->vars[j]); - if ( is_missing (cov, j, c)) + if (is_missing (cov, j, c)) continue; idx = cm_idx (cov, i, j); @@ -521,7 +521,7 @@ cm_to_gsl (struct covariance *cov) gsl_matrix *m = gsl_matrix_calloc (cov->dim, cov->dim); /* Copy the non-diagonal elements from cov->cm */ - for ( j = 0 ; j < cov->dim - 1; ++j) + for (j = 0 ; j < cov->dim - 1; ++j) { for (i = j+1 ; i < cov->dim; ++i) { @@ -555,7 +555,7 @@ covariance_calculate_double_pass (struct covariance *cov) *x /= gsl_matrix_get (cov->moments[MOMENT_NONE], i, j); idx = cm_idx (cov, i, j); - if ( idx >= 0) + if (idx >= 0) { x = &cov->cm [idx]; *x /= gsl_matrix_get (cov->moments[MOMENT_NONE], i, j); @@ -575,7 +575,7 @@ covariance_calculate_single_pass (struct covariance *cov) for (m = 0; m < n_MOMENTS; ++m) { /* Divide the moments by the number of samples */ - if ( m > 0) + if (m > 0) { for (i = 0 ; i < cov->dim; ++i) { @@ -584,7 +584,7 @@ covariance_calculate_single_pass (struct covariance *cov) double *x = gsl_matrix_ptr (cov->moments[m], i, j); *x /= gsl_matrix_get (cov->moments[0], i, j); - if ( m == MOMENT_VARIANCE) + if (m == MOMENT_VARIANCE) *x -= pow2 (gsl_matrix_get (cov->moments[1], i, j)); } } @@ -594,7 +594,7 @@ covariance_calculate_single_pass (struct covariance *cov) if (cov->centered) { /* Centre the moments */ - for ( j = 0 ; j < cov->dim - 1; ++j) + for (j = 0 ; j < cov->dim - 1; ++j) { for (i = j + 1 ; i < cov->dim; ++i) { @@ -622,7 +622,7 @@ covariance_calculate_single_pass (struct covariance *cov) gsl_matrix * covariance_calculate (struct covariance *cov) { - if ( cov->state <= 0 ) + if (cov->state <= 0) return NULL; switch (cov->passes) @@ -664,7 +664,7 @@ covariance_calculate_single_pass_unnormalized (struct covariance *cov) } } - for ( j = 0 ; j < cov->dim - 1; ++j) + for (j = 0 ; j < cov->dim - 1; ++j) { for (i = j + 1 ; i < cov->dim; ++i) { @@ -690,7 +690,7 @@ covariance_calculate_single_pass_unnormalized (struct covariance *cov) const gsl_matrix * covariance_calculate_unnormalized (struct covariance *cov) { - if ( cov->state <= 0 ) + if (cov->state <= 0) return NULL; if (cov->unnormalised != NULL) diff --git a/src/math/extrema.c b/src/math/extrema.c index 7b82a5c4a0..1ff9eb199f 100644 --- a/src/math/extrema.c +++ b/src/math/extrema.c @@ -43,7 +43,7 @@ cmp_descending (const struct ll *a_, const struct ll *b_, void *aux UNUSED) const struct extremum *a = ll_data (a_, struct extremum, ll); const struct extremum *b = ll_data (b_, struct extremum, ll); - if ( a->value > b->value) return -1; + if (a->value > b->value) return -1; return (a->value < b->value); } @@ -54,7 +54,7 @@ cmp_ascending (const struct ll *a_, const struct ll *b_, void *aux UNUSED) const struct extremum *a = ll_data (a_, struct extremum, ll); const struct extremum *b = ll_data (b_, struct extremum, ll); - if ( a->value < b->value) return -1; + if (a->value < b->value) return -1; return (a->value > b->value); } @@ -66,7 +66,7 @@ extrema_create (size_t n, enum extreme_end end) struct extrema *extrema = xzalloc (sizeof *extrema); extrema->capacity = n; - if ( end == EXTREME_MAXIMA ) + if (end == EXTREME_MAXIMA) extrema->cmp_func = cmp_descending; else extrema->cmp_func = cmp_ascending; @@ -103,7 +103,7 @@ extrema_add (struct extrema *extrema, double val, e->location = location; e->weight = weight; - if ( val == SYSMIS) + if (val == SYSMIS) { free (e); return; @@ -112,7 +112,7 @@ extrema_add (struct extrema *extrema, double val, ll_insert_ordered (ll_head (&extrema->list), ll_null (&extrema->list), &e->ll, extrema->cmp_func, NULL); - if ( extrema->n++ > extrema->capacity) + if (extrema->n++ > extrema->capacity) { struct ll *tail = ll_tail (&extrema->list); struct extremum *et = ll_data (tail, struct extremum, ll); @@ -136,7 +136,7 @@ extrema_top (const struct extrema *ex, double *v) { const struct extremum *top; - if ( ll_is_empty (&ex->list)) + if (ll_is_empty (&ex->list)) return false; top = (const struct extremum *) diff --git a/src/math/interaction.c b/src/math/interaction.c index 909ce0de63..c39a0b4846 100644 --- a/src/math/interaction.c +++ b/src/math/interaction.c @@ -35,7 +35,7 @@ interaction_create (const struct variable *v) struct interaction *iact = xmalloc (sizeof *iact); iact->vars = xmalloc (sizeof *iact->vars); iact->n_vars = 0; - if ( v ) + if (v) { iact->vars[0] = v; iact->n_vars = 1; diff --git a/src/math/levene.c b/src/math/levene.c index 89f6356280..5785623a6a 100644 --- a/src/math/levene.c +++ b/src/math/levene.c @@ -93,10 +93,10 @@ cutpoint_cmp (const struct levene *nl, const union value *val0, const union valu int y = value_compare_3way (val1, nl->cutpoint, nl->gvw); - if ( x == 0) x = 1; - if ( y == 0) y = 1; + if (x == 0) x = 1; + if (y == 0) y = 1; - return ( x == y); + return (x == y); } @@ -138,13 +138,13 @@ levene_pass_one (struct levene *nl, double value, double weight, const union val { struct lev *lev = find_group (nl, gv); - if ( nl->pass == 0 ) + if (nl->pass == 0) { nl->pass = 1; } assert (nl->pass == 1); - if ( NULL == lev) + if (NULL == lev) { struct lev *l = xzalloc (sizeof *l); value_clone (&l->group, gv, nl->gvw); @@ -164,7 +164,7 @@ levene_pass_two (struct levene *nl, double value, double weight, const union val { struct lev *lev = NULL; - if ( nl->pass == 1 ) + if (nl->pass == 1) { struct lev *next; struct lev *l; @@ -191,7 +191,7 @@ levene_pass_three (struct levene *nl, double value, double weight, const union v double z; struct lev *lev = NULL; - if ( nl->pass == 2 ) + if (nl->pass == 2) { struct lev *next; struct lev *l; @@ -231,7 +231,7 @@ levene_calculate (struct levene *nl) */ assert (nl->pass == 0 || nl->pass == 3); - if ( nl->pass == 0 ) + if (nl->pass == 0) return SYSMIS; nl->denominator *= hmap_count (&nl->hmap) - 1; diff --git a/src/math/linreg.c b/src/math/linreg.c index f60672e2ca..d417599bab 100644 --- a/src/math/linreg.c +++ b/src/math/linreg.c @@ -530,19 +530,19 @@ double linreg_sst (const struct linreg *c) } double -linreg_dfmodel ( const struct linreg *c) +linreg_dfmodel (const struct linreg *c) { return c->dfm; } double -linreg_dferror ( const struct linreg *c) +linreg_dferror (const struct linreg *c) { return c->dfe; } double -linreg_dftotal ( const struct linreg *c) +linreg_dftotal (const struct linreg *c) { return c->dft; } diff --git a/src/math/merge.c b/src/math/merge.c index 5b0704d9c2..45ae607062 100644 --- a/src/math/merge.c +++ b/src/math/merge.c @@ -137,7 +137,7 @@ do_merge (struct merge *m) taint_propagate (casereader_get_taint (m->inputs[i].reader), casewriter_get_taint (w)); - for (i = 0; i < m->input_cnt; ) + for (i = 0; i < m->input_cnt;) if (read_input_case (m, i)) i++; while (m->input_cnt > 0) diff --git a/src/math/np.c b/src/math/np.c index 598c05e84b..dd197f9c6d 100644 --- a/src/math/np.c +++ b/src/math/np.c @@ -47,7 +47,7 @@ acc (struct statistic *s, const struct ccase *cx UNUSED, struct np *np = UP_CAST (s, struct np, parent.parent); double rank = np->prev_cc + (c + 1) / 2.0; - double ns = gsl_cdf_ugaussian_Pinv (rank / ( np->n + 1 )); + double ns = gsl_cdf_ugaussian_Pinv (rank / (np->n + 1)); double z = (y - np->mean) / np->stddev; diff --git a/src/math/order-stats.c b/src/math/order-stats.c index 157bf2a165..59edc92fc8 100644 --- a/src/math/order-stats.c +++ b/src/math/order-stats.c @@ -62,7 +62,7 @@ static void update_k_lower (struct k *kk, double y_i, double c_i, double cc_i) { - if ( cc_i <= kk->tc ) + if (cc_i <= kk->tc) { kk->cc = cc_i; kk->c = c_i; @@ -75,7 +75,7 @@ static void update_k_upper (struct k *kk, double y_i, double c_i, double cc_i) { - if ( cc_i > kk->tc && kk->c_p1 == 0) + if (cc_i > kk->tc && kk->c_p1 == 0) { kk->cc_p1 = cc_i; kk->c_p1 = c_i; @@ -102,7 +102,7 @@ update_k_values (const struct ccase *cx, double y_i, double c_i, double cc_i, update_k_upper (myk, y_i, c_i, cc_i); } - if ( stat->accumulate ) + if (stat->accumulate) stat->accumulate (stat, cx, c_i, cc_i, y_i); tos->cc = cc_i; @@ -131,10 +131,10 @@ order_stats_accumulate_idx (struct order_stats **os, size_t nos, /* The casereader MUST be sorted */ assert (this_value >= prev_value); - if ( prev_value == -DBL_MAX || prev_value == this_value) + if (prev_value == -DBL_MAX || prev_value == this_value) c_i += weight; - if ( prev_value > -DBL_MAX && this_value > prev_value) + if (prev_value > -DBL_MAX && this_value > prev_value) { update_k_values (prev_cx, prev_value, c_i, cc_i, os, nos); c_i = weight; diff --git a/src/math/percentiles.c b/src/math/percentiles.c index 9055279b5a..a55cfaf2bf 100644 --- a/src/math/percentiles.c +++ b/src/math/percentiles.c @@ -48,27 +48,27 @@ percentile_calculate (const struct percentile *ptl, enum pc_alg alg) struct percentile *mutable = CONST_CAST (struct percentile *, ptl); const struct order_stats *os = &ptl->parent; - if ( ptl->g1 == SYSMIS) + if (ptl->g1 == SYSMIS) mutable->g1 = (os->k[0].tc - os->k[0].cc) / os->k[0].c_p1; - if ( ptl->g1_star == SYSMIS) + if (ptl->g1_star == SYSMIS) mutable->g1_star = os->k[0].tc - os->k[0].cc; - if ( ptl->g2 == SYSMIS) + if (ptl->g2 == SYSMIS) { - if ( os->k[1].c == 0 ) + if (os->k[1].c == 0) mutable->g2 = os->k[1].tc / os->k[1].c_p1; - else if ( os->k[1].c_p1 == 0 ) + else if (os->k[1].c_p1 == 0) mutable->g2 = 0; else mutable->g2 = (os->k[1].tc - os->k[1].cc) / os->k[1].c_p1; } - if ( ptl->g2_star == SYSMIS) + if (ptl->g2_star == SYSMIS) { - if ( os->k[1].c == 0 ) + if (os->k[1].c == 0) mutable->g2_star = os->k[1].tc; - else if ( os->k[1].c_p1 == 0 ) + else if (os->k[1].c_p1 == 0) mutable->g2_star = 0; else mutable->g2_star = os->k[1].tc - os->k[1].cc; @@ -77,11 +77,11 @@ percentile_calculate (const struct percentile *ptl, enum pc_alg alg) switch (alg) { case PC_WAVERAGE: - if ( ptl->g1_star >= 1.0) + if (ptl->g1_star >= 1.0) return os->k[0].y_p1; else { - double a = ( os->k[0].y == SYSMIS ) ? 0 : os->k[0].y; + double a = (os->k[0].y == SYSMIS) ? 0 : os->k[0].y; if (os->k[0].c_p1 >= 1.0) return (1 - ptl->g1_star) * a + ptl->g1_star * os->k[0].y_p1; @@ -92,7 +92,7 @@ percentile_calculate (const struct percentile *ptl, enum pc_alg alg) case PC_ROUND: { - double a = ( os->k[0].y == SYSMIS ) ? 0 : os->k[0].y; + double a = (os->k[0].y == SYSMIS) ? 0 : os->k[0].y; if (os->k[0].c_p1 >= 1.0) return (ptl->g1_star < 0.5) ? a : os->k[0].y_p1; @@ -102,24 +102,24 @@ percentile_calculate (const struct percentile *ptl, enum pc_alg alg) break; case PC_EMPIRICAL: - if ( ptl->g1_star == 0 ) + if (ptl->g1_star == 0) return os->k[0].y; else return os->k[0].y_p1; break; case PC_HAVERAGE: - if ( ptl->g2_star >= 1.0) + if (ptl->g2_star >= 1.0) { return os->k[1].y_p1; } else { - double a = ( os->k[1].y == SYSMIS ) ? 0 : os->k[1].y; + double a = (os->k[1].y == SYSMIS) ? 0 : os->k[1].y; - if ( os->k[1].c_p1 >= 1.0) + if (os->k[1].c_p1 >= 1.0) { - if ( ptl->g2_star == 0) + if (ptl->g2_star == 0) return os->k[1].y; return (1 - ptl->g2_star) * a + ptl->g2_star * os->k[1].y_p1; @@ -133,7 +133,7 @@ percentile_calculate (const struct percentile *ptl, enum pc_alg alg) break; case PC_AEMPIRICAL: - if ( ptl->g1_star == 0 ) + if (ptl->g1_star == 0) return (os->k[0].y + os->k[0].y_p1)/ 2.0; else return os->k[0].y_p1; diff --git a/src/math/trimmed-mean.c b/src/math/trimmed-mean.c index a687dd9b5f..d75b539a66 100644 --- a/src/math/trimmed-mean.c +++ b/src/math/trimmed-mean.c @@ -33,10 +33,10 @@ acc (struct statistic *s, const struct ccase *cx UNUSED, double c, double cc, do struct trimmed_mean *tm = UP_CAST (s, struct trimmed_mean, parent.parent); struct order_stats *os = &tm->parent; - if ( cc > os->k[0].tc && cc <= os->k[1].tc) + if (cc > os->k[0].tc && cc <= os->k[1].tc) tm->sum += c * y; - if ( tm->cyk1p1 == SYSMIS && cc > os->k[0].tc) + if (tm->cyk1p1 == SYSMIS && cc > os->k[0].tc) tm->cyk1p1 = c * y; } @@ -88,6 +88,6 @@ trimmed_mean_calculate (const struct trimmed_mean *tm) (tm->w - os->k[1].cc - os->k[0].tc) * os->k[1].y_p1 + tm->sum - ) +) / ((1.0 - tm->tail * 2) * tm->w); } diff --git a/src/math/tukey-hinges.c b/src/math/tukey-hinges.c index 99a42cdac8..c483a508c5 100644 --- a/src/math/tukey-hinges.c +++ b/src/math/tukey-hinges.c @@ -41,7 +41,7 @@ tukey_hinges_calculate (const struct tukey_hinges *th, double hinge[3]) if (a_star[i] < 1) { - if (os->k[i].c_p1 >= 1 ) + if (os->k[i].c_p1 >= 1) { hinge[i] = (1 - a_star[i]) * os->k[i].y + a_star[i] * os->k[i].y_p1; @@ -83,7 +83,7 @@ tukey_hinges_create (double W, double c_min) os->n_k = 3; os->k = xcalloc (3, sizeof (*os->k)); - if ( c_min >= 1.0) + if (c_min >= 1.0) { d = floor ((W + 3) / 2.0) / 2.0; diff --git a/src/output/ascii.c b/src/output/ascii.c index 242e75286f..3113997e48 100644 --- a/src/output/ascii.c +++ b/src/output/ascii.c @@ -719,7 +719,7 @@ text_draw (struct ascii_driver *a, enum table_halign halign, int options, int ofs; ofs = width = 0; - for (ofs = 0; ofs < n; ) + for (ofs = 0; ofs < n;) { ucs4_t uc; int mblen; @@ -864,7 +864,7 @@ ascii_layout_cell (struct ascii_driver *a, const struct table_cell *cell, size_t graph_ofs; size_t ofs; - for (ofs = 0; ofs < n; ) + for (ofs = 0; ofs < n;) { ucs4_t uc; int mblen; @@ -976,7 +976,7 @@ ascii_test_flush (struct output_driver *driver) { struct ascii_driver *a = ascii_driver_cast (driver); - for (size_t i = a->allocated_lines; i-- > 0; ) + for (size_t i = a->allocated_lines; i-- > 0;) if (a->lines[i].width) { ascii_output_lines (a, i + 1); diff --git a/src/output/cairo-chart.c b/src/output/cairo-chart.c index 342a46e1a0..c5bffcd761 100644 --- a/src/output/cairo-chart.c +++ b/src/output/cairo-chart.c @@ -308,7 +308,7 @@ draw_tick_internal (cairo_t *cr, const struct xrchart_geometry *geom, if (orientation == SCALE_ABSCISSA) { - if ( rotated) + if (rotated) xrchart_label_rotate (cr, 'l', 'c', geom->font_size, s, -G_PI_4); else xrchart_label (cr, 'c', 't', geom->font_size, s); @@ -469,7 +469,7 @@ xrchart_write_legend (cairo_t *cr, const struct xrchart_geometry *geom) const int swatch = 20; const int legend_top = geom->axis[SCALE_ORDINATE].data_max; const int legend_bottom = legend_top - - (vstep * geom->n_datasets + 2 * ypad ); + (vstep * geom->n_datasets + 2 * ypad); cairo_save (cr); @@ -478,7 +478,7 @@ xrchart_write_legend (cairo_t *cr, const struct xrchart_geometry *geom) legend_bottom - legend_top); cairo_stroke (cr); - for (i = 0 ; i < geom->n_datasets ; ++i ) + for (i = 0 ; i < geom->n_datasets ; ++i) { const int ypos = legend_top - vstep * (i + 1); const int xpos = geom->legend_left + xpad; @@ -578,10 +578,10 @@ xrchart_line(cairo_t *cr, const struct xrchart_geometry *geom, double x1, y1; double x2, y2; - if ( lim_dim == XRCHART_DIM_Y ) + if (lim_dim == XRCHART_DIM_Y) { - x1 = ( limit1 - intercept ) / slope; - x2 = ( limit2 - intercept ) / slope; + x1 = (limit1 - intercept) / slope; + x2 = (limit2 - intercept) / slope; y1 = limit1; y2 = limit2; } diff --git a/src/output/cairo.c b/src/output/cairo.c index 57c27ddc23..e15cb6114a 100644 --- a/src/output/cairo.c +++ b/src/output/cairo.c @@ -433,7 +433,7 @@ parse_color__ (const char *s, struct cell_color *color) } /* rgb(r,g,b) */ - if (sscanf (s, "rgb (%"SCNi8" , %"SCNi8" , %"SCNi8" ) %n", + if (sscanf (s, "rgb (%"SCNi8" , %"SCNi8" , %"SCNi8") %n", &r, &g, &b, &len) == 3 && !s[len]) { @@ -444,7 +444,7 @@ parse_color__ (const char *s, struct cell_color *color) } /* rgba(r,g,b,a), ignoring a. */ - if (sscanf (s, "rgba (%"SCNi8" , %"SCNi8" , %"SCNi8", %*f ) %n", + if (sscanf (s, "rgba (%"SCNi8" , %"SCNi8" , %"SCNi8", %*f) %n", &r, &g, &b, &len) == 3 && !s[len]) { diff --git a/src/output/charts/barchart-cairo.c b/src/output/charts/barchart-cairo.c index ce97cdea6c..e6f33ad118 100644 --- a/src/output/charts/barchart-cairo.c +++ b/src/output/charts/barchart-cairo.c @@ -68,7 +68,7 @@ xrchart_draw_barchart (const struct chart_item *chart_item, cairo_t *cr, xrchart_write_xlabel (cr, geom, chart_item_get_title (chart_item)); if (bc->percent) - xrchart_write_yscale (cr, geom, 0, bc->largest * 100.0 / bc->total_count ); + xrchart_write_yscale (cr, geom, 0, bc->largest * 100.0 / bc->total_count); else xrchart_write_yscale (cr, geom, 0, bc->largest); diff --git a/src/output/charts/boxplot-cairo.c b/src/output/charts/boxplot-cairo.c index 516fe6423e..041b4fabb8 100644 --- a/src/output/charts/boxplot-cairo.c +++ b/src/output/charts/boxplot-cairo.c @@ -65,9 +65,9 @@ boxplot_draw_box (cairo_t *cr, const struct xrchart_geometry *geom, box_whisker_whiskers (bw, whisker); box_whisker_hinges (bw, hinge); - box_bottom = geom->axis[SCALE_ORDINATE].data_min + (hinge[0] - geom->axis[SCALE_ORDINATE].min ) * geom->axis[SCALE_ORDINATE].scale; + box_bottom = geom->axis[SCALE_ORDINATE].data_min + (hinge[0] - geom->axis[SCALE_ORDINATE].min) * geom->axis[SCALE_ORDINATE].scale; - box_top = geom->axis[SCALE_ORDINATE].data_min + (hinge[2] - geom->axis[SCALE_ORDINATE].min ) * geom->axis[SCALE_ORDINATE].scale; + box_top = geom->axis[SCALE_ORDINATE].data_min + (hinge[2] - geom->axis[SCALE_ORDINATE].min) * geom->axis[SCALE_ORDINATE].scale; bottom_whisker = geom->axis[SCALE_ORDINATE].data_min + (whisker[0] - geom->axis[SCALE_ORDINATE].min) * geom->axis[SCALE_ORDINATE].scale; @@ -107,7 +107,7 @@ boxplot_draw_box (cairo_t *cr, const struct xrchart_geometry *geom, cairo_stroke (cr); /* Draw top whisker */ - if (! isnan (top_whisker) ) + if (! isnan (top_whisker)) { cairo_move_to (cr, box_left, top_whisker); cairo_line_to (cr, box_right, top_whisker); diff --git a/src/output/charts/piechart-cairo.c b/src/output/charts/piechart-cairo.c index 26ac7b998c..c63706792e 100644 --- a/src/output/charts/piechart-cairo.c +++ b/src/output/charts/piechart-cairo.c @@ -75,7 +75,7 @@ xrchart_draw_piechart (const struct chart_item *chart_item, cairo_t *cr, /* Draw the segments */ angle = 0.0; - for (i = 0; i < pie->n_slices ; ++i ) + for (i = 0; i < pie->n_slices ; ++i) { const double segment_angle = pie->slices[i].magnitude / total_magnitude * 2 * M_PI ; @@ -96,7 +96,7 @@ xrchart_draw_piechart (const struct chart_item *chart_item, cairo_t *cr, obscure them. */ angle = 0.0; - for (i = 0; i < pie->n_slices ; ++i ) + for (i = 0; i < pie->n_slices ; ++i) { const double segment_angle = pie->slices[i].magnitude / total_magnitude * 2 * M_PI ; @@ -107,7 +107,7 @@ xrchart_draw_piechart (const struct chart_item *chart_item, cairo_t *cr, const double label_y = centre_y + radius * sin (angle + segment_angle/2.0); - if ( label_x < centre_x ) + if (label_x < centre_x) { cairo_move_to (cr, label_x, label_y); cairo_line_to (cr, left_label, label_y); diff --git a/src/output/charts/piechart.c b/src/output/charts/piechart.c index 0467c8338f..d00db1ffd1 100644 --- a/src/output/charts/piechart.c +++ b/src/output/charts/piechart.c @@ -50,7 +50,7 @@ piechart_create (const struct variable *var, const struct freq *slices, int n_sl ds_init_empty (&dst->label); - if ( var_is_value_missing (var, &src->values[0], MV_ANY)) + if (var_is_value_missing (var, &src->values[0], MV_ANY)) ds_assign_cstr (&dst->label, _("*MISSING*")); else var_append_value_name (var, &src->values[0], &dst->label); diff --git a/src/output/charts/plot-hist-cairo.c b/src/output/charts/plot-hist-cairo.c index d196b15723..000695f331 100644 --- a/src/output/charts/plot-hist-cairo.c +++ b/src/output/charts/plot-hist-cairo.c @@ -75,8 +75,8 @@ hist_draw_bar (cairo_t *cr, const struct xrchart_geometry *geom, double lower; double height; - assert ( 0 == gsl_histogram_get_range (h, bar, &lower, &upper)); - assert ( upper >= lower); + assert (0 == gsl_histogram_get_range (h, bar, &lower, &upper)); + assert (upper >= lower); const double x_pos = (lower - geom->axis[SCALE_ABSCISSA].min) * geom->axis[SCALE_ABSCISSA].scale diff --git a/src/output/charts/roc-chart-cairo.c b/src/output/charts/roc-chart-cairo.c index 2ac494e3cd..97f7a45d9a 100644 --- a/src/output/charts/roc-chart-cairo.c +++ b/src/output/charts/roc-chart-cairo.c @@ -40,7 +40,7 @@ xrchart_draw_roc (const struct chart_item *chart_item, cairo_t *cr, xrchart_write_xscale (cr, geom, 0, 1); xrchart_write_yscale (cr, geom, 0, 1); - if ( rc->reference ) + if (rc->reference) { xrchart_line (cr, geom, 1.0, 0, 0.0, 1.0, diff --git a/src/output/charts/scree-cairo.c b/src/output/charts/scree-cairo.c index db0ce1370f..a3ae10cd62 100644 --- a/src/output/charts/scree-cairo.c +++ b/src/output/charts/scree-cairo.c @@ -39,7 +39,7 @@ xrchart_draw_scree (const struct chart_item *chart_item, cairo_t *cr, gsl_vector_minmax (rc->eval, &min, &max); - if ( fabs (max) > fabs (min)) + if (fabs (max) > fabs (min)) max = fabs (max); else max = fabs (min); diff --git a/src/output/charts/spreadlevel-plot.c b/src/output/charts/spreadlevel-plot.c index 44e2c658a9..8b599b8cd2 100644 --- a/src/output/charts/spreadlevel-plot.c +++ b/src/output/charts/spreadlevel-plot.c @@ -53,7 +53,7 @@ spreadlevel_plot_add (struct chart_item *ci, double spread, double level) { struct spreadlevel_plot_chart *sl = to_spreadlevel_plot_chart (ci); - if ( sl->tx_pwr == 0) + if (sl->tx_pwr == 0) { spread = log (spread); level = log (level); diff --git a/src/output/driver.c b/src/output/driver.c index 7782e91f0c..6204e335ca 100644 --- a/src/output/driver.c +++ b/src/output/driver.c @@ -289,7 +289,7 @@ output_get_command_name (void) if (e == NULL) return NULL; - for (size_t i = e->n_groups; i-- > 0; ) + for (size_t i = e->n_groups; i-- > 0;) if (e->groups[i]) return utf8_to_upper (e->groups[i]); @@ -596,7 +596,7 @@ output_driver_substitute_heading_vars (const char *src, int page_number) struct output_engine *e = engine_stack_top (); struct string dst = DS_EMPTY_INITIALIZER; ds_extend (&dst, strlen (src)); - for (const char *p = src; *p; ) + for (const char *p = src; *p;) { if (!strncmp (p, "&[", 6)) { diff --git a/src/output/html.c b/src/output/html.c index 989476ecaa..f96e70ccb4 100644 --- a/src/output/html.c +++ b/src/output/html.c @@ -124,7 +124,7 @@ html_create (struct file_handle *fh, enum settings_output_devices device_type, fputs ("\n", html->file); - if ( html->css) + if (html->css) { fputs ("\n", html->file); @@ -244,7 +244,7 @@ html_submit (struct output_driver *driver, html->chart_cnt++, &html->fg, &html->bg - ); + ); if (file_name != NULL) { const char *title = chart_item_get_title (chart_item); @@ -492,7 +492,7 @@ html_output_table (struct html_driver *html, const struct table_item *item) int x; fputs (" \n", html->file); - for (x = 0; x < table_nc (t); ) + for (x = 0; x < table_nc (t);) { struct table_cell cell; const char *tag; diff --git a/src/output/journal.c b/src/output/journal.c index 92fa793be1..9cab788051 100644 --- a/src/output/journal.c +++ b/src/output/journal.c @@ -78,7 +78,7 @@ journal_destroy (struct output_driver *driver) { struct journal_driver *j = journal_driver_cast (driver); - if ( !j->destroyed) + if (!j->destroyed) journal_close (); j->destroyed = true; @@ -87,7 +87,7 @@ journal_destroy (struct output_driver *driver) static void journal_output (struct journal_driver *j, const char *s) { - if ( j->file == NULL) + if (j->file == NULL) return; fprintf (j->file, "%s\n", s); diff --git a/src/output/odt.c b/src/output/odt.c index 8e50c7b9cc..256fd197da 100644 --- a/src/output/odt.c +++ b/src/output/odt.c @@ -120,7 +120,7 @@ write_style_data (struct odt_driver *odt) _xml ("urn:oasis:names:tc:opendocument:xmlns:style:1.0")); xmlTextWriterWriteAttribute (w, _xml ("xmlns:fo"), - _xml ("urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0") ); + _xml ("urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0")); xmlTextWriterWriteAttribute (w, _xml ("office:version"), _xml ("1.1")); @@ -432,7 +432,7 @@ write_table_item_text (struct odt_driver *odt, xmlTextWriterStartElement (odt->content_wtr, _xml("text:h")); xmlTextWriterWriteFormatAttribute (odt->content_wtr, _xml("text:outline-level"), "%d", 2); - xmlTextWriterWriteString (odt->content_wtr, _xml (text->content) ); + xmlTextWriterWriteString (odt->content_wtr, _xml (text->content)); for (size_t i = 0; i < text->n_footnotes; i++) write_footnote (odt, text->footnotes[i]); xmlTextWriterEndElement (odt->content_wtr); @@ -451,7 +451,7 @@ write_table_item_layers (struct odt_driver *odt, xmlTextWriterStartElement (odt->content_wtr, _xml("text:h")); xmlTextWriterWriteFormatAttribute (odt->content_wtr, _xml("text:outline-level"), "%d", 2); - xmlTextWriterWriteString (odt->content_wtr, _xml (layer->content) ); + xmlTextWriterWriteString (odt->content_wtr, _xml (layer->content)); for (size_t i = 0; i < layer->n_footnotes; i++) write_footnote (odt, layer->footnotes[i]); xmlTextWriterEndElement (odt->content_wtr); @@ -481,7 +481,7 @@ write_table (struct odt_driver *odt, const struct table_item *item) /* Deal with row headers */ - if ( table_ht (tab) > 0) + if (table_ht (tab) > 0) xmlTextWriterStartElement (odt->content_wtr, _xml("table:table-header-rows")); @@ -518,7 +518,7 @@ write_table (struct odt_driver *odt, const struct table_item *item) xmlTextWriterStartElement (odt->content_wtr, _xml("text:p")); - if ( r < table_ht (tab) || c < table_hl (tab) ) + if (r < table_ht (tab) || c < table_hl (tab)) xmlTextWriterWriteAttribute (odt->content_wtr, _xml("text:style-name"), _xml("Table_20_Heading")); else xmlTextWriterWriteAttribute (odt->content_wtr, _xml("text:style-name"), _xml("Table_20_Contents")); @@ -548,7 +548,7 @@ write_table (struct odt_driver *odt, const struct table_item *item) xmlTextWriterEndElement (odt->content_wtr); /* row */ - if ( table_ht (tab) > 0 && r == table_ht (tab) - 1) + if (table_ht (tab) > 0 && r == table_ht (tab) - 1) xmlTextWriterEndElement (odt->content_wtr); /* table-header-rows */ } diff --git a/src/output/pivot-output.c b/src/output/pivot-output.c index e624f78dcb..8226b35e47 100644 --- a/src/output/pivot-output.c +++ b/src/output/pivot-output.c @@ -219,7 +219,7 @@ compose_headings (struct table *t, for (int row_ofs = 0; row_ofs < d->label_depth; row_ofs++) { - for (size_t x1 = 0; x1 < n_columns; ) + for (size_t x1 = 0; x1 < n_columns;) { const struct pivot_category *c = find_category ( d, dim_index, column_enumeration + x1 * stride, row_ofs); diff --git a/src/output/pivot-table.c b/src/output/pivot-table.c index 924a14cc9b..a6d55d0a5e 100644 --- a/src/output/pivot-table.c +++ b/src/output/pivot-table.c @@ -81,7 +81,7 @@ pivot_area_get_default_style (enum pivot_area area) }, \ } static const struct area_style default_area_styles[PIVOT_N_AREAS] = { - [PIVOT_AREA_TITLE] = STYLE( true, CENTER, CENTER, 8,11,1,8), + [PIVOT_AREA_TITLE] = STYLE(true, CENTER, CENTER, 8,11,1,8), [PIVOT_AREA_CAPTION] = STYLE(false, LEFT, TOP, 8,11,1,1), [PIVOT_AREA_FOOTER] = STYLE(false, LEFT, TOP, 11, 8,2,3), [PIVOT_AREA_CORNER] = STYLE(false, LEFT, BOTTOM, 8,11,1,1), @@ -1568,7 +1568,7 @@ pivot_table_dump (const struct pivot_table *table, int indentation) names[n_names++] = c->name; } - for (size_t i = n_names; i-- > 0; ) + for (size_t i = n_names; i-- > 0;) { putchar (' '); pivot_value_dump (names[i]); @@ -1892,7 +1892,7 @@ pivot_value_format (const struct pivot_value *value, enum settings_value_show show_variables, struct string *out) { - pivot_value_format_body ( value, show_values, show_variables, out); + pivot_value_format_body (value, show_values, show_variables, out); if (value->n_subscripts) { diff --git a/src/output/pivot-table.h b/src/output/pivot-table.h index e7f0afad85..377579a013 100644 --- a/src/output/pivot-table.h +++ b/src/output/pivot-table.h @@ -221,7 +221,7 @@ struct pivot_axis breaks out of the loop prematurely, it needs to free it with free(). */ #define PIVOT_AXIS_FOR_EACH(INDEXES, AXIS) \ for ((INDEXES) = NULL; \ - ((INDEXES) = pivot_axis_iterator_next (INDEXES, AXIS)) != NULL; ) + ((INDEXES) = pivot_axis_iterator_next (INDEXES, AXIS)) != NULL;) size_t *pivot_axis_iterator_next (size_t *indexes, const struct pivot_axis *); /* Dimensions. diff --git a/src/output/render.c b/src/output/render.c index d26fc46ebc..06360eeecb 100644 --- a/src/output/render.c +++ b/src/output/render.c @@ -726,7 +726,7 @@ render_page_create (const struct render_params *params, struct table *table, for (int i = 0; i < 2; i++) columns[i] = xzalloc (nc * sizeof *columns[i]); for (int y = 0; y < nr; y++) - for (int x = 0; x < nc; ) + for (int x = 0; x < nc;) { struct table_cell cell; @@ -751,7 +751,7 @@ render_page_create (const struct render_params *params, struct table *table, for (int x = 0; x < nc; x++) columns[i][x].width = columns[i][x].unspanned; for (int y = 0; y < nr; y++) - for (int x = 0; x < nc; ) + for (int x = 0; x < nc;) { struct table_cell cell; @@ -809,7 +809,7 @@ render_page_create (const struct render_params *params, struct table *table, /* Calculate heights of cells that do not span multiple rows. */ struct render_row *rows = xzalloc (nr * sizeof *rows); for (int y = 0; y < nr; y++) - for (int x = 0; x < nc; ) + for (int x = 0; x < nc;) { struct render_row *r = &rows[y]; struct table_cell cell; @@ -837,7 +837,7 @@ render_page_create (const struct render_params *params, struct table *table, /* Distribute heights of spanned rows. */ for (int y = 0; y < nr; y++) - for (int x = 0; x < nc; ) + for (int x = 0; x < nc;) { struct table_cell cell; @@ -992,10 +992,10 @@ render_direction_rtl (void) this string with "output-direction-rtl". Otherwise either leave it untranslated or copy it verbatim. */ const char *dir = _("output-direction-ltr"); - if ( 0 == strcmp ("output-direction-rtl", dir)) + if (0 == strcmp ("output-direction-rtl", dir)) return true; - if ( 0 != strcmp ("output-direction-ltr", dir)) + if (0 != strcmp ("output-direction-ltr", dir)) fprintf (stderr, "This localisation has been incorrectly translated. " "Complain to the translator.\n"); @@ -1134,7 +1134,7 @@ render_page_draw_cells (const struct render_page *page, int ofs[TABLE_N_AXES], int bb[TABLE_N_AXES][2]) { for (int y = bb[V][0]; y < bb[V][1]; y++) - for (int x = bb[H][0]; x < bb[H][1]; ) + for (int x = bb[H][0]; x < bb[H][1];) if (!is_rule (x) && !is_rule (y)) { struct table_cell cell; @@ -1370,7 +1370,7 @@ render_break_next (struct render_break *b, int size) number of pixels available, which might look bad e.g. because it breaks in the middle of a line of text. */ if (axis == TABLE_VERT && page->params->adjust_break) - for (int x = 0; x < page->n[H]; ) + for (int x = 0; x < page->n[H];) { struct table_cell cell; @@ -1872,7 +1872,7 @@ render_page_select (const struct render_page *page, enum table_axis axis, }; if (!page->h[a][0] || z0 > page->h[a][0] || p0) - for (int z = 0; z < page->n[b]; ) + for (int z = 0; z < page->n[b];) { int d[TABLE_N_AXES]; d[a] = z0; @@ -1907,7 +1907,7 @@ render_page_select (const struct render_page *page, enum table_axis axis, } if (!page->h[a][1] || z1 < page->n[a] - page->h[a][1] || p1) - for (int z = 0; z < page->n[b]; ) + for (int z = 0; z < page->n[b];) { int d[TABLE_N_AXES]; d[a] = z1 - 1; diff --git a/src/output/spv/spv-legacy-decoder.c b/src/output/spv/spv-legacy-decoder.c index 9740a37eee..6a8c2d082f 100644 --- a/src/output/spv/spv-legacy-decoder.c +++ b/src/output/spv/spv-legacy-decoder.c @@ -1229,7 +1229,7 @@ add_dimension (struct spv_series **series, size_t n, series[j]->n_index = max_cat + 1; series[j]->index_to_category = xcalloc ( max_cat + 1, sizeof *series[j]->index_to_category); - for (size_t cat1 = 0; cat1 < n_cats; ) + for (size_t cat1 = 0; cat1 < n_cats;) { /* Find a sequence of categories cat1...cat2 (exclusive), that all have the same value in series 'j'. (This might be only a single @@ -1335,7 +1335,7 @@ add_dimensions (struct hmap *series_map, const struct spvdx_nest *nest, return NULL; struct spv_series **series = xnmalloc (nest->n_vars, sizeof *series); - for (size_t i = 0; i < nest->n_vars; ) + for (size_t i = 0; i < nest->n_vars;) { size_t n; for (n = 0; i + n < nest->n_vars; n++) @@ -1380,7 +1380,7 @@ add_layers (struct hmap *series_map, return NULL; struct spv_series **series = xnmalloc (n_layers, sizeof *series); - for (size_t i = 0; i < n_layers; ) + for (size_t i = 0; i < n_layers;) { size_t n; for (n = 0; i + n < n_layers; n++) @@ -2143,7 +2143,7 @@ decode_spvdx_table (const struct spvdx_visualization *v, const char *subtype, while (n_nodes > 0) { bool progress = false; - for (size_t i = 0; i < n_nodes; ) + for (size_t i = 0; i < n_nodes;) { error = (spvdx_is_source_variable (nodes[i]) ? decode_spvdx_source_variable (nodes[i], data, &series_map) diff --git a/src/output/spv/spv.c b/src/output/spv/spv.c index f186e638e7..b82b7693ed 100644 --- a/src/output/spv/spv.c +++ b/src/output/spv/spv.c @@ -374,7 +374,7 @@ extract_html_text (const xmlNode *node, int base_font_size, struct string *s) else { uint8_t r, g, b; - if (sscanf (color, "rgb (%"SCNu8", %"SCNu8", %"SCNu8" )", + if (sscanf (color, "rgb (%"SCNu8", %"SCNu8", %"SCNu8")", &r, &g, &b) == 3) { char color2[8]; @@ -420,7 +420,7 @@ extract_html_text (const xmlNode *node, int base_font_size, struct string *s) Do the same for U+2007 FIGURE SPACE, which also crops out weirdly sometimes. */ ds_extend (s, ds_length (s) + xmlStrlen (node->content)); - for (const uint8_t *p = node->content; *p; ) + for (const uint8_t *p = node->content; *p;) { int c; if (p[0] == 0xc2 && p[1] == 0xa0) diff --git a/src/output/spv/spv.h b/src/output/spv/spv.h index 0bf2ff7014..91321adc67 100644 --- a/src/output/spv/spv.h +++ b/src/output/spv/spv.h @@ -167,7 +167,7 @@ bool spv_item_is_visible (const struct spv_item *); #define SPV_ITEM_FOR_EACH(ITER, ROOT) \ for ((ITER) = (ROOT); (ITER) != NULL; (ITER) = spv_item_next(ITER)) #define SPV_ITEM_FOR_EACH_SKIP_ROOT(ITER, ROOT) \ - for ((ITER) = (ROOT); ((ITER) = spv_item_next(ITER)) != NULL; ) + for ((ITER) = (ROOT); ((ITER) = spv_item_next(ITER)) != NULL;) struct spv_item *spv_item_next (const struct spv_item *); const struct spv_item *spv_item_get_parent (const struct spv_item *); diff --git a/src/output/spv/spvbin-helpers.c b/src/output/spv/spvbin-helpers.c index e405310395..138e213957 100644 --- a/src/output/spv/spvbin-helpers.c +++ b/src/output/spv/spvbin-helpers.c @@ -46,7 +46,7 @@ spvbin_input_to_error (const struct spvbin_input *input, const char *name) if (name) ds_put_format (&s, "%s: ", name); ds_put_cstr (&s, "parse error decoding "); - for (size_t i = input->n_errors; i-- > 0; ) + for (size_t i = input->n_errors; i-- > 0;) if (i < SPVBIN_MAX_ERRORS) ds_put_format (&s, "/%s@%#zx", input->errors[i].name, input->errors[i].start); diff --git a/src/ui/gui/builder-wrapper.c b/src/ui/gui/builder-wrapper.c index 0750158e34..f856b3e87a 100644 --- a/src/ui/gui/builder-wrapper.c +++ b/src/ui/gui/builder-wrapper.c @@ -27,7 +27,7 @@ builder_new_real (const gchar *name) GtkBuilder *builder = gtk_builder_new (); GError *err = NULL; - if ( ! gtk_builder_add_from_file (builder, name, &err)) + if (! gtk_builder_add_from_file (builder, name, &err)) { g_critical ("Couldn\'t open user interface file %s: %s", name, err->message); g_clear_error (&err); @@ -44,9 +44,9 @@ get_object_assert (GtkBuilder *builder, const gchar *name, GType type) o = gtk_builder_get_object (builder, name); - if ( !o ) + if (!o) g_critical ("Object `%s' could not be found\n", name); - else if ( ! g_type_is_a (G_OBJECT_TYPE (o), type)) + else if (! g_type_is_a (G_OBJECT_TYPE (o), type)) { g_critical ("Object `%s' was expected to have type %s, but in fact has type %s", name, g_type_name (type), G_OBJECT_TYPE_NAME (o)); diff --git a/src/ui/gui/dialog-common.c b/src/ui/gui/dialog-common.c index cdd6ac667a..f167034b12 100644 --- a/src/ui/gui/dialog-common.c +++ b/src/ui/gui/dialog-common.c @@ -33,7 +33,7 @@ static GtkTreePath * get_base_tree_path (GtkTreeModel *m, GtkTreePath *op) { GtkTreePath *p = gtk_tree_path_copy (op); - while ( ! PSPPIRE_IS_DICT (m)) + while (! PSPPIRE_IS_DICT (m)) { GtkTreePath *oldp = p; @@ -115,7 +115,7 @@ homogeneous_types (GtkWidget *source, GtkWidget *dest) g_list_foreach (list, (GFunc) gtk_tree_path_free, NULL); g_list_free (list); - if ( retval == FALSE ) + if (retval == FALSE) return FALSE; /* now deal with the dest widget */ @@ -128,7 +128,7 @@ homogeneous_types (GtkWidget *source, GtkWidget *dest) const struct variable *v; gtk_tree_model_get (model, &iter, 0, &v, -1); - if ( have_type && var_get_type (v) != type ) + if (have_type && var_get_type (v) != type) { retval = FALSE; break; @@ -172,7 +172,7 @@ numeric_only (GtkWidget *source, GtkWidget *dest) const struct variable *v = psppire_dict_get_variable (dict, idx[0]); gtk_tree_path_free (p); - if ( var_is_alpha (v)) + if (var_is_alpha (v)) { retval = FALSE; break; diff --git a/src/ui/gui/dict-display.c b/src/ui/gui/dict-display.c index 6c4e21158f..f8919de58f 100644 --- a/src/ui/gui/dict-display.c +++ b/src/ui/gui/dict-display.c @@ -43,16 +43,16 @@ get_base_model (GtkTreeModel *top_model, GtkTreeIter *top_iter, { *model = top_model; - if ( iter) + if (iter) *iter = *top_iter; - while ( ! PSPPIRE_IS_DICT (*model)) + while (! PSPPIRE_IS_DICT (*model)) { GtkTreeIter parent_iter; if (iter) parent_iter = *iter; - if ( GTK_IS_TREE_MODEL_FILTER (*model)) + if (GTK_IS_TREE_MODEL_FILTER (*model)) { GtkTreeModelFilter *parent_model = GTK_TREE_MODEL_FILTER (*model); @@ -83,7 +83,7 @@ insert_source_row_into_entry (GtkTreeIter iter, GtkWidget *dest, GtkTreeModel *model, gpointer data - ) + ) { GtkTreePath *path; GtkTreeModel *dict; @@ -197,7 +197,7 @@ is_currently_in_entry (GtkTreeModel *model, GtkTreeIter *iter, gtk_tree_path_free (path); - result = ( 0 == strcmp (text, var_get_name (var) )); + result = (0 == strcmp (text, var_get_name (var))); return result; } diff --git a/src/ui/gui/dict-display.h b/src/ui/gui/dict-display.h index 04ec09d107..2f9670f0ce 100644 --- a/src/ui/gui/dict-display.h +++ b/src/ui/gui/dict-display.h @@ -50,7 +50,7 @@ void insert_source_row_into_entry (GtkTreeIter source_iter, GtkWidget *dest, GtkTreeModel *source_model, gpointer data - ); + ); diff --git a/src/ui/gui/executor.c b/src/ui/gui/executor.c index 9b4c4c9186..d6486ee4e7 100644 --- a/src/ui/gui/executor.c +++ b/src/ui/gui/executor.c @@ -134,14 +134,14 @@ execute_syntax (PsppireDataWindow *window, struct lex_reader *lex_reader) struct dataset *ds = session_active_dataset (the_session); enum cmd_result result = cmd_parse (lexer, ds); - if ( cmd_result_is_failure (result)) + if (cmd_result_is_failure (result)) { retval = FALSE; - if ( lex_get_error_mode (lexer) == LEX_ERROR_STOP ) + if (lex_get_error_mode (lexer) == LEX_ERROR_STOP) break; } - if ( result == CMD_EOF || result == CMD_FINISH) + if (result == CMD_EOF || result == CMD_FINISH) break; } diff --git a/src/ui/gui/find-dialog.c b/src/ui/gui/find-dialog.c index 6c65268676..52f26d4a69 100644 --- a/src/ui/gui/find-dialog.c +++ b/src/ui/gui/find-dialog.c @@ -106,7 +106,7 @@ do_find (GObject *obj, const struct find_dialog *fd) find_value (fd, row, &x, &column); - if ( x != -1) + if (x != -1) { SswSheet *sheet = SSW_SHEET (fd->de->data_editor->data_sheet); gtk_notebook_set_current_page (GTK_NOTEBOOK (fd->de->data_editor), @@ -269,7 +269,7 @@ forward (casenumber *i, struct datasheet *data UNUSED) static void forward_wrap (casenumber *i, struct datasheet *data) { - if ( ++*i >= datasheet_get_n_rows (data) ) *i = 0; + if (++*i >= datasheet_get_n_rows (data)) *i = 0; } static void @@ -282,7 +282,7 @@ backward (casenumber *i, struct datasheet *data UNUSED) static void backward_wrap (casenumber *i, struct datasheet *data) { - if ( --*i < 0 ) + if (--*i < 0) *i = datasheet_get_n_rows (data) - 1; } @@ -387,16 +387,16 @@ get_iteration_params (const struct find_dialog *fd) gboolean reverse = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (get_widget_assert (fd->xml, "find-backwards"))); - if ( wrap ) + if (wrap) { - if ( reverse ) + if (reverse) return &ip[REVERSE_WRAP]; else return &ip[FORWARD_WRAP]; } else { - if ( reverse ) + if (reverse) return &ip[REVERSE]; else return &ip[FORWARD]; @@ -475,11 +475,11 @@ string_label_compare (const struct comparator *cmptr, width = strlen (text); - assert ( cmptr->flags & STR_CMP_LABELS); + assert (cmptr->flags & STR_CMP_LABELS); g_return_val_if_fail (width > 0, false); - if ( cmptr->flags & STR_CMP_SUBSTR) + if (cmptr->flags & STR_CMP_SUBSTR) return (NULL != g_strstr_len (text, width, ssc->pattern)); else return (0 == strncmp (text, ssc->pattern, width)); @@ -497,11 +497,11 @@ string_value_compare (const struct comparator *cmptr, int width = var_get_width (cmptr->var); g_return_val_if_fail (width > 0, false); - assert ( ! (cmptr->flags & STR_CMP_LABELS)); + assert (! (cmptr->flags & STR_CMP_LABELS)); text = value_to_text (*val, cmptr->var); - if ( cmptr->flags & STR_CMP_SUBSTR) + if (cmptr->flags & STR_CMP_SUBSTR) found = (NULL != g_strstr_len (text, width, ssc->pattern)); else found = (0 == strncmp (text, ssc->pattern, width)); @@ -524,7 +524,7 @@ regexp_value_compare (const struct comparator *cmptr, int width = var_get_width (cmptr->var); - assert ( ! (cmptr->flags & STR_CMP_LABELS) ); + assert (! (cmptr->flags & STR_CMP_LABELS)); g_return_val_if_fail (width > 0, false); @@ -551,7 +551,7 @@ regexp_label_compare (const struct comparator *cmptr, int width ; - assert ( cmptr->flags & STR_CMP_LABELS); + assert (cmptr->flags & STR_CMP_LABELS); text = var_lookup_value_label (cmptr->var, val); width = strlen (text); @@ -607,7 +607,7 @@ string_comparator_create (const struct variable *var, const char *target, cmptr->flags = flags; cmptr->var = var; - if ( flags & STR_CMP_LABELS) + if (flags & STR_CMP_LABELS) cmptr->compare = string_label_compare; else cmptr->compare = string_value_compare; @@ -634,7 +634,7 @@ regexp_comparator_create (const struct variable *var, const char *target, cmptr->destroy = regexp_destroy; code = regcomp (&rec->re, target, 0); - if ( code != 0 ) + if (code != 0) { char *errbuf = NULL; size_t errbuf_size = regerror (code, &rec->re, errbuf, 0); @@ -645,7 +645,7 @@ regexp_comparator_create (const struct variable *var, const char *target, msg (ME, _("Bad regular expression: %s"), errbuf); - free ( cmptr); + free (cmptr); free (errbuf); return NULL; } @@ -666,10 +666,10 @@ comparator_compare (const struct comparator *cmptr, static void comparator_destroy (struct comparator *cmptr) { - if ( ! cmptr ) + if (! cmptr) return ; - if ( cmptr->destroy ) + if (cmptr->destroy) cmptr->destroy (cmptr); free (cmptr); @@ -680,10 +680,10 @@ static struct comparator * comparator_factory (const struct variable *var, const char *str, enum string_cmp_flags flags) { - if ( flags & STR_CMP_REGEXP ) + if (flags & STR_CMP_REGEXP) return regexp_comparator_create (var, str, flags); - if ( flags & (STR_CMP_SUBSTR | STR_CMP_LABELS) ) + if (flags & (STR_CMP_SUBSTR | STR_CMP_LABELS)) return string_comparator_create (var, str, flags); return value_comparator_create (var, str); @@ -706,7 +706,7 @@ find_value (const struct find_dialog *fd, casenumber current_row, enum string_cmp_flags flags = 0; var = dict_lookup_var (fd->dict->dict, var_name); - if ( ! var ) + if (! var) return ; width = var_get_width (var); @@ -714,15 +714,15 @@ find_value (const struct find_dialog *fd, casenumber current_row, *column = var_get_dict_index (var); *row = -1; - if ( gtk_toggle_button_get_active + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (fd->match_substring_checkbox))) flags |= STR_CMP_SUBSTR; - if ( gtk_toggle_button_get_active + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (fd->match_regexp_checkbox))) flags |= STR_CMP_REGEXP; - if ( gtk_toggle_button_get_active + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (fd->value_labels_checkbox))) flags |= STR_CMP_LABELS; @@ -734,7 +734,7 @@ find_value (const struct find_dialog *fd, casenumber current_row, comparator_factory (var, target_string, flags); value_init (&val, width); - if ( ! cmptr) + if (! cmptr) goto finish; for (i = ip->start (current_row, fd->data); @@ -743,7 +743,7 @@ find_value (const struct find_dialog *fd, casenumber current_row, { datasheet_get_value (fd->data, i, var_get_case_index (var), &val); - if ( comparator_compare (cmptr, &val)) + if (comparator_compare (cmptr, &val)) { *row = i; break; diff --git a/src/ui/gui/help-menu.c b/src/ui/gui/help-menu.c index 30bbc7522b..823525e1ed 100644 --- a/src/ui/gui/help-menu.c +++ b/src/ui/gui/help-menu.c @@ -78,7 +78,7 @@ about_new (GtkMenuItem *mmm, GtkWindow *parent) /* TRANSLATORS: Do not translate this string. Instead, put the names of the people who have helped in the translation. */ _("translator-credits") - ); +); gtk_window_set_transient_for (GTK_WINDOW (about), parent); @@ -198,7 +198,7 @@ online_help (const char *page) NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, &htmlerr)) #endif - ) +) { msg (ME, _("Cannot open reference manual via yelp: %s. " "Cannot open via html: %s " diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c index c7cfaebe8d..40cd8e5387 100644 --- a/src/ui/gui/helper.c +++ b/src/ui/gui/helper.c @@ -137,20 +137,20 @@ text_to_value__ (const gchar *text, { int width = fmt_var_width (format); - if ( format->type != FMT_A) + if (format->type != FMT_A) { - if ( ! text ) return NULL; + if (! text) return NULL; { const gchar *s = text; while (*s) { - if ( !isspace (*s)) + if (!isspace (*s)) break; s++; } - if ( !*s) return NULL; + if (!*s) return NULL; } } @@ -219,20 +219,20 @@ connect_help (GtkBuilder *xml) GSList *helps = gtk_builder_get_objects (xml); GSList *i; - for ( i = helps; i ; i = g_slist_next (i)) + for (i = helps; i ; i = g_slist_next (i)) { GObject *o = i->data; - if ( GTK_IS_WIDGET (o) ) + if (GTK_IS_WIDGET (o)) { const gchar *name = gtk_buildable_get_name (GTK_BUILDABLE (o)); gchar s[12] = {0}; - if ( name) + if (name) strncpy (s, name, 11); s[11] = '\0'; - if ( 0 == strcmp ("help_button", s)) + if (0 == strcmp ("help_button", s)) { g_signal_connect (o, "clicked", give_help, 0); } @@ -256,7 +256,7 @@ clone_list_store (const GtkListStore *src) int row = 0; GtkListStore *dest; - for (i = 0 ; i < n_cols; ++i ) + for (i = 0 ; i < n_cols; ++i) types[i] = gtk_tree_model_get_column_type (GTK_TREE_MODEL (src), i); dest = gtk_list_store_newv (n_cols, types); @@ -269,7 +269,7 @@ clone_list_store (const GtkListStore *src) GtkTreeIter dest_iter; gtk_list_store_append (dest, &dest_iter); - for (i = 0 ; i < n_cols; ++i ) + for (i = 0 ; i < n_cols; ++i) { GValue val = {0}; @@ -304,7 +304,7 @@ paste_syntax_to_window (gchar *syntax) GtkTextBuffer *buffer = NULL; - if ( NULL == the_syntax_pasteboard) + if (NULL == the_syntax_pasteboard) { the_syntax_pasteboard = psppire_syntax_window_new (NULL); g_signal_connect (the_syntax_pasteboard, "delete-event", G_CALLBACK (on_delete), diff --git a/src/ui/gui/missing-val-dialog.c b/src/ui/gui/missing-val-dialog.c index 83ec504edd..8d9fda759b 100644 --- a/src/ui/gui/missing-val-dialog.c +++ b/src/ui/gui/missing-val-dialog.c @@ -233,19 +233,19 @@ missing_val_dialog_acceptable (gpointer data) PsppireMissingValDialog *dialog = data; int var_width = fmt_var_width (&dialog->format); - if ( gtk_toggle_button_get_active (dialog->button_discrete)) + if (gtk_toggle_button_get_active (dialog->button_discrete)) { gint nvals = 0; gint i; mv_clear(&dialog->mvl); - for(i = 0 ; i < 3 ; ++i ) + for(i = 0 ; i < 3 ; ++i) { gchar *text = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->mv[i]))); union value v; - if ( !text || strlen (g_strstrip (text)) == 0 ) + if (!text || strlen (g_strstrip (text)) == 0) { g_free (text); continue; @@ -262,7 +262,7 @@ missing_val_dialog_acceptable (gpointer data) g_free (text); value_destroy (&v, var_width); } - if ( nvals == 0 ) + if (nvals == 0) { err_dialog (_("At least one value must be specified"), GTK_WINDOW (dialog)); @@ -308,7 +308,7 @@ missing_val_dialog_acceptable (gpointer data) discrete_text = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->discrete))); - if ( discrete_text && strlen (g_strstrip (discrete_text)) > 0 ) + if (discrete_text && strlen (g_strstrip (discrete_text)) > 0) { union value discrete_val; if (!try_missing_value (dialog, discrete_text, &discrete_val)) @@ -337,7 +337,7 @@ discrete (GtkToggleButton *button, gpointer data) gint i; PsppireMissingValDialog *dialog = data; - for (i = 0 ; i < 3 ; ++i ) + for (i = 0 ; i < 3 ; ++i) { gtk_widget_set_sensitive (dialog->mv[i], gtk_toggle_button_get_active (button)); @@ -454,13 +454,13 @@ psppire_missing_val_dialog_set_variable (PsppireMissingValDialog *dialog, if (var == NULL) return; - for (i = 0 ; i < 3 ; ++i ) + for (i = 0 ; i < 3 ; ++i) { gtk_entry_set_text (GTK_ENTRY (dialog->mv[i]), ""); gtk_widget_set_sensitive (dialog->mv[i], FALSE); } - if ( mv_has_range (&dialog->mvl)) + if (mv_has_range (&dialog->mvl)) { union value low, high; gchar *low_text; @@ -476,7 +476,7 @@ psppire_missing_val_dialog_set_variable (PsppireMissingValDialog *dialog, g_free (low_text); g_free (high_text); - if ( mv_has_value (&dialog->mvl)) + if (mv_has_value (&dialog->mvl)) { gchar *text; text = value_to_text__ (*mv_get_value (&dialog->mvl, 0), @@ -491,13 +491,13 @@ psppire_missing_val_dialog_set_variable (PsppireMissingValDialog *dialog, gtk_widget_set_sensitive (dialog->discrete, TRUE); } - else if ( mv_has_value (&dialog->mvl)) + else if (mv_has_value (&dialog->mvl)) { const int n = mv_n_values (&dialog->mvl); - for (i = 0 ; i < 3 ; ++i ) + for (i = 0 ; i < 3 ; ++i) { - if ( i < n) + if (i < n) { gchar *text ; @@ -510,7 +510,7 @@ psppire_missing_val_dialog_set_variable (PsppireMissingValDialog *dialog, } gtk_toggle_button_set_active (dialog->button_discrete, TRUE); } - else if ( mv_is_empty (&dialog->mvl)) + else if (mv_is_empty (&dialog->mvl)) { gtk_toggle_button_set_active (dialog->button_none, TRUE); } diff --git a/src/ui/gui/psppire-acr.c b/src/ui/gui/psppire-acr.c index a2ee6af559..b858df268e 100644 --- a/src/ui/gui/psppire-acr.c +++ b/src/ui/gui/psppire-acr.c @@ -135,7 +135,7 @@ on_add_button_clicked (PsppireAcr *acr) ++i) { static GValue value; - if ( ! acr->get_value (i, &value, acr->get_value_data) ) + if (! acr->get_value (i, &value, acr->get_value_data)) continue; gtk_list_store_set_value (acr->list_store, &iter, @@ -170,7 +170,7 @@ on_change_button_clicked (PsppireAcr *acr) ++i) { static GValue value; - if ( ! acr->get_value (i, &value, acr->get_value_data) ) + if (! acr->get_value (i, &value, acr->get_value_data)) continue; gtk_list_store_set_value (acr->list_store, &iter, @@ -181,7 +181,7 @@ on_change_button_clicked (PsppireAcr *acr) g_list_foreach (l, (GFunc) gtk_tree_path_free, NULL); g_list_free (l); - if ( acr->update) acr->update (acr->update_data); + if (acr->update) acr->update (acr->update_data); } @@ -238,7 +238,7 @@ on_select (GtkTreeSelection *selection, gpointer data) gtk_widget_set_sensitive (acr->change_button, row_is_selected (acr) - ); + ); } diff --git a/src/ui/gui/psppire-buttonbox.c b/src/ui/gui/psppire-buttonbox.c index 087c105587..18ce4a0dd1 100644 --- a/src/ui/gui/psppire-buttonbox.c +++ b/src/ui/gui/psppire-buttonbox.c @@ -73,7 +73,7 @@ set_default (PsppireButtonbox *bb) { int i; - for (i = 0 ; i < n_PsppireButtonboxButtons ; ++i ) + for (i = 0 ; i < n_PsppireButtonboxButtons ; ++i) if (bb->def == (1 << i)) { gtk_widget_set_can_default (bb->button[i], TRUE); @@ -95,7 +95,7 @@ psppire_buttonbox_set_property (GObject *object, { case PROP_BUTTONS: flags = g_value_get_flags (value); - for (i = 0 ; i < n_PsppireButtonboxButtons ; ++i ) + for (i = 0 ; i < n_PsppireButtonboxButtons ; ++i) g_object_set (bb->button[i], "visible", 0x01 & (flags >> i) , NULL); break; @@ -124,12 +124,12 @@ psppire_buttonbox_get_property (GObject *object, switch (prop_id) { case PROP_BUTTONS: - for (i = 0 ; i < n_PsppireButtonboxButtons ; ++i ) + for (i = 0 ; i < n_PsppireButtonboxButtons ; ++i) { gboolean visibility; g_object_get (bb->button[i], "visible", &visibility, NULL); - if ( visibility ) + if (visibility) flags |= (0x01 << i); } @@ -205,7 +205,7 @@ close_and_respond (GtkWidget *w, gint response) /* If we're not in a psppire dialog (for example when in glade) then do nothing */ - if ( ! PSPPIRE_IS_DIALOG (toplevel)) + if (! PSPPIRE_IS_DIALOG (toplevel)) return; dialog = PSPPIRE_DIALOG (toplevel); @@ -267,7 +267,7 @@ refresh_clicked (GtkWidget *w, gpointer data) GtkWidget *toplevel = gtk_widget_get_toplevel (w); PsppireDialog *dialog; - if ( ! PSPPIRE_IS_DIALOG (toplevel)) + if (! PSPPIRE_IS_DIALOG (toplevel)) return; dialog = PSPPIRE_DIALOG (toplevel); @@ -281,7 +281,7 @@ help_clicked (GtkWidget *w, gpointer data) GtkWidget *toplevel = gtk_widget_get_toplevel (w); PsppireDialog *dialog; - if ( ! PSPPIRE_IS_DIALOG (toplevel)) + if (! PSPPIRE_IS_DIALOG (toplevel)) return; dialog = PSPPIRE_DIALOG (toplevel); @@ -409,7 +409,7 @@ psppire_button_box_init (PsppireButtonbox *bb) flags = g_value_get_flags (&value); - for (i = 0 ; i < n_PsppireButtonboxButtons ; ++i ) + for (i = 0 ; i < n_PsppireButtonboxButtons ; ++i) g_object_set (bb->button[i], "visible", 0x01 & (flags >> i) , NULL); g_value_unset (&value); diff --git a/src/ui/gui/psppire-conf.c b/src/ui/gui/psppire-conf.c index d0b082cbe3..2629fdcfc0 100644 --- a/src/ui/gui/psppire-conf.c +++ b/src/ui/gui/psppire-conf.c @@ -82,7 +82,7 @@ flush_conf (PsppireConf *conf) gchar *kf = g_key_file_to_data (conf->keyfile, &length, NULL); - if ( ! g_file_set_contents (conf->filename, kf, length, NULL) ) + if (! g_file_set_contents (conf->filename, kf, length, NULL)) { g_warning ("Cannot open %s for writing", conf->filename); } @@ -95,7 +95,7 @@ flush_conf (PsppireConf *conf) static void conf_write (PsppireConf *conf) { - if ( conf->idle == 0) + if (conf->idle == 0) conf->idle = g_idle_add_full (G_PRIORITY_LOW, (GSourceFunc) flush_conf, conf, NULL); } @@ -194,7 +194,7 @@ psppire_conf_get_int (PsppireConf *conf, const gchar *base, name, &err); ok = (err == NULL); - if ( err != NULL ) + if (err != NULL) g_error_free (err); return ok; @@ -213,7 +213,7 @@ psppire_conf_get_boolean (PsppireConf *conf, const gchar *base, name, &err); ok = (err == NULL); - if ( err != NULL ) + if (err != NULL) g_error_free (err); if (ok) @@ -237,7 +237,7 @@ psppire_conf_get_string (PsppireConf *conf, const gchar *base, name, &err); ok = (err == NULL); - if ( err != NULL ) + if (err != NULL) g_error_free (err); if (ok) @@ -262,7 +262,7 @@ psppire_conf_get_variant (PsppireConf *conf, const gchar *base, name, &err); ok = (err == NULL); - if ( err != NULL ) + if (err != NULL) g_error_free (err); if (ok) @@ -289,7 +289,7 @@ psppire_conf_get_enum (PsppireConf *conf, const gchar *base, name, &err); ok = (err == NULL); - if ( err != NULL ) + if (err != NULL) g_error_free (err); if (ok) @@ -377,19 +377,19 @@ psppire_conf_set_window_geometry (PsppireConf *conf, if (psppire_conf_get_int (conf, base, "height", &height) && - psppire_conf_get_int (conf, base, "width", &width) ) + psppire_conf_get_int (conf, base, "width", &width)) { gtk_window_set_default_size (window, width, height); } - if ( psppire_conf_get_int (conf, base, "x", &x) + if (psppire_conf_get_int (conf, base, "x", &x) && - psppire_conf_get_int (conf, base, "y", &y) ) + psppire_conf_get_int (conf, base, "y", &y)) { gtk_window_move (window, x, y); } - if ( psppire_conf_get_boolean (conf, base, "maximize", &maximize)) + if (psppire_conf_get_boolean (conf, base, "maximize", &maximize)) { if (maximize) gtk_window_maximize (window); diff --git a/src/ui/gui/psppire-data-editor.c b/src/ui/gui/psppire-data-editor.c index 8bfb74df16..44dd119974 100644 --- a/src/ui/gui/psppire-data-editor.c +++ b/src/ui/gui/psppire-data-editor.c @@ -138,7 +138,7 @@ psppire_data_editor_set_property (GObject *object, g_object_set (de->var_sheet, "split", de->split, NULL); break; case PROP_DATA_STORE: - if ( de->data_store) + if (de->data_store) { g_signal_handlers_disconnect_by_func (de->data_store, G_CALLBACK (refresh_entry), @@ -269,7 +269,7 @@ psppire_data_editor_class_init (PsppireDataEditorClass *klass) g_param_spec_pointer ("data-store", "Data Store", "A pointer to the data store associated with this editor", - G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE | G_PARAM_READABLE ); + G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE | G_PARAM_READABLE); g_object_class_install_property (object_class, PROP_DATA_STORE, @@ -279,7 +279,7 @@ psppire_data_editor_class_init (PsppireDataEditorClass *klass) g_param_spec_pointer ("dictionary", "Dictionary", "A pointer to the dictionary associated with this editor", - G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE | G_PARAM_READABLE ); + G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE | G_PARAM_READABLE); g_object_class_install_property (object_class, PROP_DICTIONARY, @@ -537,7 +537,7 @@ psppire_data_editor_init (PsppireDataEditor *de) if (psppire_conf_get_string (psppire_conf_new (), "Data Editor", "font", - &fontname) ) + &fontname)) { de->font = pango_font_description_from_string (fontname); g_free (fontname); @@ -600,7 +600,7 @@ set_font_recursively (GtkWidget *w, gpointer data) g_object_unref (cssp); - if ( GTK_IS_CONTAINER (w)) + if (GTK_IS_CONTAINER (w)) gtk_container_foreach (GTK_CONTAINER (w), set_font_recursively, font_desc); } diff --git a/src/ui/gui/psppire-data-editor.h b/src/ui/gui/psppire-data-editor.h index 941d7a4997..88d07a8114 100644 --- a/src/ui/gui/psppire-data-editor.h +++ b/src/ui/gui/psppire-data-editor.h @@ -80,7 +80,7 @@ GType psppire_data_editor_get_type (void); GtkWidget* psppire_data_editor_new (PsppireDict *, PsppireDataStore *); void psppire_data_editor_show_grid (PsppireDataEditor *, gboolean); void psppire_data_editor_set_font (PsppireDataEditor *, PangoFontDescription *); -void psppire_data_editor_split_window (PsppireDataEditor *, gboolean ); +void psppire_data_editor_split_window (PsppireDataEditor *, gboolean); void psppire_data_editor_goto_variable (PsppireDataEditor *, gint dict_index); void psppire_data_editor_data_delete_variables (PsppireDataEditor *de); diff --git a/src/ui/gui/psppire-data-store.c b/src/ui/gui/psppire-data-store.c index c91e589dfc..b1f23bad2a 100644 --- a/src/ui/gui/psppire-data-store.c +++ b/src/ui/gui/psppire-data-store.c @@ -477,7 +477,7 @@ psppire_data_store_set_reader (PsppireDataStore *ds, { gint i; gint old_n = 0; - if ( ds->datasheet) + if (ds->datasheet) { old_n = datasheet_get_n_rows (ds->datasheet); datasheet_destroy (ds->datasheet); @@ -487,10 +487,10 @@ psppire_data_store_set_reader (PsppireDataStore *ds, gint new_n = datasheet_get_n_rows (ds->datasheet); - if ( ds->dict ) - for (i = 0 ; i < n_dict_signals; ++i ) + if (ds->dict) + for (i = 0 ; i < n_dict_signals; ++i) { - if ( ds->dict_handler_id [i] > 0) + if (ds->dict_handler_id [i] > 0) { g_signal_handler_unblock (ds->dict, ds->dict_handler_id[i]); @@ -515,8 +515,8 @@ psppire_data_store_set_dictionary (PsppireDataStore *data_store, PsppireDict *di int i; /* Disconnect any existing handlers */ - if ( data_store->dict ) - for (i = 0 ; i < n_dict_signals; ++i ) + if (data_store->dict) + for (i = 0 ; i < n_dict_signals; ++i) { g_signal_handler_disconnect (data_store->dict, data_store->dict_handler_id[i]); @@ -524,7 +524,7 @@ psppire_data_store_set_dictionary (PsppireDataStore *data_store, PsppireDict *di data_store->dict = dict; - if ( dict != NULL) + if (dict != NULL) { data_store->dict_handler_id [VARIABLE_INSERTED] = @@ -547,10 +547,10 @@ psppire_data_store_set_dictionary (PsppireDataStore *data_store, PsppireDict *di /* The entire model has changed */ - if ( data_store->dict ) - for (i = 0 ; i < n_dict_signals; ++i ) + if (data_store->dict) + for (i = 0 ; i < n_dict_signals; ++i) { - if ( data_store->dict_handler_id [i] > 0) + if (data_store->dict_handler_id [i] > 0) { g_signal_handler_block (data_store->dict, data_store->dict_handler_id[i]); @@ -728,8 +728,8 @@ psppire_data_store_get_reader (PsppireDataStore *ds) int i; struct casereader *reader ; - if ( ds->dict ) - for (i = 0 ; i < n_dict_signals; ++i ) + if (ds->dict) + for (i = 0 ; i < n_dict_signals; ++i) { g_signal_handler_block (ds->dict, ds->dict_handler_id[i]); @@ -790,7 +790,7 @@ psppire_data_store_insert_case (PsppireDataStore *ds, cc = case_ref (cc); result = datasheet_insert_rows (ds->datasheet, posn, &cc, 1); - if ( result ) + if (result) { g_signal_emit (ds, signals[ITEMS_CHANGED], 0, posn, 0, 1); } @@ -815,7 +815,7 @@ psppire_data_store_set_value (PsppireDataStore *ds, casenumber casenum, g_return_val_if_fail (ds->datasheet, FALSE); n_cases = psppire_data_store_get_case_count (ds); - if ( casenum > n_cases) + if (casenum > n_cases) return FALSE; if (casenum == n_cases) @@ -881,7 +881,7 @@ psppire_data_store_insert_value (PsppireDataStore *ds, g_assert (width >= 0); - if ( ! ds->datasheet ) + if (! ds->datasheet) ds->datasheet = datasheet_create (NULL); value_init (&value, width); @@ -902,20 +902,20 @@ psppire_data_store_filtered (PsppireDataStore *ds, const struct dictionary *dict; const struct variable *filter; - if ( row < 0 || row >= datasheet_get_n_rows (ds->datasheet)) + if (row < 0 || row >= datasheet_get_n_rows (ds->datasheet)) return FALSE; dict = ds->dict->dict; g_return_val_if_fail (dict, FALSE); filter = dict_get_filter (dict); - if ( ! filter) + if (! filter) return FALSE; g_return_val_if_fail (var_is_numeric (filter), FALSE); value_init (&val, 0); - if ( ! datasheet_get_value (ds->datasheet, row, + if (! datasheet_get_value (ds->datasheet, row, var_get_case_index (filter), - &val) ) + &val)) return FALSE; return (val.f == 0.0); diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c index 84014ef05b..3a45fbe137 100644 --- a/src/ui/gui/psppire-data-window.c +++ b/src/ui/gui/psppire-data-window.c @@ -209,7 +209,7 @@ transformation_change_callback (bool transformations_pending, transformations_pending); } - if ( transformations_pending) + if (transformations_pending) gtk_label_set_text (GTK_LABEL (status_label), _("Transformations Pending")); else @@ -225,7 +225,7 @@ on_filter_change (GObject *o, gint filter_index, gpointer data) GtkWidget *filter_status_area = get_widget_assert (de->builder, "filter-use-status-area"); - if ( filter_index == -1 ) + if (filter_index == -1) { gtk_label_set_text (GTK_LABEL (filter_status_area), _("Filter off")); } @@ -258,7 +258,7 @@ on_split_change (PsppireDict *dict, gpointer data) GtkWidget *split_status_area = get_widget_assert (de->builder, "split-file-status-area"); - if ( n_split_vars == 0 ) + if (n_split_vars == 0) { gtk_label_set_text (GTK_LABEL (split_status_area), _("No Split")); } @@ -271,7 +271,7 @@ on_split_change (PsppireDict *dict, gpointer data) text = g_string_new (_("Split by ")); - for (i = 0 ; i < n_split_vars - 1; ++i ) + for (i = 0 ; i < n_split_vars - 1; ++i) { g_string_append_printf (text, "%s, ", var_get_name (split_vars[i])); } @@ -295,7 +295,7 @@ on_weight_change (GObject *o, gint weight_index, gpointer data) GtkWidget *weight_status_area = get_widget_assert (de->builder, "weight-status-area"); - if ( weight_index == -1 ) + if (weight_index == -1) { gtk_label_set_text (GTK_LABEL (weight_status_area), _("Weights off")); } @@ -335,7 +335,7 @@ dump_rm (GtkRecentManager *rm) gtk_recent_info_get_mime_type (ri), gtk_recent_info_get_description (ri), gtk_recent_info_get_uri (ri) - ); + ); gtk_recent_info_unref (ri); @@ -451,7 +451,7 @@ save_file (PsppireWindow *w) fnx = g_string_new (file_name); - if ( ! name_has_suffix (fnx->str)) + if (! name_has_suffix (fnx->str)) g_string_append (fnx, psppire_data_window_format_to_string (de->format)); ds_init_empty (&filename); @@ -488,7 +488,7 @@ sysfile_info (PsppireDataWindow *de) { GtkWidget *dialog = psppire_window_file_chooser_dialog (PSPPIRE_WINDOW (de)); - if ( GTK_RESPONSE_ACCEPT == gtk_dialog_run (GTK_DIALOG (dialog))) + if (GTK_RESPONSE_ACCEPT == gtk_dialog_run (GTK_DIALOG (dialog))) { struct string filename; gchar *file_name = @@ -613,7 +613,7 @@ data_pick_filename (PsppireWindow *window) g_string_new ( gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)) - ); + ); GtkTreeIter iter; int format; @@ -624,7 +624,7 @@ data_pick_filename (PsppireWindow *window) -1); de->format = format; - if ( ! name_has_suffix (filename->str)) + if (! name_has_suffix (filename->str)) g_string_append (filename, psppire_data_window_format_to_string (format)); @@ -801,7 +801,7 @@ fonts_activate (PsppireDataWindow *de) gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (toplevel)); - if ( GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (dialog)) ) + if (GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (dialog))) { PangoFontDescription* font_desc = gtk_font_chooser_get_font_desc (GTK_FONT_CHOOSER (dialog)); @@ -920,7 +920,7 @@ on_recent_files_select (GtkMenuShell *menushell, gpointer user_data) free (encoding); - if ( psppire_window_load (PSPPIRE_WINDOW (se), file, encoding, NULL) ) + if (psppire_window_load (PSPPIRE_WINDOW (se), file, encoding, NULL)) gtk_widget_show (se); else gtk_widget_destroy (se); diff --git a/src/ui/gui/psppire-dialog-action-1sks.c b/src/ui/gui/psppire-dialog-action-1sks.c index 3814c7dccf..f0654c6b71 100644 --- a/src/ui/gui/psppire-dialog-action-1sks.c +++ b/src/ui/gui/psppire-dialog-action-1sks.c @@ -43,9 +43,9 @@ append_fragment (GString *string, const gchar *dist, PsppireVarView *vv) { g_string_append (string, "\n\t/KOLMOGOROV-SMIRNOV"); - g_string_append (string, " ( "); + g_string_append (string, " ("); g_string_append (string, dist); - g_string_append (string, " ) = "); + g_string_append (string, ") = "); psppire_var_view_append_names (vv, 0, string); } @@ -59,16 +59,16 @@ generate_syntax (const PsppireDialogAction *act) GString *string = g_string_new ("NPAR TEST"); - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_NORMAL]))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_NORMAL]))) append_fragment (string, "NORMAL", PSPPIRE_VAR_VIEW (rd->variables)); - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_UNIFORM]))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_UNIFORM]))) append_fragment (string, "UNIFORM", PSPPIRE_VAR_VIEW (rd->variables)); - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_POISSON]))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_POISSON]))) append_fragment (string, "POISSON", PSPPIRE_VAR_VIEW (rd->variables)); - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_EXPONENTIAL]))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_EXPONENTIAL]))) append_fragment (string, "EXPONENTIAL", PSPPIRE_VAR_VIEW (rd->variables)); g_string_append (string, ".\n"); @@ -94,10 +94,10 @@ dialog_state_valid (gpointer data) for (i = 0; i < 4; ++i) { - if ( TRUE == gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (fd->cb[i]))) + if (TRUE == gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (fd->cb[i]))) break; } - if ( i >= 4) + if (i >= 4) return FALSE; return TRUE; @@ -122,7 +122,7 @@ psppire_dialog_action_1sks_activate (PsppireDialogAction *a, GVariant *param) PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogAction1sks *act = PSPPIRE_DIALOG_ACTION_1SKS (a); - GtkBuilder *xml = builder_new ( "ks-one-sample.ui"); + GtkBuilder *xml = builder_new ("ks-one-sample.ui"); pda->dialog = get_widget_assert (xml, "ks-one-sample-dialog"); pda->source = get_widget_assert (xml, "dict-view"); diff --git a/src/ui/gui/psppire-dialog-action-aggregate.c b/src/ui/gui/psppire-dialog-action-aggregate.c index 057b6926fd..8877de092d 100644 --- a/src/ui/gui/psppire-dialog-action-aggregate.c +++ b/src/ui/gui/psppire-dialog-action-aggregate.c @@ -62,7 +62,7 @@ append_summary_variable_syntax (const PsppireDialogActionAggregate *agg, GStrin for (ok = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (acr_model), &iter); ok ; ok = gtk_tree_model_iter_next (GTK_TREE_MODEL (acr_model), &iter) - ) +) { g_string_append (string, "\n\t/"); @@ -73,7 +73,7 @@ append_summary_variable_syntax (const PsppireDialogActionAggregate *agg, GStrin static void append_destination_filename (const PsppireDialogActionAggregate *agg, GString *gs) { - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (agg->filename_radiobutton))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (agg->filename_radiobutton))) { struct string ss; const gchar *s = gtk_label_get_text (GTK_LABEL (agg->filename_label)); @@ -86,7 +86,7 @@ append_destination_filename (const PsppireDialogActionAggregate *agg, GString *g { g_string_append (gs, "* "); - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (agg->replace_radiobutton))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (agg->replace_radiobutton))) g_string_append (gs, "MODE=REPLACE"); else g_string_append (gs, "MODE=ADDVARIABLES"); @@ -105,7 +105,7 @@ generate_syntax (const PsppireDialogAction *act) append_destination_filename (agg, string); - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (agg->sorted_button))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (agg->sorted_button))) g_string_append (string, "\n\t/PRESORTED"); g_string_append (string, "\n\t/BREAK="); @@ -132,12 +132,12 @@ dialog_state_valid (gpointer user_data) GtkTreeModel *liststore = gtk_tree_view_get_model (GTK_TREE_VIEW (agg->break_variables)); - if ( ! gtk_tree_model_get_iter_first (liststore, &iter)) + if (! gtk_tree_model_get_iter_first (liststore, &iter)) return FALSE; liststore = GTK_TREE_MODEL (PSPPIRE_ACR (agg->summary_acr)->list_store); - if ( ! gtk_tree_model_get_iter_first (liststore, &iter)) + if (! gtk_tree_model_get_iter_first (liststore, &iter)) return FALSE; return TRUE; @@ -354,7 +354,7 @@ summary_complete (const PsppireDialogActionAggregate *agg) gboolean ok; GtkTreeModel *model = gtk_combo_box_get_model (GTK_COMBO_BOX (agg->function_combo)); - if ( 0 == strcmp ("", gtk_entry_get_text (GTK_ENTRY (agg->summary_var_name_entry)))) + if (0 == strcmp ("", gtk_entry_get_text (GTK_ENTRY (agg->summary_var_name_entry)))) return FALSE; ok = gtk_combo_box_get_active_iter (GTK_COMBO_BOX (agg->function_combo), &iter); @@ -370,19 +370,19 @@ summary_complete (const PsppireDialogActionAggregate *agg) COMBO_MODEL_COL_SRC_VARS, &src_vars, -1); - if ( src_vars == AGR_SV_YES ) + if (src_vars == AGR_SV_YES) { if (0 == strcmp ("", gtk_entry_get_text (GTK_ENTRY (agg->summary_sv_entry)))) return FALSE; } - if ( n_args >= 2) + if (n_args >= 2) { if (0 == strcmp ("", gtk_entry_get_text (GTK_ENTRY (agg->summary_arg2_entry)))) return FALSE; } - if ( n_args >= 1) + if (n_args >= 1) { if (0 == strcmp ("", gtk_entry_get_text (GTK_ENTRY (agg->summary_arg1_entry)))) return FALSE; @@ -457,7 +457,7 @@ update_arguments (PsppireDialogActionAggregate *agg) gboolean ok = gtk_combo_box_get_active_iter (GTK_COMBO_BOX (agg->function_combo), &iter); - if ( ok) + if (ok) { GtkTreeModel *model = gtk_combo_box_get_model (GTK_COMBO_BOX (agg->function_combo)); int n_args; @@ -577,7 +577,7 @@ psppire_dialog_action_aggregate_activate (PsppireDialogAction *a, GVariant *para g_signal_connect (act->filename_radiobutton, "toggled", - G_CALLBACK (set_sensitivity_from_toggle), act->filename_box ); + G_CALLBACK (set_sensitivity_from_toggle), act->filename_box); g_signal_connect_swapped (act->filename_button, "clicked", G_CALLBACK (choose_filename), act); @@ -653,17 +653,17 @@ append_summary_spec (const PsppireDialogActionAggregate *agg, GtkTreeIter *iter, g_string_append_printf (string, " = %s", funcname); - if ( has_src_vars != AGR_SV_NO) + if (has_src_vars != AGR_SV_NO) { struct string dss; ds_init_cstr (&dss, " ("); ds_put_cstr (&dss, srcvar); - if ( arity > 0) + if (arity > 0) ds_put_c_format (&dss, ", %.*g", DBL_DIG + 1, arg1); - if ( arity > 1) + if (arity > 1) ds_put_c_format (&dss, ", %.*g", DBL_DIG + 1, arg2); ds_put_cstr (&dss, ")"); diff --git a/src/ui/gui/psppire-dialog-action-autorecode.c b/src/ui/gui/psppire-dialog-action-autorecode.c index 7389976a3c..77376d6e67 100644 --- a/src/ui/gui/psppire-dialog-action-autorecode.c +++ b/src/ui/gui/psppire-dialog-action-autorecode.c @@ -68,7 +68,7 @@ refresh (PsppireDialogAction *pda) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rd->group), FALSE); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rd->blank), FALSE); - if (rd->varmap ) + if (rd->varmap) g_hash_table_remove_all (rd->varmap); gtk_list_store_clear (GTK_LIST_STORE (target_list)); @@ -92,7 +92,7 @@ nlp_create (const char *name, const char *label) nlp->label = NULL; - if ( label != NULL && 0 != strcmp ("", label)) + if (label != NULL && 0 != strcmp ("", label)) nlp->label = g_strdup (label); return nlp; @@ -102,7 +102,7 @@ static void nlp_destroy (gpointer data) { struct nlp *nlp = data ; - if ( ! nlp ) + if (! nlp) return; g_free (nlp->name); @@ -142,13 +142,13 @@ generate_syntax (const PsppireDialogAction *act) g_string_append (string, nlp->name); } - if ( ! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->ascending))) + if (! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->ascending))) g_string_append (string, "\n\t/DESCENDING"); - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->group))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->group))) g_string_append (string, "\n\t/GROUP"); - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->blank))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->blank))) g_string_append (string, "\n\t/BLANK = MISSING"); g_string_append (string, ".\n"); @@ -176,7 +176,7 @@ on_change_clicked (GObject *obj, gpointer data) const gchar *dest_var_name = gtk_entry_get_text (GTK_ENTRY (rd->new_name_entry)); - if ( NULL == rows || rows->next != NULL) + if (NULL == rows || rows->next != NULL) goto finish; gtk_tree_model_get_iter (model, &iter, rows->data); @@ -203,7 +203,7 @@ on_entry_change (PsppireDialogActionAutorecode *rd) gboolean valid = TRUE; const char *text = gtk_entry_get_text (GTK_ENTRY (rd->new_name_entry)); - if ( 0 == strcmp ("", text)) + if (0 == strcmp ("", text)) valid = FALSE; else if (psppire_dict_lookup_var (rd->dict, text)) valid = FALSE; @@ -217,7 +217,7 @@ on_entry_change (PsppireDialogActionAutorecode *rd) { struct nlp *nlp = value; - if ( 0 == strcmp (nlp->name, text)) + if (0 == strcmp (nlp->name, text)) { valid = FALSE; break; @@ -243,7 +243,7 @@ on_selection_change (GtkTreeSelection *selection, gpointer data) GList *rows = gtk_tree_selection_get_selected_rows (selection, &model); - if ( rows && !rows->next) + if (rows && !rows->next) { /* Exactly one row is selected */ struct nlp *nlp; @@ -301,7 +301,7 @@ render_new_var_name (GtkTreeViewColumn *tree_column, nlp = g_hash_table_lookup (rd->varmap, var); - if ( nlp ) + if (nlp) g_object_set (cell, "text", nlp->name, NULL); else g_object_set (cell, "text", "", NULL); diff --git a/src/ui/gui/psppire-dialog-action-barchart.c b/src/ui/gui/psppire-dialog-action-barchart.c index 900188fcbf..8858e8b436 100644 --- a/src/ui/gui/psppire-dialog-action-barchart.c +++ b/src/ui/gui/psppire-dialog-action-barchart.c @@ -42,7 +42,7 @@ dialog_state_valid (gpointer rd_) { PsppireDialogActionBarchart *rd = PSPPIRE_DIALOG_ACTION_BARCHART (rd_); - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->button_summary_func)) ) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->button_summary_func))) { if (0 == g_strcmp0 ("", gtk_entry_get_text (GTK_ENTRY (rd->var)))) return FALSE; @@ -120,7 +120,7 @@ psppire_dialog_action_barchart_activate (PsppireDialogAction *a, GVariant *param PsppireDialogActionBarchart *act = PSPPIRE_DIALOG_ACTION_BARCHART (a); PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); - GtkBuilder *xml = builder_new ( "barchart.ui"); + GtkBuilder *xml = builder_new ("barchart.ui"); pda->dialog = get_widget_assert (xml, "barchart-dialog"); pda->source = get_widget_assert (xml, "dict-view"); diff --git a/src/ui/gui/psppire-dialog-action-binomial.c b/src/ui/gui/psppire-dialog-action-binomial.c index 0a9f171f24..648e6e551d 100644 --- a/src/ui/gui/psppire-dialog-action-binomial.c +++ b/src/ui/gui/psppire-dialog-action-binomial.c @@ -67,10 +67,10 @@ dialog_state_valid (gpointer data) GtkTreeIter notused; - if ( !gtk_tree_model_get_iter_first (vars, ¬used) ) + if (!gtk_tree_model_get_iter_first (vars, ¬used)) return FALSE; - if ( ! get_proportion (act, &prop)) + if (! get_proportion (act, &prop)) return FALSE; if (prop < 0 || prop > 1.0) @@ -102,7 +102,7 @@ psppire_dialog_action_binomial_activate (PsppireDialogAction *a, GVariant *param PsppireDialogActionBinomial *act = PSPPIRE_DIALOG_ACTION_BINOMIAL (a); PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); - GtkBuilder *xml = builder_new ( "binomial.ui"); + GtkBuilder *xml = builder_new ("binomial.ui"); pda->dialog = get_widget_assert (xml, "binomial-dialog"); pda->source = get_widget_assert (xml, "dict-view"); @@ -137,14 +137,14 @@ generate_syntax (const PsppireDialogAction *a) ds_init_cstr (&str, "NPAR TEST\n\t/BINOMIAL"); - if ( get_proportion (scd, &prop)) + if (get_proportion (scd, &prop)) ds_put_c_format (&str, "(%.*g)", DBL_DIG + 1, prop); ds_put_cstr (&str, " ="); psppire_var_view_append_names_str (PSPPIRE_VAR_VIEW (scd->var_view), 0, &str); - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (scd->cutpoint_button))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (scd->cutpoint_button))) { const gchar *cutpoint = gtk_entry_get_text (GTK_ENTRY (scd->cutpoint_entry)); ds_put_c_format (&str, "(%s)", cutpoint); diff --git a/src/ui/gui/psppire-dialog-action-chisquare.c b/src/ui/gui/psppire-dialog-action-chisquare.c index 57f8250078..4fd09d0a44 100644 --- a/src/ui/gui/psppire-dialog-action-chisquare.c +++ b/src/ui/gui/psppire-dialog-action-chisquare.c @@ -48,7 +48,7 @@ generate_syntax (const PsppireDialogAction *act) psppire_var_view_append_names_str (PSPPIRE_VAR_VIEW (scd->var_view), 0, &dss); - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (scd->range_button))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (scd->range_button))) { ds_put_cstr (&dss, "("); @@ -63,7 +63,7 @@ generate_syntax (const PsppireDialogAction *act) ds_put_cstr (&dss, ")"); } - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (scd->values_button))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (scd->values_button))) { GtkListStore *ls = scd->expected_list; GtkTreeIter iter; @@ -105,7 +105,7 @@ dialog_state_valid (gpointer a) GtkTreeModel *vars = gtk_tree_view_get_model (GTK_TREE_VIEW (act->var_view)); - if ( !gtk_tree_model_get_iter_first (vars, ¬used) ) + if (!gtk_tree_model_get_iter_first (vars, ¬used)) return FALSE; return TRUE; @@ -134,7 +134,7 @@ psppire_dialog_action_chisquare_activate (PsppireDialogAction *a, GVariant *para PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionChisquare *act = PSPPIRE_DIALOG_ACTION_CHISQUARE (a); - GtkBuilder *xml = builder_new ( "chi-square.ui"); + GtkBuilder *xml = builder_new ("chi-square.ui"); GtkWidget *range_table = get_widget_assert (xml, "range-table"); GtkWidget *values_acr = get_widget_assert (xml, "psppire-acr1"); diff --git a/src/ui/gui/psppire-dialog-action-comments.c b/src/ui/gui/psppire-dialog-action-comments.c index e601a60d45..600ec89741 100644 --- a/src/ui/gui/psppire-dialog-action-comments.c +++ b/src/ui/gui/psppire-dialog-action-comments.c @@ -52,7 +52,7 @@ generate_syntax (const PsppireDialogAction *pda) g_string_append (str, "ADD DOCUMENT\n"); - for (i = 0 ; i < gtk_text_buffer_get_line_count (buffer) ; ++i ) + for (i = 0 ; i < gtk_text_buffer_get_line_count (buffer) ; ++i) { struct string tmp; GtkTextIter start; @@ -79,7 +79,7 @@ generate_syntax (const PsppireDialogAction *pda) g_string_append (str, " .\n"); - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (cd->check))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (cd->check))) g_string_append (str, "DISPLAY DOCUMENTS.\n"); text = str->str; @@ -114,7 +114,7 @@ retrieve_comments (PsppireDialogAction *pda) gtk_text_buffer_set_text (buffer, "", 0); - for ( i = 0 ; i < dict_get_document_line_cnt (pda->dict->dict); ++i ) + for (i = 0 ; i < dict_get_document_line_cnt (pda->dict->dict); ++i) add_line_to_buffer (buffer, dict_get_document_line (pda->dict->dict, i)); } @@ -139,7 +139,7 @@ set_column_number (GtkTextBuffer *textbuffer, GtkLabel *label = data; gchar *text ; - text = g_strdup_printf ( _("Column Number: %d"), + text = g_strdup_printf (_("Column Number: %d"), 1 + gtk_text_iter_get_line_offset (iter)); gtk_label_set_text (label, text); @@ -156,7 +156,7 @@ wrap_line (GtkTextBuffer *buffer, { gint chars = gtk_text_iter_get_chars_in_line (iter); - if ( chars > DOC_LINE_LENGTH ) + if (chars > DOC_LINE_LENGTH) { GtkTextIter line_fold = *iter; @@ -172,7 +172,7 @@ psppire_dialog_action_comments_activate (PsppireDialogAction *pda, GVariant *par { PsppireDialogActionComments *act = PSPPIRE_DIALOG_ACTION_COMMENTS (pda); - GtkBuilder *xml = builder_new ( "comments.ui"); + GtkBuilder *xml = builder_new ("comments.ui"); pda->dialog = get_widget_assert (xml, "comments-dialog"); act->textview = get_widget_assert (xml, "comments-textview1"); diff --git a/src/ui/gui/psppire-dialog-action-compute.c b/src/ui/gui/psppire-dialog-action-compute.c index 2a9b689065..a77ea92dd7 100644 --- a/src/ui/gui/psppire-dialog-action-compute.c +++ b/src/ui/gui/psppire-dialog-action-compute.c @@ -58,10 +58,10 @@ generate_syntax (const PsppireDialogAction *act) string = g_string_sized_new (64); - if ( cd->use_type && - NULL == psppire_dict_lookup_var (act->dict, target_name )) + if (cd->use_type && + NULL == psppire_dict_lookup_var (act->dict, target_name)) { - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (cd->str_btn))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (cd->str_btn))) { const char *w = gtk_entry_get_text (GTK_ENTRY (cd->width_entry)); g_string_append_printf (string, @@ -71,12 +71,12 @@ generate_syntax (const PsppireDialogAction *act) g_string_append_printf (string, "NUMERIC %s.\n", target_name); } - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (cd->user_label))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (cd->user_label))) label = gtk_entry_get_text (GTK_ENTRY (cd->entry)); else label = expression; - if ( strlen (label) > 0 ) + if (strlen (label) > 0) g_string_append_printf (string, "VARIABLE LABEL %s '%s'.\n", target_name, label); @@ -84,7 +84,7 @@ generate_syntax (const PsppireDialogAction *act) g_string_append_printf (string, "COMPUTE %s = %s.\n", target_name, expression - ); + ); g_string_append (string, "EXECUTE.\n"); @@ -214,21 +214,21 @@ reset_type_label_dialog (PsppireDialogActionCompute *cd) target_name = gtk_entry_get_text (GTK_ENTRY (cd->target)); - if ( (target_var = psppire_dict_lookup_var (pda->dict, target_name)) ) + if ((target_var = psppire_dict_lookup_var (pda->dict, target_name))) { /* Existing Variable */ const gchar *label = var_get_label (target_var); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cd->user_label), TRUE); - if ( label ) + if (label) { gtk_entry_set_text (GTK_ENTRY (cd->entry), label); } gtk_widget_set_sensitive (cd->width_entry, FALSE); - if ( var_is_numeric (target_var)) + if (var_is_numeric (target_var)) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cd->numeric_target), TRUE); else @@ -307,7 +307,7 @@ run_type_label_dialog (GtkButton *b, gpointer data) reset_type_label_dialog (cd); response = psppire_dialog_run (PSPPIRE_DIALOG (cd->subdialog)); - if ( response == PSPPIRE_RESPONSE_CONTINUE) + if (response == PSPPIRE_RESPONSE_CONTINUE) cd->use_type = TRUE; } @@ -315,7 +315,7 @@ static void on_type_toggled (GtkToggleButton *button, gpointer data) { PsppireDialogActionCompute *cd = PSPPIRE_DIALOG_ACTION_COMPUTE (data); - if ( gtk_toggle_button_get_active (button)) + if (gtk_toggle_button_get_active (button)) { gtk_widget_set_sensitive (cd->width_entry, TRUE); gtk_widget_grab_focus (cd->width_entry); @@ -333,7 +333,7 @@ on_expression_toggle (GtkToggleButton *button, gpointer data) PsppireDialogActionCompute *cd = PSPPIRE_DIALOG_ACTION_COMPUTE (data); PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (data); - if ( gtk_toggle_button_get_active (button)) + if (gtk_toggle_button_get_active (button)) { gtk_entry_set_text (GTK_ENTRY (cd->entry), ""); gtk_widget_set_sensitive (cd->entry, FALSE); @@ -342,11 +342,11 @@ on_expression_toggle (GtkToggleButton *button, gpointer data) { const gchar *target_name = gtk_entry_get_text (GTK_ENTRY (cd->target)); const struct variable *target_var = psppire_dict_lookup_var (pda->dict, target_name); - if ( target_var ) + if (target_var) { const char *label = var_get_label (target_var); - if ( label ) + if (label) gtk_entry_set_text (GTK_ENTRY (cd->entry), label); } else @@ -421,7 +421,7 @@ insert_function_into_syntax_area (GtkTreeIter iter, string = g_string_new (g_value_get_string (&name_value)); g_string_append (string, "("); - for ( i = 0 ; i < arity -1 ; ++i ) + for (i = 0 ; i < arity -1 ; ++i) { g_string_append (string, "?,"); } @@ -441,7 +441,7 @@ insert_function_into_syntax_area (GtkTreeIter iter, GtkTextIter selectbound; GtkTextMark *cursor = gtk_text_buffer_get_insert (buffer); gtk_text_buffer_get_iter_at_mark (buffer, &insert, cursor); - for ( i = 0 ; i < arity ; ++i ) + for (i = 0 ; i < arity ; ++i) { gtk_text_iter_backward_cursor_position (&insert); gtk_text_iter_backward_cursor_position (&insert); @@ -460,7 +460,7 @@ psppire_dialog_action_compute_activate (PsppireDialogAction *a, GVariant *param) PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionCompute *act = PSPPIRE_DIALOG_ACTION_COMPUTE (a); - GtkBuilder *xml = builder_new ( "compute.ui"); + GtkBuilder *xml = builder_new ("compute.ui"); pda->dialog = get_widget_assert (xml, "compute-variable-dialog"); pda->source = get_widget_assert (xml, "compute-treeview1"); diff --git a/src/ui/gui/psppire-dialog-action-correlation.c b/src/ui/gui/psppire-dialog-action-correlation.c index 30c3b05bc7..18cba1c09a 100644 --- a/src/ui/gui/psppire-dialog-action-correlation.c +++ b/src/ui/gui/psppire-dialog-action-correlation.c @@ -97,7 +97,7 @@ psppire_dialog_action_correlation_activate (PsppireDialogAction *a, GVariant *pa PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionCorrelation *act = PSPPIRE_DIALOG_ACTION_CORRELATION (a); - GtkBuilder *xml = builder_new ( "correlation.ui"); + GtkBuilder *xml = builder_new ("correlation.ui"); pda->dialog = get_widget_assert (xml, "correlation-dialog"); pda->source = get_widget_assert (xml, "dict-view"); diff --git a/src/ui/gui/psppire-dialog-action-count.c b/src/ui/gui/psppire-dialog-action-count.c index 0f5fc87fbe..b1ee11dc15 100644 --- a/src/ui/gui/psppire-dialog-action-count.c +++ b/src/ui/gui/psppire-dialog-action-count.c @@ -117,7 +117,7 @@ dialog_state_valid (gpointer data) if (! cnt->value_list) return FALSE; - if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (cnt->value_list), &iter) ) + if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (cnt->value_list), &iter)) return FALSE; if (!gtk_tree_model_get_iter_first (gtk_tree_view_get_model (GTK_TREE_VIEW (cnt->variable_treeview)), &iter)) @@ -150,7 +150,7 @@ psppire_dialog_action_count_activate (PsppireDialogAction *a, GVariant *param) PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionCount *act = PSPPIRE_DIALOG_ACTION_COUNT (a); - GtkBuilder *xml = builder_new ( "count.ui"); + GtkBuilder *xml = builder_new ("count.ui"); GtkWidget *selector = get_widget_assert (xml, "count-selector1"); GtkWidget *button = get_widget_assert (xml, "button1"); @@ -207,7 +207,7 @@ on_acr_selection_change (GtkTreeSelection *selection, gpointer data) PsppireDialogActionCount *cnt = PSPPIRE_DIALOG_ACTION_COUNT (data); GValue ov_value = {0}; - if ( ! gtk_tree_selection_get_selected (selection, &model, &iter) ) + if (! gtk_tree_selection_get_selected (selection, &model, &iter)) return; gtk_tree_model_get_value (GTK_TREE_MODEL (model), &iter, @@ -263,7 +263,7 @@ values_dialog (PsppireDialogActionCount *cd) response = psppire_dialog_run (PSPPIRE_DIALOG (dialog)); - if ( response == PSPPIRE_RESPONSE_CONTINUE ) + if (response == PSPPIRE_RESPONSE_CONTINUE) { g_object_unref (cd->value_list); cd->value_list = local_store; diff --git a/src/ui/gui/psppire-dialog-action-crosstabs.c b/src/ui/gui/psppire-dialog-action-crosstabs.c index 79baec16dc..6fc41de0d4 100644 --- a/src/ui/gui/psppire-dialog-action-crosstabs.c +++ b/src/ui/gui/psppire-dialog-action-crosstabs.c @@ -151,7 +151,7 @@ on_format_clicked (PsppireDialogActionCrosstabs *cd) ret = psppire_dialog_run (PSPPIRE_DIALOG (cd->format_dialog)); - if ( ret == PSPPIRE_RESPONSE_CONTINUE ) + if (ret == PSPPIRE_RESPONSE_CONTINUE) { cd->format_options_avalue = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (cd->avalue_button)); @@ -171,7 +171,7 @@ on_cell_clicked (PsppireDialogActionCrosstabs *cd) gint ret = psppire_dialog_run (PSPPIRE_DIALOG (cd->cell_dialog)); - if ( ret == PSPPIRE_RESPONSE_CONTINUE ) + if (ret == PSPPIRE_RESPONSE_CONTINUE) { g_object_unref (liststore); } @@ -190,7 +190,7 @@ on_statistics_clicked (PsppireDialogActionCrosstabs *cd) gint ret = psppire_dialog_run (PSPPIRE_DIALOG (cd->stat_dialog)); - if ( ret == PSPPIRE_RESPONSE_CONTINUE ) + if (ret == PSPPIRE_RESPONSE_CONTINUE) { g_object_unref (liststore); } @@ -208,7 +208,7 @@ psppire_dialog_action_crosstabs_activate (PsppireDialogAction *a, GVariant *para PsppireDialogActionCrosstabs *act = PSPPIRE_DIALOG_ACTION_CROSSTABS (a); PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); - GtkBuilder *xml = builder_new ( "crosstabs.ui"); + GtkBuilder *xml = builder_new ("crosstabs.ui"); pda->dialog = get_widget_assert (xml, "crosstabs-dialog"); pda->source = get_widget_assert (xml, "dict-treeview"); diff --git a/src/ui/gui/psppire-dialog-action-descriptives.c b/src/ui/gui/psppire-dialog-action-descriptives.c index 78e962bc9f..ea899dd21e 100644 --- a/src/ui/gui/psppire-dialog-action-descriptives.c +++ b/src/ui/gui/psppire-dialog-action-descriptives.c @@ -199,7 +199,7 @@ psppire_dialog_action_descriptives_activate (PsppireDialogAction *a, GVariant *p PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionDescriptives *act = PSPPIRE_DIALOG_ACTION_DESCRIPTIVES (a); - GtkBuilder *xml = builder_new ( "descriptives.ui"); + GtkBuilder *xml = builder_new ("descriptives.ui"); GtkWidget *stats_treeview = get_widget_assert (xml, "statistics"); psppire_checkbox_treeview_populate (PSPPIRE_CHECKBOX_TREEVIEW (stats_treeview), diff --git a/src/ui/gui/psppire-dialog-action-examine.c b/src/ui/gui/psppire-dialog-action-examine.c index a885178906..12627bd7a5 100644 --- a/src/ui/gui/psppire-dialog-action-examine.c +++ b/src/ui/gui/psppire-dialog-action-examine.c @@ -55,16 +55,16 @@ run_stats_dialog (PsppireDialogActionExamine *ed) response = psppire_dialog_run (PSPPIRE_DIALOG (ed->stats_dialog)); - if ( response == PSPPIRE_RESPONSE_CONTINUE ) + if (response == PSPPIRE_RESPONSE_CONTINUE) { ed->stats = 0; - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ed->descriptives_button) )) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ed->descriptives_button))) ed->stats |= STAT_DESCRIPTIVES; - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ed->extremes_button) )) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ed->extremes_button))) ed->stats |= STAT_EXTREMES; - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ed->percentiles_button) )) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ed->percentiles_button))) ed->stats |= STAT_PERCENTILES; } } @@ -92,7 +92,7 @@ run_opts_dialog (PsppireDialogActionExamine *ed) response = psppire_dialog_run (PSPPIRE_DIALOG (ed->opts_dialog)); - if ( response == PSPPIRE_RESPONSE_CONTINUE ) + if (response == PSPPIRE_RESPONSE_CONTINUE) { if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ed->listwise))) ed->opts = OPT_LISTWISE; @@ -118,7 +118,7 @@ generate_syntax (const PsppireDialogAction *act) g_string_append (str, "\n\t/VARIABLES="); psppire_var_view_append_names (PSPPIRE_VAR_VIEW (ed->variables), 0, str); - if ( 0 < gtk_tree_model_iter_n_children + if (0 < gtk_tree_model_iter_n_children (gtk_tree_view_get_model (GTK_TREE_VIEW (ed->factors)), NULL)) { g_string_append (str, "\n\tBY "); @@ -126,24 +126,24 @@ generate_syntax (const PsppireDialogAction *act) } label = gtk_entry_get_text (GTK_ENTRY (ed->id_var)); - if ( 0 != strcmp (label, "") ) + if (0 != strcmp (label, "")) { g_string_append (str, "\n\t/ID = "); g_string_append (str, label); } - if ( ed->stats & (STAT_DESCRIPTIVES | STAT_EXTREMES)) + if (ed->stats & (STAT_DESCRIPTIVES | STAT_EXTREMES)) { g_string_append (str, "\n\t/STATISTICS ="); - if ( ed->stats & STAT_DESCRIPTIVES) + if (ed->stats & STAT_DESCRIPTIVES) g_string_append (str, " DESCRIPTIVES"); - if ( ed->stats & STAT_EXTREMES) + if (ed->stats & STAT_EXTREMES) g_string_append (str, " EXTREME"); } - if ( ed->stats & STAT_PERCENTILES) + if (ed->stats & STAT_PERCENTILES) g_string_append (str, "\n\t/PERCENTILES"); diff --git a/src/ui/gui/psppire-dialog-action-factor.c b/src/ui/gui/psppire-dialog-action-factor.c index 4c5d927e28..48f72ffbd6 100644 --- a/src/ui/gui/psppire-dialog-action-factor.c +++ b/src/ui/gui/psppire-dialog-action-factor.c @@ -70,7 +70,7 @@ generate_syntax (const PsppireDialogAction *act) ds_put_cstr (&str, "\n\t/CRITERIA = "); - if ( rd->extraction.explicit_nfactors ) + if (rd->extraction.explicit_nfactors) ds_put_c_format (&str, "FACTORS (%d)", rd->extraction.n_factors); else ds_put_c_format (&str, "MINEIGEN (%.*g)", @@ -84,19 +84,19 @@ generate_syntax (const PsppireDialogAction *act) ds_put_cstr (&str, "\n\t/EXTRACTION ="); - if ( rd->extraction.paf) + if (rd->extraction.paf) ds_put_cstr (&str, "PAF"); else ds_put_cstr (&str, "PC"); ds_put_cstr (&str, "\n\t/METHOD = "); - if ( rd->extraction.covariance ) + if (rd->extraction.covariance) ds_put_cstr (&str, "COVARIANCE"); else ds_put_cstr (&str, "CORRELATION"); - if ( rd->extraction.scree ) + if (rd->extraction.scree) { ds_put_cstr (&str, "\n\t/PLOT = "); ds_put_cstr (&str, "EIGEN"); @@ -105,17 +105,17 @@ generate_syntax (const PsppireDialogAction *act) ds_put_cstr (&str, "\n\t/PRINT = "); ds_put_cstr (&str, "INITIAL "); - if ( rd->extraction.unrotated ) + if (rd->extraction.unrotated) ds_put_cstr (&str, "EXTRACTION "); - if ( rd->rotation.rotated_solution ) + if (rd->rotation.rotated_solution) ds_put_cstr (&str, "ROTATION"); /* The CRITERIA = ITERATE subcommand is overloaded. It applies to the next /ROTATION and/or EXTRACTION command whatever comes first. */ - ds_put_c_format (&str, "\n\t/CRITERIA = ITERATE (%d)", rd->rotation.iterations ); + ds_put_c_format (&str, "\n\t/CRITERIA = ITERATE (%d)", rd->rotation.iterations); ds_put_cstr (&str, "\n\t/ROTATION = "); ds_put_cstr (&str, rot_method_syntax[rd->rotation.method]); @@ -180,7 +180,7 @@ load_extraction_parameters (PsppireDialogActionFactor *fd, const struct extracti gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fd->scree_button), p->scree); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fd->unrotated_button), p->unrotated); - if ( p->paf ) + if (p->paf) gtk_combo_box_set_active (GTK_COMBO_BOX (fd->extraction_combo), 1); else gtk_combo_box_set_active (GTK_COMBO_BOX (fd->extraction_combo), 0); @@ -225,16 +225,16 @@ set_rotation_parameters (PsppireDialogActionFactor *act, struct rotation_paramet p->rotated_solution = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (act->display_rotated_solution)); - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (act->rotation_none))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (act->rotation_none))) p->method = ROT_NONE; - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (act->rotation_varimax))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (act->rotation_varimax))) p->method = ROT_VARIMAX; if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (act->rotation_quartimax))) p->method = ROT_QUARTIMAX; - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (act->rotation_equimax))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (act->rotation_equimax))) p->method = ROT_EQUIMAX; } @@ -262,7 +262,7 @@ run_extractions_subdialog (PsppireDialogActionFactor *act) gint response = psppire_dialog_run (PSPPIRE_DIALOG (act->extraction_dialog)); - if ( response == PSPPIRE_RESPONSE_CONTINUE ) + if (response == PSPPIRE_RESPONSE_CONTINUE) { /* Set the parameters from their respective widgets */ set_extraction_parameters (act, ex); @@ -281,7 +281,7 @@ run_rotations_subdialog (PsppireDialogActionFactor *act) gint response = psppire_dialog_run (PSPPIRE_DIALOG (act->rotation_dialog)); - if ( response == PSPPIRE_RESPONSE_CONTINUE ) + if (response == PSPPIRE_RESPONSE_CONTINUE) { /* Set the parameters from their respective widgets */ set_rotation_parameters (act, rot); @@ -301,7 +301,7 @@ psppire_dialog_action_factor_activate (PsppireDialogAction *a, GVariant *param) GtkWidget *extraction_button ; GtkWidget *rotation_button ; - GtkBuilder *xml = builder_new ( "factor.ui"); + GtkBuilder *xml = builder_new ("factor.ui"); pda->dialog = get_widget_assert (xml, "factor-dialog"); pda->source = get_widget_assert (xml, "dict-view"); diff --git a/src/ui/gui/psppire-dialog-action-flip.c b/src/ui/gui/psppire-dialog-action-flip.c index 640f8c2b07..07863ec155 100644 --- a/src/ui/gui/psppire-dialog-action-flip.c +++ b/src/ui/gui/psppire-dialog-action-flip.c @@ -48,7 +48,7 @@ generate_syntax (const PsppireDialogAction *act) text = gtk_entry_get_text (GTK_ENTRY (rd->entry)); - if ( text) + if (text) g_string_append_printf (string, " /NEWNAME = %s", text); g_string_append (string, ".\n"); @@ -70,10 +70,10 @@ dialog_state_valid (gpointer a) gint n_rows = gtk_tree_model_iter_n_children (model, NULL); - if ( n_rows == 0 ) + if (n_rows == 0) return FALSE; - if ( 0 == strcmp ("", gtk_entry_get_text (GTK_ENTRY (act->entry)))) + if (0 == strcmp ("", gtk_entry_get_text (GTK_ENTRY (act->entry)))) return FALSE; return TRUE; @@ -95,7 +95,7 @@ psppire_dialog_action_flip_activate (PsppireDialogAction *a, GVariant *param) PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionFlip *act = PSPPIRE_DIALOG_ACTION_FLIP (a); - GtkBuilder *xml = builder_new ( "transpose.ui"); + GtkBuilder *xml = builder_new ("transpose.ui"); pda->dialog = get_widget_assert (xml, "transpose-dialog"); pda->source = get_widget_assert (xml, "source-treeview"); diff --git a/src/ui/gui/psppire-dialog-action-frequencies.c b/src/ui/gui/psppire-dialog-action-frequencies.c index c987e5ee90..70726bec13 100644 --- a/src/ui/gui/psppire-dialog-action-frequencies.c +++ b/src/ui/gui/psppire-dialog-action-frequencies.c @@ -184,7 +184,7 @@ on_charts_clicked (PsppireDialogActionFrequencies *fd) ret = psppire_dialog_run (PSPPIRE_DIALOG (fd->charts_dialog)); - if ( ret == PSPPIRE_RESPONSE_CONTINUE ) + if (ret == PSPPIRE_RESPONSE_CONTINUE) { fd->charts_opts_use_min = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (fd->min)); fd->charts_opts_min = gtk_spin_button_get_value (GTK_SPIN_BUTTON (fd->min_spin)); @@ -257,7 +257,7 @@ psppire_dialog_action_frequencies_activate (PsppireDialogAction *a, GVariant *pa PsppireDialogActionFrequencies *act = PSPPIRE_DIALOG_ACTION_FREQUENCIES (a); PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); - GtkBuilder *xml = builder_new ( "frequencies.ui"); + GtkBuilder *xml = builder_new ("frequencies.ui"); GtkWidget *stats_treeview = get_widget_assert (xml, "stats-treeview"); diff --git a/src/ui/gui/psppire-dialog-action-histogram.c b/src/ui/gui/psppire-dialog-action-histogram.c index 3949886c92..e6a6fe733e 100644 --- a/src/ui/gui/psppire-dialog-action-histogram.c +++ b/src/ui/gui/psppire-dialog-action-histogram.c @@ -42,7 +42,7 @@ dialog_state_valid (gpointer data) const gchar *var_name = gtk_entry_get_text (GTK_ENTRY (rd->variable)); const struct variable *var = psppire_dict_lookup_var (PSPPIRE_DIALOG_ACTION (rd)->dict, var_name); - if ( var == NULL) + if (var == NULL) return FALSE; @@ -64,7 +64,7 @@ psppire_dialog_action_histogram_activate (PsppireDialogAction *a, GVariant *para PsppireDialogActionHistogram *act = PSPPIRE_DIALOG_ACTION_HISTOGRAM (a); PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); - GtkBuilder *xml = builder_new ( "histogram.ui"); + GtkBuilder *xml = builder_new ("histogram.ui"); pda->dialog = get_widget_assert (xml, "histogram-dialog"); pda->source = get_widget_assert (xml, "dict-view"); diff --git a/src/ui/gui/psppire-dialog-action-indep-samps.c b/src/ui/gui/psppire-dialog-action-indep-samps.c index 32db97ea13..faea2b4141 100644 --- a/src/ui/gui/psppire-dialog-action-indep-samps.c +++ b/src/ui/gui/psppire-dialog-action-indep-samps.c @@ -187,7 +187,7 @@ run_define_groups (PsppireDialogActionIndepSamps *act) psppire_value_entry_set_variable (PSPPIRE_VALUE_ENTRY (act->dg_grp_entry[1]), act->grp_var); psppire_value_entry_set_variable (PSPPIRE_VALUE_ENTRY (act->dg_cut_point_entry), act->grp_var); - if (act->group_defn != GROUPS_CUT_POINT ) + if (act->group_defn != GROUPS_CUT_POINT) { gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (act->dg_cut_point_toggle_button), TRUE); @@ -299,7 +299,7 @@ psppire_dialog_action_indep_samps_activate (PsppireDialogAction *a, GVariant *pa PsppireDialogActionIndepSamps *act = PSPPIRE_DIALOG_ACTION_INDEP_SAMPS (a); PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); - GtkBuilder *xml = builder_new ( "indep-samples.ui"); + GtkBuilder *xml = builder_new ("indep-samples.ui"); pda->dialog = get_widget_assert (xml,"independent-samples-dialog"); pda->source = get_widget_assert (xml, "indep-samples-treeview1"); diff --git a/src/ui/gui/psppire-dialog-action-k-independent.c b/src/ui/gui/psppire-dialog-action-k-independent.c index 3a590f95d1..09129469c9 100644 --- a/src/ui/gui/psppire-dialog-action-k-independent.c +++ b/src/ui/gui/psppire-dialog-action-k-independent.c @@ -57,7 +57,7 @@ generate_syntax (const PsppireDialogAction *act) { g_string_append (string, "\n\t"); - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (kid->checkbutton[i]))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (kid->checkbutton[i]))) { g_string_append_printf (string, "/%s = ", keyword[i]); psppire_var_view_append_names (PSPPIRE_VAR_VIEW (kid->vars_treeview), @@ -95,10 +95,10 @@ dialog_state_valid (gpointer data) GtkTreeIter notused; - if ( !gtk_tree_model_get_iter_first (vars, ¬used) ) + if (!gtk_tree_model_get_iter_first (vars, ¬used)) return FALSE; - if ( 0 == strcmp ("", gtk_entry_get_text (GTK_ENTRY (kid->groupvar_entry)))) + if (0 == strcmp ("", gtk_entry_get_text (GTK_ENTRY (kid->groupvar_entry)))) return FALSE; gboolean method_set = FALSE; @@ -175,7 +175,7 @@ psppire_dialog_action_k_independent_activate (PsppireDialogAction *a, GVariant * PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionKIndependent *kid = PSPPIRE_DIALOG_ACTION_K_INDEPENDENT (a); - GtkBuilder *xml = builder_new ( "k-independent.ui"); + GtkBuilder *xml = builder_new ("k-independent.ui"); pda->dialog = get_widget_assert (xml, "k-independent-dialog"); pda->source = get_widget_assert (xml, "k-independent-treeview1"); diff --git a/src/ui/gui/psppire-dialog-action-k-related.c b/src/ui/gui/psppire-dialog-action-k-related.c index 8c088f81eb..a9ef4cbfb2 100644 --- a/src/ui/gui/psppire-dialog-action-k-related.c +++ b/src/ui/gui/psppire-dialog-action-k-related.c @@ -37,19 +37,19 @@ generate_syntax (const PsppireDialogAction *act) GString *string = g_string_new ("NPAR TEST"); - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (krd->friedman))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (krd->friedman))) { g_string_append (string, "\n\t/FRIEDMAN = "); psppire_var_view_append_names (PSPPIRE_VAR_VIEW (krd->var_view), 0, string); } - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (krd->kendal))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (krd->kendal))) { g_string_append (string, "\n\t/KENDALL = "); psppire_var_view_append_names (PSPPIRE_VAR_VIEW (krd->var_view), 0, string); } - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (krd->cochran))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (krd->cochran))) { g_string_append (string, "\n\t/COCHRAN = "); psppire_var_view_append_names (PSPPIRE_VAR_VIEW (krd->var_view), 0, string); @@ -84,7 +84,7 @@ dialog_state_valid (gpointer data) ! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (krd->kendal)) && ! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (krd->cochran)) - ) +) return FALSE; return TRUE; @@ -110,7 +110,7 @@ psppire_dialog_action_k_related_activate (PsppireDialogAction *a, GVariant *para PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionKRelated *act = PSPPIRE_DIALOG_ACTION_K_RELATED (a); - GtkBuilder *xml = builder_new ( "k-related.ui"); + GtkBuilder *xml = builder_new ("k-related.ui"); pda->dialog = get_widget_assert (xml, "k-related-dialog"); pda->source = get_widget_assert (xml, "dict-view"); diff --git a/src/ui/gui/psppire-dialog-action-kmeans.c b/src/ui/gui/psppire-dialog-action-kmeans.c index 24f9c60479..0e22be6e05 100644 --- a/src/ui/gui/psppire-dialog-action-kmeans.c +++ b/src/ui/gui/psppire-dialog-action-kmeans.c @@ -85,7 +85,7 @@ psppire_dialog_action_kmeans_activate (PsppireDialogAction *a, GVariant *param) PsppireDialogActionKmeans *act = PSPPIRE_DIALOG_ACTION_KMEANS (a); PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); - GtkBuilder *xml = builder_new ( "k-means.ui"); + GtkBuilder *xml = builder_new ("k-means.ui"); pda->dialog = get_widget_assert (xml, "k-means-dialog"); pda->source = get_widget_assert (xml, "dict-view"); diff --git a/src/ui/gui/psppire-dialog-action-logistic.c b/src/ui/gui/psppire-dialog-action-logistic.c index de3e4793ba..252bf9797a 100644 --- a/src/ui/gui/psppire-dialog-action-logistic.c +++ b/src/ui/gui/psppire-dialog-action-logistic.c @@ -82,7 +82,7 @@ on_opts_clicked (PsppireDialogActionLogistic *act) ret = psppire_dialog_run (PSPPIRE_DIALOG (act->opts_dialog)); - if ( ret == PSPPIRE_RESPONSE_CONTINUE ) + if (ret == PSPPIRE_RESPONSE_CONTINUE) { act->conf = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(act->conf_checkbox)); act->conf_level = gtk_spin_button_get_value (GTK_SPIN_BUTTON (act->conf_entry)); @@ -102,7 +102,7 @@ psppire_dialog_action_logistic_activate (PsppireDialogAction *a, GVariant *param PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); GtkWidget *opts_button; - GtkBuilder *xml = builder_new ( "logistic.ui"); + GtkBuilder *xml = builder_new ("logistic.ui"); pda->dialog = get_widget_assert (xml, "logistic-dialog"); pda->source = get_widget_assert (xml, "dict-view"); diff --git a/src/ui/gui/psppire-dialog-action-means.c b/src/ui/gui/psppire-dialog-action-means.c index 10cc426bf1..c9b7eb8f65 100644 --- a/src/ui/gui/psppire-dialog-action-means.c +++ b/src/ui/gui/psppire-dialog-action-means.c @@ -97,7 +97,7 @@ psppire_dialog_action_means_activate (PsppireDialogAction *a, GVariant *param) PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionMeans *act = PSPPIRE_DIALOG_ACTION_MEANS (a); - GtkBuilder *xml = builder_new ( "means.ui"); + GtkBuilder *xml = builder_new ("means.ui"); GtkWidget *vb = get_widget_assert (xml, "frame2"); act->layer = psppire_means_layer_new (); diff --git a/src/ui/gui/psppire-dialog-action-oneway.c b/src/ui/gui/psppire-dialog-action-oneway.c index e66ec4a498..71d4873cd2 100644 --- a/src/ui/gui/psppire-dialog-action-oneway.c +++ b/src/ui/gui/psppire-dialog-action-oneway.c @@ -83,20 +83,20 @@ generate_syntax (const PsppireDialogAction *act) if (ow->posthoc) { ds_put_cstr (&dss, "\n\t/POSTHOC="); - if ( ow->posthoc & POSTHOC_BONFERRONI) + if (ow->posthoc & POSTHOC_BONFERRONI) ds_put_cstr (&dss, "BONFERRONI "); - if ( ow->posthoc & POSTHOC_GH) + if (ow->posthoc & POSTHOC_GH) ds_put_cstr (&dss, "GH "); - if ( ow->posthoc & POSTHOC_LSD) + if (ow->posthoc & POSTHOC_LSD) ds_put_cstr (&dss, "LSD "); - if ( ow->posthoc & POSTHOC_SCHEFFE) + if (ow->posthoc & POSTHOC_SCHEFFE) ds_put_cstr (&dss, "SCHEFFE "); - if ( ow->posthoc & POSTHOC_SIDAK) + if (ow->posthoc & POSTHOC_SIDAK) ds_put_cstr (&dss, "SIDAK "); - if ( ow->posthoc & POSTHOC_TUKEY) + if (ow->posthoc & POSTHOC_TUKEY) ds_put_cstr (&dss, "TUKEY "); } - for (i = 0 ; i < ow->contrasts_array->len ; ++i ) + for (i = 0 ; i < ow->contrasts_array->len ; ++i) { GtkListStore *ls = g_array_index (ow->contrasts_array, GtkListStore*, i); GtkTreeIter iter; @@ -136,10 +136,10 @@ dialog_state_valid (gpointer data) GtkTreeIter notused; - if ( !gtk_tree_model_get_iter_first (vars, ¬used) ) + if (!gtk_tree_model_get_iter_first (vars, ¬used)) return FALSE; - if ( 0 == strcmp ("", gtk_entry_get_text (GTK_ENTRY (ow->factor_entry)))) + if (0 == strcmp ("", gtk_entry_get_text (GTK_ENTRY (ow->factor_entry)))) return FALSE; @@ -181,7 +181,7 @@ list_store_changed (PsppireDialogActionOneway *csd) gtk_widget_set_sensitive (csd->prev, csd->c > 1); - if ( csd->c > 0 ) + if (csd->c > 0) ls = g_array_index (csd->temp_contrasts, GtkTreeModel*, csd->c - 1); psppire_acr_set_model (PSPPIRE_ACR (csd->acr), GTK_LIST_STORE (ls)); @@ -194,7 +194,7 @@ list_store_changed (PsppireDialogActionOneway *csd) for (ok = gtk_tree_model_get_iter_first (ls, &iter); ok; ok = gtk_tree_model_iter_next (ls, &iter) - ) +) { gdouble v; gtk_tree_model_get (ls, &iter, 0, &v, -1); @@ -219,7 +219,7 @@ clone_contrasts_array (GArray *src_array) g_array_sized_new (FALSE, FALSE, sizeof (GtkListStore *), src_array->len); - for (i = 0 ; i < src_array->len ; ++i ) + for (i = 0 ; i < src_array->len ; ++i) { GtkTreeIter src_iter; @@ -246,7 +246,7 @@ psppire_dialog_action_oneway_activate (PsppireDialogAction *a, GVariant *param) PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionOneway *act = PSPPIRE_DIALOG_ACTION_ONEWAY (a); - GtkBuilder *xml = builder_new ( "oneway.ui"); + GtkBuilder *xml = builder_new ("oneway.ui"); GtkWidget *contrasts_button = get_widget_assert (xml, "contrasts-button"); /* Posthoc button */ @@ -345,25 +345,25 @@ run_posthoc_dialog (PsppireDialogActionOneway *ow) response = psppire_dialog_run (PSPPIRE_DIALOG (ow->posthoc_dialog)); - if ( response == PSPPIRE_RESPONSE_CONTINUE ) + if (response == PSPPIRE_RESPONSE_CONTINUE) { ow->posthoc= 0; - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ow->bonferroni_button) )) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ow->bonferroni_button))) ow->posthoc |= POSTHOC_BONFERRONI; - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ow->gh_button) )) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ow->gh_button))) ow->posthoc |= POSTHOC_GH; - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ow->lsd_button) )) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ow->lsd_button))) ow->posthoc |= POSTHOC_LSD; - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ow->scheffe_button) )) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ow->scheffe_button))) ow->posthoc |= POSTHOC_SCHEFFE; - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ow->sidak_button) )) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ow->sidak_button))) ow->posthoc |= POSTHOC_SIDAK; - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ow->tukey_button) )) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ow->tukey_button))) ow->posthoc |= POSTHOC_TUKEY; } } @@ -381,7 +381,7 @@ run_contrasts_dialog (PsppireDialogActionOneway *csd) response = psppire_dialog_run (PSPPIRE_DIALOG (csd->contrasts_dialog)); - if ( response == PSPPIRE_RESPONSE_CONTINUE ) + if (response == PSPPIRE_RESPONSE_CONTINUE) { csd->contrasts_array = clone_contrasts_array (csd->temp_contrasts); } @@ -420,7 +420,7 @@ next (GtkWidget *widget, PsppireDialogActionOneway *csd) static void prev (GtkWidget *widget, PsppireDialogActionOneway *csd) { - if ( csd->c > 0 ) + if (csd->c > 0) --csd->c; list_store_changed (csd); diff --git a/src/ui/gui/psppire-dialog-action-paired.c b/src/ui/gui/psppire-dialog-action-paired.c index 4b8dfba835..4d2fbb3aee 100644 --- a/src/ui/gui/psppire-dialog-action-paired.c +++ b/src/ui/gui/psppire-dialog-action-paired.c @@ -46,7 +46,7 @@ dialog_state_valid (gpointer data) struct variable *v = NULL; GtkTreeIter dest_iter; - if ( n_rows == 0 ) + if (n_rows == 0) return FALSE; /* Get the last row */ @@ -59,7 +59,7 @@ dialog_state_valid (gpointer data) if (v == NULL) return FALSE; - /* if ( NULL == pd->valid) */ + /* if (NULL == pd->valid) */ /* return TRUE; */ return TRUE; @@ -93,7 +93,7 @@ select_as_pair_member (GtkTreeIter source_iter, n_rows = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (tt_d->list_store), NULL); - if ( n_rows > 0 ) + if (n_rows > 0) { gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (tt_d->list_store), @@ -104,7 +104,7 @@ select_as_pair_member (GtkTreeIter source_iter, else v1 = NULL; - if ( n_rows == 0 || v1 != NULL) + if (n_rows == 0 || v1 != NULL) { gtk_list_store_append (tt_d->list_store, &dest_iter); @@ -155,7 +155,7 @@ psppire_dialog_action_paired_activate (PsppireDialogAction *a, GVariant *param) PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionPaired *act = PSPPIRE_DIALOG_ACTION_PAIRED (a); - GtkBuilder *xml = builder_new ( "paired-samples.ui"); + GtkBuilder *xml = builder_new ("paired-samples.ui"); GtkWidget *selector = get_widget_assert (xml, "psppire-selector3"); GtkWidget *bb = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL); diff --git a/src/ui/gui/psppire-dialog-action-rank.c b/src/ui/gui/psppire-dialog-action-rank.c index 8b9a5bb5c9..c0454d10f3 100644 --- a/src/ui/gui/psppire-dialog-action-rank.c +++ b/src/ui/gui/psppire-dialog-action-rank.c @@ -53,7 +53,7 @@ generate_syntax (const PsppireDialogAction *act) gtk_toggle_button_get_active (rd->ascending_togglebutton) ?'A':'D'); - if ( gtk_tree_model_get_iter_first (gs, ¬used) ) + if (gtk_tree_model_get_iter_first (gs, ¬used)) { g_string_append (str, "\n\tBY "); @@ -94,24 +94,24 @@ generate_syntax (const PsppireDialogAction *act) { g_string_append (str, "\n\t/FRACTION="); - if ( gtk_toggle_button_get_active (rd->blom)) + if (gtk_toggle_button_get_active (rd->blom)) g_string_append (str, "BLOM"); - else if ( gtk_toggle_button_get_active (rd->tukey)) + else if (gtk_toggle_button_get_active (rd->tukey)) g_string_append (str, "TUKEY"); - else if ( gtk_toggle_button_get_active (rd->rankit)) + else if (gtk_toggle_button_get_active (rd->rankit)) g_string_append (str, "RANKIT"); - else if ( gtk_toggle_button_get_active (rd->vw)) + else if (gtk_toggle_button_get_active (rd->vw)) g_string_append (str, "VW"); } g_string_append (str, "\n\t/TIES="); - if ( gtk_toggle_button_get_active (rd->mean)) + if (gtk_toggle_button_get_active (rd->mean)) g_string_append (str, "MEAN"); - else if ( gtk_toggle_button_get_active (rd->low)) + else if (gtk_toggle_button_get_active (rd->low)) g_string_append (str, "LOW"); - else if ( gtk_toggle_button_get_active (rd->high)) + else if (gtk_toggle_button_get_active (rd->high)) g_string_append (str, "HIGH"); - else if ( gtk_toggle_button_get_active (rd->condense)) + else if (gtk_toggle_button_get_active (rd->condense)) g_string_append (str, "CONDENSE"); @@ -155,7 +155,7 @@ types_dialog_reset (PsppireDialogActionRank *rd) { gint i; - for (i = 0 ; i < n_RANK_FUNCS ; ++i ) + for (i = 0 ; i < n_RANK_FUNCS ; ++i) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rd->func_button [i]), FALSE); @@ -212,7 +212,7 @@ psppire_dialog_action_rank_activate (PsppireDialogAction *a, GVariant *param) PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionRank *act = PSPPIRE_DIALOG_ACTION_RANK (a); - GtkBuilder *xml = builder_new ( "rank.ui"); + GtkBuilder *xml = builder_new ("rank.ui"); GtkWidget *types_button = get_widget_assert (xml, "button1"); GtkWidget *ties_button = get_widget_assert (xml, "button2"); diff --git a/src/ui/gui/psppire-dialog-action-recode-different.c b/src/ui/gui/psppire-dialog-action-recode-different.c index 251e5999e0..a1e2ce848b 100644 --- a/src/ui/gui/psppire-dialog-action-recode-different.c +++ b/src/ui/gui/psppire-dialog-action-recode-different.c @@ -42,7 +42,7 @@ difx_variable_treeview_is_populated (PsppireDialogActionRecode *rd) PsppireDialogActionRecodeDifferent *rdd = PSPPIRE_DIALOG_ACTION_RECODE_DIFFERENT (rd); GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (rd->variable_treeview)); - if (g_hash_table_size (rdd->varmap) != gtk_tree_model_iter_n_children (model, NULL) ) + if (g_hash_table_size (rdd->varmap) != gtk_tree_model_iter_n_children (model, NULL)) return FALSE; return TRUE; @@ -58,11 +58,11 @@ dialog_state_valid (gpointer data) PsppireDialogActionRecode *rd = data; GtkTreeIter not_used; - if ( ! rd->value_map ) + if (! rd->value_map) return FALSE; - if ( ! gtk_tree_model_get_iter_first (GTK_TREE_MODEL (rd->value_map), - ¬_used) ) + if (! gtk_tree_model_get_iter_first (GTK_TREE_MODEL (rd->value_map), + ¬_used)) return FALSE; @@ -122,7 +122,7 @@ nlp_create (const char *name, const char *label) nlp->label = NULL; - if ( 0 != strcmp ("", label)) + if (0 != strcmp ("", label)) nlp->label = g_strdup (label); return nlp; @@ -132,7 +132,7 @@ static void nlp_destroy (gpointer data) { struct nlp *nlp = data ; - if ( ! nlp ) + if (! nlp) return; g_free (nlp->name); @@ -161,7 +161,7 @@ render_new_var_name (GtkTreeViewColumn *tree_column, nlp = g_hash_table_lookup (rdd->varmap, var); - if ( nlp ) + if (nlp) g_object_set (cell, "text", nlp->name, NULL); else g_object_set (cell, "text", "", NULL); @@ -190,7 +190,7 @@ on_change_clicked (GObject *obj, gpointer data) const gchar *dest_var_label = gtk_entry_get_text (GTK_ENTRY (rd->new_label_entry)); - if ( NULL == rows || rows->next != NULL) + if (NULL == rows || rows->next != NULL) goto finish; gtk_tree_model_get_iter (model, &iter, rows->data); @@ -227,7 +227,7 @@ on_selection_change (GtkTreeSelection *selection, gpointer data) GList *rows = gtk_tree_selection_get_selected_rows (selection, &model); - if ( rows && !rows->next) + if (rows && !rows->next) { /* Exactly one row is selected */ struct nlp *nlp; diff --git a/src/ui/gui/psppire-dialog-action-recode-same.c b/src/ui/gui/psppire-dialog-action-recode-same.c index af10448b1b..7b48a808a7 100644 --- a/src/ui/gui/psppire-dialog-action-recode-same.c +++ b/src/ui/gui/psppire-dialog-action-recode-same.c @@ -43,7 +43,7 @@ difx_variable_treeview_is_populated (PsppireDialogActionRecode *rd) GtkTreeModel *vars = gtk_tree_view_get_model (GTK_TREE_VIEW (rd->variable_treeview)); - if ( !gtk_tree_model_get_iter_first (vars, ¬_used)) + if (!gtk_tree_model_get_iter_first (vars, ¬_used)) return FALSE; return TRUE; @@ -59,11 +59,11 @@ dialog_state_valid (gpointer data) PsppireDialogActionRecode *rd = data; GtkTreeIter not_used; - if ( ! rd->value_map ) + if (! rd->value_map) return FALSE; - if ( ! gtk_tree_model_get_iter_first (GTK_TREE_MODEL (rd->value_map), - ¬_used) ) + if (! gtk_tree_model_get_iter_first (GTK_TREE_MODEL (rd->value_map), + ¬_used)) return FALSE; return difx_variable_treeview_is_populated (rd); diff --git a/src/ui/gui/psppire-dialog-action-recode.c b/src/ui/gui/psppire-dialog-action-recode.c index 5b05284489..38bab662f9 100644 --- a/src/ui/gui/psppire-dialog-action-recode.c +++ b/src/ui/gui/psppire-dialog-action-recode.c @@ -72,7 +72,7 @@ new_value_copy (struct new_value *nv) { struct new_value *copy = g_memdup (nv, sizeof (*copy)); - if ( nv->type == NV_STRING ) + if (nv->type == NV_STRING) copy->v.s = xstrdup (nv->v.s); return copy; @@ -82,7 +82,7 @@ new_value_copy (struct new_value *nv) static void new_value_free (struct new_value *nv) { - if ( nv->type == NV_STRING ) + if (nv->type == NV_STRING) g_free (nv->v.s); g_free (nv); @@ -127,7 +127,7 @@ new_value_get_type (void) { static GType t = 0; - if (t == 0 ) + if (t == 0) { t = g_boxed_type_register_static ("psppire-recode-new-values", (GBoxedCopyFunc) new_value_copy, @@ -146,7 +146,7 @@ static void on_string_toggled (GtkToggleButton *b, PsppireDialogActionRecode *rd) { gboolean active; - if (! rd->input_var_is_string ) + if (! rd->input_var_is_string) return ; active = gtk_toggle_button_get_active (b); @@ -168,7 +168,7 @@ on_convert_toggled (GtkToggleButton *b, PsppireDialogActionRecode *rd) static void focus_value_entry (GtkWidget *w, PsppireDialogActionRecode *rd) { - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w))) gtk_widget_grab_focus (rd->new_value_entry); } @@ -180,7 +180,7 @@ set_acr (PsppireDialogActionRecode *rd) { const gchar *text; - if ( !gtk_toggle_button_get_active + if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->toggle[BUTTON_NEW_VALUE]))) { psppire_acr_set_enabled (PSPPIRE_ACR (rd->acr), TRUE); @@ -216,7 +216,7 @@ on_acr_selection_change (GtkTreeSelection *selection, gpointer data) struct old_value *ov = NULL; struct new_value *nv = NULL; - if ( ! gtk_tree_selection_get_selected (selection, &model, &iter) ) + if (! gtk_tree_selection_get_selected (selection, &model, &iter)) return; @@ -304,7 +304,7 @@ set_new_value (GValue *val, const PsppireDialogActionRecode *rd) if (PSPPIRE_DIALOG_ACTION_RECODE_CLASS (G_OBJECT_GET_CLASS (rd))->target_is_string (rd)) nv.type = NV_STRING; - if ( nv.type == NV_STRING ) + if (nv.type == NV_STRING) nv.v.s = g_strdup (text); else nv.v.v = g_strtod (text, 0); @@ -334,7 +334,7 @@ set_value (gint col, GValue *val, gpointer data) { PsppireDialogActionRecode *rd = data; - switch ( col ) + switch (col) { case COL_VALUE_OLD: set_old_value (val, rd); @@ -388,7 +388,7 @@ run_old_and_new_dialog (PsppireDialogActionRecode *rd) psppire_acr_set_model (PSPPIRE_ACR (rd->acr), NULL); - if ( response == PSPPIRE_RESPONSE_CONTINUE ) + if (response == PSPPIRE_RESPONSE_CONTINUE) { g_object_unref (rd->value_map); rd->value_map = clone_list_store (local_store); @@ -604,7 +604,7 @@ psppire_dialog_action_recode_generate_syntax (const PsppireDialogAction *act, ds_put_cstr (&dds, "\n\t"); - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->convert_button))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->convert_button))) { ds_put_cstr (&dds, "(CONVERT) "); } diff --git a/src/ui/gui/psppire-dialog-action-recode.h b/src/ui/gui/psppire-dialog-action-recode.h index 06c527e72f..1eed74a1e9 100644 --- a/src/ui/gui/psppire-dialog-action-recode.h +++ b/src/ui/gui/psppire-dialog-action-recode.h @@ -108,7 +108,7 @@ GType psppire_dialog_action_recode_get_type (void) ; void psppire_dialog_action_recode_refresh (PsppireDialogAction *); GtkBuilder * psppire_dialog_action_recode_pre_activate (PsppireDialogActionRecode *act, - void (*populate_treeview) (PsppireDialogActionRecode *) ); + void (*populate_treeview) (PsppireDialogActionRecode *)); GType new_value_get_type (void); diff --git a/src/ui/gui/psppire-dialog-action-regression.c b/src/ui/gui/psppire-dialog-action-regression.c index fd92f93c5b..78aafc5775 100644 --- a/src/ui/gui/psppire-dialog-action-regression.c +++ b/src/ui/gui/psppire-dialog-action-regression.c @@ -109,7 +109,7 @@ on_statistics_clicked (PsppireDialogActionRegression *rd) ret = psppire_dialog_run (PSPPIRE_DIALOG (rd->stat_dialog)); - if ( ret != PSPPIRE_RESPONSE_CONTINUE ) + if (ret != PSPPIRE_RESPONSE_CONTINUE) { /* If the user chose to abandon his changes, then replace the model, from the backup */ gtk_tree_view_set_model (GTK_TREE_VIEW (rd->stat_view) , GTK_TREE_MODEL (backup_model)); @@ -132,7 +132,7 @@ on_save_clicked (PsppireDialogActionRegression *rd) ret = psppire_dialog_run (PSPPIRE_DIALOG (rd->save_dialog)); - if ( ret == PSPPIRE_RESPONSE_CONTINUE ) + if (ret == PSPPIRE_RESPONSE_CONTINUE) { rd->pred = (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->pred_button)) == TRUE) ? TRUE : FALSE; @@ -148,7 +148,7 @@ psppire_dialog_action_regression_activate (PsppireDialogAction *a, GVariant *par PsppireDialogActionRegression *act = PSPPIRE_DIALOG_ACTION_REGRESSION (a); PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); - GtkBuilder *xml = builder_new ( "regression.ui"); + GtkBuilder *xml = builder_new ("regression.ui"); GtkWidget *stat_button = get_widget_assert (xml, "stat-button"); GtkWidget *save_button = get_widget_assert (xml, "save-button"); diff --git a/src/ui/gui/psppire-dialog-action-reliability.c b/src/ui/gui/psppire-dialog-action-reliability.c index 9082025f7d..4bb78f9e1e 100644 --- a/src/ui/gui/psppire-dialog-action-reliability.c +++ b/src/ui/gui/psppire-dialog-action-reliability.c @@ -48,14 +48,14 @@ generate_syntax (const PsppireDialogAction *act) g_string_append (string, "\n\t/MODEL="); - if ( ALPHA == gtk_combo_box_get_active (GTK_COMBO_BOX (rd->model_combo))) + if (ALPHA == gtk_combo_box_get_active (GTK_COMBO_BOX (rd->model_combo))) g_string_append (string, "ALPHA"); else g_string_append_printf (string, "SPLIT (%d)", gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (rd->split_spinbutton)) - ); + ); - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->scale_if_item_deleted_checkbutton))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->scale_if_item_deleted_checkbutton))) g_string_append (string, "\n\t/SUMMARY = TOTAL"); g_string_append (string, ".\n"); @@ -95,7 +95,7 @@ update_split_control (PsppireDialogActionReliability *pda) 0, n_vars - 1); gtk_widget_set_sensitive (pda->split_point_hbox, - ( SPLIT == gtk_combo_box_get_active (GTK_COMBO_BOX (pda->model_combo)))); + (SPLIT == gtk_combo_box_get_active (GTK_COMBO_BOX (pda->model_combo)))); } @@ -126,7 +126,7 @@ psppire_dialog_action_reliability_activate (PsppireDialogAction *a, GVariant *pa PsppireDialogActionReliability *act = PSPPIRE_DIALOG_ACTION_RELIABILITY (a); GtkTreeModel *liststore ; - GtkBuilder *xml = builder_new ( "reliability.ui"); + GtkBuilder *xml = builder_new ("reliability.ui"); pda->dialog = get_widget_assert (xml, "reliability-dialog"); pda->source = get_widget_assert (xml, "dict-view"); diff --git a/src/ui/gui/psppire-dialog-action-roc.c b/src/ui/gui/psppire-dialog-action-roc.c index 448d44f2b4..16f03da1ab 100644 --- a/src/ui/gui/psppire-dialog-action-roc.c +++ b/src/ui/gui/psppire-dialog-action-roc.c @@ -55,7 +55,7 @@ dialog_state_valid (gpointer data) var = psppire_dict_lookup_var (PSPPIRE_DIALOG_ACTION (rd)->dict, var_name); - if ( var == NULL) + if (var == NULL) return FALSE; width = var_get_width (var); @@ -74,9 +74,9 @@ dialog_state_valid (gpointer data) static void on_curve_button_toggle (GtkCheckButton *curve, PsppireDialogActionRoc *rd) { - if ( !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (curve))) + if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (curve))) { - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->reference))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->reference))) g_object_set (rd->reference, "inconsistent", TRUE, NULL); g_object_set (rd->reference, "sensitive", FALSE, NULL); } @@ -114,7 +114,7 @@ on_state_var_changed (PsppireDialogAction *a) const struct variable *var = psppire_dict_lookup_var (PSPPIRE_DIALOG_ACTION(act)->dict, var_name); - if ( var == NULL) + if (var == NULL) return; psppire_value_entry_set_variable (PSPPIRE_VALUE_ENTRY (act->state_value), var); @@ -126,7 +126,7 @@ psppire_dialog_action_roc_activate (PsppireDialogAction *a, GVariant *param) PsppireDialogActionRoc *act = PSPPIRE_DIALOG_ACTION_ROC (a); PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); - GtkBuilder *xml = builder_new ( "roc.ui"); + GtkBuilder *xml = builder_new ("roc.ui"); pda->dialog = get_widget_assert (xml, "roc-dialog"); pda->source = get_widget_assert (xml, "dict-view"); @@ -200,10 +200,10 @@ generate_syntax (const PsppireDialogAction *a) /* The /PLOT subcommand */ g_string_append (string, "\n\t/PLOT "); - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->curve))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->curve))) { g_string_append (string, "CURVE"); - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->reference))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->reference))) g_string_append (string, " (REFERENCE)"); } else @@ -211,15 +211,15 @@ generate_syntax (const PsppireDialogAction *a) /* The /PRINT subcommand */ - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->standard_error)) || - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->coordinates)) ) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->standard_error)) || + gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->coordinates))) { g_string_append (string, "\n\t/PRINT"); - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->standard_error))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->standard_error))) g_string_append (string, " SE"); - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->coordinates))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->coordinates))) g_string_append (string, " COORDINATES"); } diff --git a/src/ui/gui/psppire-dialog-action-runs.c b/src/ui/gui/psppire-dialog-action-runs.c index 40afd8e762..087618e599 100644 --- a/src/ui/gui/psppire-dialog-action-runs.c +++ b/src/ui/gui/psppire-dialog-action-runs.c @@ -43,9 +43,9 @@ append_fragment (GString *string, const gchar *cut, PsppireVarView *vv) { g_string_append (string, "\n\t/RUNS"); - g_string_append (string, " ( "); + g_string_append (string, " ("); g_string_append (string, cut); - g_string_append (string, " ) = "); + g_string_append (string, ") = "); psppire_var_view_append_names (vv, 0, string); } @@ -58,16 +58,16 @@ generate_syntax (const PsppireDialogAction *act) GString *string = g_string_new ("NPAR TEST"); - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_MEAN]))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_MEAN]))) append_fragment (string, "MEAN", PSPPIRE_VAR_VIEW (rd->variables)); - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_MEDIAN]))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_MEDIAN]))) append_fragment (string, "MEDIAN", PSPPIRE_VAR_VIEW (rd->variables)); - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_MODE]))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_MODE]))) append_fragment (string, "MODE", PSPPIRE_VAR_VIEW (rd->variables)); - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_CUSTOM]))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->cb[CB_CUSTOM]))) { const char *text = gtk_entry_get_text (GTK_ENTRY (rd->entry)); append_fragment (string, text, PSPPIRE_VAR_VIEW (rd->variables)); @@ -96,10 +96,10 @@ dialog_state_valid (gpointer data) for (i = 0; i < 4; ++i) { - if ( TRUE == gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (fd->cb[i]))) + if (TRUE == gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (fd->cb[i]))) break; } - if ( i >= 4) + if (i >= 4) return FALSE; @@ -133,7 +133,7 @@ psppire_dialog_action_runs_activate (PsppireDialogAction *a, GVariant *param) PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionRuns *act = PSPPIRE_DIALOG_ACTION_RUNS (a); - GtkBuilder *xml = builder_new ( "runs.ui"); + GtkBuilder *xml = builder_new ("runs.ui"); pda->dialog = get_widget_assert (xml, "runs-dialog"); pda->source = get_widget_assert (xml, "dict-view"); diff --git a/src/ui/gui/psppire-dialog-action-scatterplot.c b/src/ui/gui/psppire-dialog-action-scatterplot.c index 041c857b73..9b4dd08570 100644 --- a/src/ui/gui/psppire-dialog-action-scatterplot.c +++ b/src/ui/gui/psppire-dialog-action-scatterplot.c @@ -69,10 +69,10 @@ dialog_state_valid (gpointer data) const char *xvar = gtk_entry_get_text (GTK_ENTRY (ow->x_axis)); const char *yvar = gtk_entry_get_text (GTK_ENTRY (ow->y_axis)); - if ( 0 == strcmp ("", xvar)) + if (0 == strcmp ("", xvar)) return FALSE; - if ( 0 == strcmp ("", yvar)) + if (0 == strcmp ("", yvar)) return FALSE; @@ -96,7 +96,7 @@ psppire_dialog_action_scatterplot_activate (PsppireDialogAction *a, GVariant *pa PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionScatterplot *act = PSPPIRE_DIALOG_ACTION_SCATTERPLOT (a); - GtkBuilder *xml = builder_new ( "scatterplot.ui"); + GtkBuilder *xml = builder_new ("scatterplot.ui"); pda->dialog = get_widget_assert (xml, "scatterplot-dialog"); pda->source = get_widget_assert (xml, "scatterplot-treeview1"); diff --git a/src/ui/gui/psppire-dialog-action-select.c b/src/ui/gui/psppire-dialog-action-select.c index 538087934f..5176743023 100644 --- a/src/ui/gui/psppire-dialog-action-select.c +++ b/src/ui/gui/psppire-dialog-action-select.c @@ -172,7 +172,7 @@ sample_subdialog (GtkButton *b, gpointer data) response = psppire_dialog_run (PSPPIRE_DIALOG (scd->rsample_dialog)); - if ( response != PSPPIRE_RESPONSE_CONTINUE) + if (response != PSPPIRE_RESPONSE_CONTINUE) { g_signal_handlers_disconnect_by_func (G_OBJECT (scd->percent), @@ -192,7 +192,7 @@ sample_subdialog (GtkButton *b, gpointer data) { gchar *text; - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (scd->percent))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (scd->percent))) { text = widget_printf (gettext(label1), scd->spinbutton); gtk_label_set_text (GTK_LABEL (scd->l0), text); @@ -231,7 +231,7 @@ range_subdialog (GtkButton *b, gpointer data) GTK_WINDOW (pda->dialog)); response = psppire_dialog_run (PSPPIRE_DIALOG (scd->range_subdialog)); - if ( response == PSPPIRE_RESPONSE_CONTINUE) + if (response == PSPPIRE_RESPONSE_CONTINUE) { gchar *text = widget_printf (_("%d thru %d"), scd->first, scd->last); gtk_label_set_text (GTK_LABEL (scd->l1), text); @@ -261,7 +261,7 @@ psppire_dialog_action_select_activate (PsppireDialogAction *a, GVariant *param) PsppireDialogActionSelect *act = PSPPIRE_DIALOG_ACTION_SELECT (a); PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); - GtkBuilder *xml = builder_new ( "select-cases.ui"); + GtkBuilder *xml = builder_new ("select-cases.ui"); pda->dialog = get_widget_assert (xml, "select-cases-dialog"); pda->source = get_widget_assert (xml, "select-cases-treeview"); @@ -379,10 +379,10 @@ generate_syntax_filter (const PsppireDialogAction *a) ds_put_cstr (&dss, "EXECUTE.\n"); } - else if ( gtk_toggle_button_get_active + else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (scd->radiobutton_sample))) { - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (scd->percent))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (scd->percent))) { const double percentage = gtk_spin_button_get_value (GTK_SPIN_BUTTON (scd->spinbutton)); @@ -390,7 +390,7 @@ generate_syntax_filter (const PsppireDialogAction *a) ds_put_c_format (&dss, "COMPUTE %s = RV.UNIFORM (0,1) < %.*g.\n", filter, - DBL_DIG + 1, percentage / 100.0 ); + DBL_DIG + 1, percentage / 100.0); } else { @@ -422,13 +422,13 @@ generate_syntax_filter (const PsppireDialogAction *a) ds_put_c_format (&dss, "COMPUTE %s = $CASENUM.\n", - filter ); + filter); ds_put_c_format (&dss, "COMPUTE %s = %s <= %d\n", filter, filter, - n_cases ); + n_cases); ds_put_cstr (&dss, "EXECUTE.\n"); @@ -466,7 +466,7 @@ generate_syntax_delete (const PsppireDialogAction *a) gchar *text = NULL; struct string dss; - if ( gtk_toggle_button_get_active + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (scd->radiobutton_all))) { return xstrdup ("\n"); @@ -474,12 +474,12 @@ generate_syntax_delete (const PsppireDialogAction *a) ds_init_empty (&dss); - if ( gtk_toggle_button_get_active + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (scd->radiobutton_sample))) { ds_put_cstr (&dss, "SAMPLE "); - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (scd->percent))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (scd->percent))) { const double percentage = gtk_spin_button_get_value (GTK_SPIN_BUTTON (scd->spinbutton)); @@ -496,7 +496,7 @@ generate_syntax_delete (const PsppireDialogAction *a) } } - else if ( gtk_toggle_button_get_active + else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (scd->radiobutton_range))) { ds_put_c_format (&dss, @@ -532,13 +532,13 @@ generate_syntax (const PsppireDialogAction *a) PsppireDialogActionSelect *scd = PSPPIRE_DIALOG_ACTION_SELECT (a); /* In the simple case, all we need to do is cancel any existing filter */ - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (scd->radiobutton_all))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (scd->radiobutton_all))) { return g_strdup ("FILTER OFF.\n"); } /* Are we filtering or deleting ? */ - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (scd->radiobutton_delete))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (scd->radiobutton_delete))) { return generate_syntax_delete (a); } diff --git a/src/ui/gui/psppire-dialog-action-sort.c b/src/ui/gui/psppire-dialog-action-sort.c index f59cc42589..7dfb0b278c 100644 --- a/src/ui/gui/psppire-dialog-action-sort.c +++ b/src/ui/gui/psppire-dialog-action-sort.c @@ -39,7 +39,7 @@ generate_syntax (const PsppireDialogAction *act) PsppireVarView *var_view = PSPPIRE_VAR_VIEW (scd->variables); gint n_vars = psppire_var_view_append_names (var_view, 0, string); - if ( n_vars == 0 ) + if (n_vars == 0) { g_string_assign (string, ""); } @@ -82,7 +82,7 @@ dialog_state_valid (gpointer act) gint n_rows = gtk_tree_model_iter_n_children (model, NULL); - if ( n_rows == 0 ) + if (n_rows == 0) return FALSE; return TRUE; @@ -95,7 +95,7 @@ psppire_dialog_action_sort_activate (PsppireDialogAction *a, GVariant *param) PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionSort *act = PSPPIRE_DIALOG_ACTION_SORT (a); - GtkBuilder *xml = builder_new ( "sort.ui"); + GtkBuilder *xml = builder_new ("sort.ui"); pda->dialog = get_widget_assert (xml, "sort-cases-dialog"); pda->source = get_widget_assert (xml, "sort-cases-treeview1"); diff --git a/src/ui/gui/psppire-dialog-action-split.c b/src/ui/gui/psppire-dialog-action-split.c index 5a0026e213..b29d2b27da 100644 --- a/src/ui/gui/psppire-dialog-action-split.c +++ b/src/ui/gui/psppire-dialog-action-split.c @@ -43,16 +43,16 @@ generate_syntax (const PsppireDialogAction *pda) GString *string = g_string_new ("SPLIT FILE OFF."); - if ( ! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (act->off))) + if (! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (act->off))) { GString * varlist = g_string_sized_new (80); gint n_vars = psppire_var_view_append_names (PSPPIRE_VAR_VIEW (act->tv), 0, varlist); - if ( n_vars > 0 ) + if (n_vars > 0) { g_string_assign (string, ""); - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(act->sort))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(act->sort))) { g_string_append (string, "SORT CASES BY"); g_string_append (string, varlist->str); @@ -61,7 +61,7 @@ generate_syntax (const PsppireDialogAction *pda) g_string_append (string, "SPLIT FILE "); - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (act->layered))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (act->layered))) g_string_append (string, "LAYERED "); else g_string_append (string, "SEPARATE "); @@ -98,7 +98,7 @@ refresh (PsppireDialogAction *pda) gtk_list_store_clear (GTK_LIST_STORE (liststore)); - if ( n_vars == 0 ) + if (n_vars == 0) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (act->off), TRUE); else { @@ -106,7 +106,7 @@ refresh (PsppireDialogAction *pda) gint i; const struct variable *const *vars = dict_get_split_vars (pda->dict->dict); - for (i = 0 ; i < n_vars; ++i ) + for (i = 0 ; i < n_vars; ++i) { gtk_list_store_append (GTK_LIST_STORE (liststore), &iter); @@ -141,7 +141,7 @@ psppire_dialog_action_split_activate (PsppireDialogAction *pda, GVariant *param) { PsppireDialogActionSplit *act = PSPPIRE_DIALOG_ACTION_SPLIT (pda); - GtkBuilder *xml = builder_new ( "split-file.ui"); + GtkBuilder *xml = builder_new ("split-file.ui"); pda->dialog = get_widget_assert (xml, "split-file-dialog"); pda->source = get_widget_assert (xml, "split-file-dict-treeview"); diff --git a/src/ui/gui/psppire-dialog-action-tt1s.c b/src/ui/gui/psppire-dialog-action-tt1s.c index 9fa30913e1..5dd36a65dc 100644 --- a/src/ui/gui/psppire-dialog-action-tt1s.c +++ b/src/ui/gui/psppire-dialog-action-tt1s.c @@ -73,7 +73,7 @@ dialog_state_valid (gpointer data) text = gtk_entry_get_text (GTK_ENTRY (tt_d->test_value_entry)); - if ( 0 == strcmp ("", text)) + if (0 == strcmp ("", text)) return FALSE; /* Check to see if the entry is numeric */ @@ -83,7 +83,7 @@ dialog_state_valid (gpointer data) return FALSE; - if ( 0 == gtk_tree_model_get_iter_first (vars, ¬used)) + if (0 == gtk_tree_model_get_iter_first (vars, ¬used)) return FALSE; return TRUE; @@ -108,7 +108,7 @@ psppire_dialog_action_tt1s_activate (PsppireDialogAction *a, GVariant *param) PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionTt1s *act = PSPPIRE_DIALOG_ACTION_TT1S (a); - GtkBuilder *xml = builder_new ( "t-test.ui"); + GtkBuilder *xml = builder_new ("t-test.ui"); GtkWidget *options_button = get_widget_assert (xml, "button1"); pda->dialog = get_widget_assert (xml, "t-test-one-sample-dialog"); diff --git a/src/ui/gui/psppire-dialog-action-two-sample.c b/src/ui/gui/psppire-dialog-action-two-sample.c index 2ad9b5ce13..0a2908f944 100644 --- a/src/ui/gui/psppire-dialog-action-two-sample.c +++ b/src/ui/gui/psppire-dialog-action-two-sample.c @@ -44,7 +44,7 @@ dialog_state_valid (gpointer data) struct variable *v = NULL; GtkTreeIter dest_iter; - if ( n_rows == 0 ) + if (n_rows == 0) return FALSE; /* Get the last row */ @@ -103,7 +103,7 @@ select_as_pair_member (GtkTreeIter source_iter, n_rows = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (tt_d->list_store), NULL); - if ( n_rows > 0 ) + if (n_rows > 0) { gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (tt_d->list_store), @@ -114,7 +114,7 @@ select_as_pair_member (GtkTreeIter source_iter, else v1 = NULL; - if ( n_rows == 0 || v1 != NULL) + if (n_rows == 0 || v1 != NULL) { gtk_list_store_append (tt_d->list_store, &dest_iter); @@ -174,7 +174,7 @@ psppire_dialog_action_two_sample_activate (PsppireDialogAction *a, GVariant *par PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionTwoSample *act = PSPPIRE_DIALOG_ACTION_TWO_SAMPLE (a); - GtkBuilder *xml = builder_new ( "paired-samples.ui"); + GtkBuilder *xml = builder_new ("paired-samples.ui"); /* NPAR Specific options */ GtkWidget *frame = gtk_frame_new (_("Test Type")); diff --git a/src/ui/gui/psppire-dialog-action-univariate.c b/src/ui/gui/psppire-dialog-action-univariate.c index 1e998105c7..3d81c7a140 100644 --- a/src/ui/gui/psppire-dialog-action-univariate.c +++ b/src/ui/gui/psppire-dialog-action-univariate.c @@ -60,7 +60,7 @@ dialog_state_valid (gpointer data) GtkTreeModel *vars; GtkTreeIter notused; - if ( 0 == strcmp ("", gtk_entry_get_text (GTK_ENTRY (ud->dep_entry)))) + if (0 == strcmp ("", gtk_entry_get_text (GTK_ENTRY (ud->dep_entry)))) return false; vars = @@ -88,7 +88,7 @@ psppire_dialog_action_univariate_activate (PsppireDialogAction *a, GVariant *par PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionUnivariate *act = PSPPIRE_DIALOG_ACTION_UNIVARIATE (a); - GtkBuilder *xml = builder_new ( "univariate.ui"); + GtkBuilder *xml = builder_new ("univariate.ui"); pda->dialog = get_widget_assert (xml, "univariate-dialog"); pda->source = get_widget_assert (xml, "dict-view"); diff --git a/src/ui/gui/psppire-dialog-action-var-info.c b/src/ui/gui/psppire-dialog-action-var-info.c index 9c7d4fd3e2..0c5aebb304 100644 --- a/src/ui/gui/psppire-dialog-action-var-info.c +++ b/src/ui/gui/psppire-dialog-action-var-info.c @@ -171,7 +171,7 @@ psppire_dialog_action_var_info_activate (PsppireDialogAction *a, GVariant *param PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionVarInfo *act = PSPPIRE_DIALOG_ACTION_VAR_INFO (pda); - GtkBuilder *xml = builder_new ( "variable-info.ui"); + GtkBuilder *xml = builder_new ("variable-info.ui"); act->output = psppire_output_view_new (GTK_LAYOUT (get_widget_assert (xml, "layout1")), diff --git a/src/ui/gui/psppire-dialog-action-weight.c b/src/ui/gui/psppire-dialog-action-weight.c index 280d3c3c48..a96acc9834 100644 --- a/src/ui/gui/psppire-dialog-action-weight.c +++ b/src/ui/gui/psppire-dialog-action-weight.c @@ -45,7 +45,7 @@ generate_syntax (const PsppireDialogAction *pda) const struct variable *var = psppire_dict_lookup_var (pda->dict, text); - if ( var == NULL) + if (var == NULL) syntax = g_strdup ("WEIGHT OFF.\n"); else syntax = g_strdup_printf ("WEIGHT BY %s.\n", @@ -68,7 +68,7 @@ refresh (PsppireDialogAction *pda) const struct variable *var = dict_get_weight (pda->dict->dict); - if ( ! var ) + if (! var) { gtk_entry_set_text (GTK_ENTRY (wcd->entry), ""); gtk_label_set_text (GTK_LABEL (wcd->status), _("Do not weight cases")); @@ -124,7 +124,7 @@ psppire_dialog_action_weight_activate (PsppireDialogAction *pda, GVariant *param { PsppireDialogActionWeight *act = PSPPIRE_DIALOG_ACTION_WEIGHT (pda); - GtkBuilder *xml = builder_new ( "weight.ui"); + GtkBuilder *xml = builder_new ("weight.ui"); pda->dialog = get_widget_assert (xml, "weight-cases-dialog"); pda->source = get_widget_assert (xml, "weight-cases-treeview"); diff --git a/src/ui/gui/psppire-dialog-action.c b/src/ui/gui/psppire-dialog-action.c index f2266cc535..c65162379c 100644 --- a/src/ui/gui/psppire-dialog-action.c +++ b/src/ui/gui/psppire-dialog-action.c @@ -274,7 +274,7 @@ psppire_dialog_action_activate (PsppireDialogAction *act, GVariant *parameter) response = psppire_dialog_run (PSPPIRE_DIALOG (act->dialog)); - if ( class->generate_syntax ) + if (class->generate_syntax) { switch (response) { diff --git a/src/ui/gui/psppire-dialog.c b/src/ui/gui/psppire-dialog.c index 4fcda9a0b6..c7b8d048ad 100644 --- a/src/ui/gui/psppire-dialog.c +++ b/src/ui/gui/psppire-dialog.c @@ -287,7 +287,7 @@ psppire_dialog_new (void) void psppire_dialog_notify_change (PsppireDialog *dialog) { - if ( dialog->contents_are_valid ) + if (dialog->contents_are_valid) { gboolean valid = dialog->contents_are_valid (dialog->validity_data); @@ -303,10 +303,10 @@ connect_notify_signal (GtkWidget *w, gpointer data) { PsppireDialog *dialog = data; - if ( PSPPIRE_IS_BUTTONBOX (w)) + if (PSPPIRE_IS_BUTTONBOX (w)) return; - if ( GTK_IS_CONTAINER (w)) + if (GTK_IS_CONTAINER (w)) { gtk_container_foreach (GTK_CONTAINER (w), connect_notify_signal, @@ -318,14 +318,14 @@ connect_notify_signal (GtkWidget *w, gpointer data) "user-modified-state-changed" signal. Instead, we have to try and predict what widgets and signals are likely to exist in our dialogs. */ - if ( GTK_IS_TOGGLE_BUTTON (w)) + if (GTK_IS_TOGGLE_BUTTON (w)) { g_signal_connect_swapped (w, "toggled", G_CALLBACK (psppire_dialog_notify_change), dialog); } - if ( PSPPIRE_IS_SELECTOR (w)) + if (PSPPIRE_IS_SELECTOR (w)) { g_signal_connect_swapped (w, "selected", G_CALLBACK (psppire_dialog_notify_change), @@ -338,21 +338,21 @@ connect_notify_signal (GtkWidget *w, gpointer data) psppire_selector_update_subjects (PSPPIRE_SELECTOR (w)); } - if ( GTK_IS_EDITABLE (w)) + if (GTK_IS_EDITABLE (w)) { g_signal_connect_swapped (w, "changed", G_CALLBACK (psppire_dialog_notify_change), dialog); } - if ( GTK_IS_CELL_EDITABLE (w)) + if (GTK_IS_CELL_EDITABLE (w)) { g_signal_connect_swapped (w, "editing-done", G_CALLBACK (psppire_dialog_notify_change), dialog); } - if ( GTK_IS_TEXT_VIEW (w)) + if (GTK_IS_TEXT_VIEW (w)) { GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (w)); @@ -361,7 +361,7 @@ connect_notify_signal (GtkWidget *w, gpointer data) dialog); } - if ( GTK_IS_TREE_VIEW (w)) + if (GTK_IS_TREE_VIEW (w)) { gint i = 0; GtkTreeView *tv = GTK_TREE_VIEW (w); @@ -370,7 +370,7 @@ connect_notify_signal (GtkWidget *w, gpointer data) GtkTreeViewColumn *col; GtkTreeModel *model = gtk_tree_view_get_model (tv); - if ( model) + if (model) { g_signal_connect_swapped (model, "row-changed", G_CALLBACK (psppire_dialog_notify_change), @@ -396,7 +396,7 @@ connect_notify_signal (GtkWidget *w, gpointer data) GList *start = renderers; while (renderers) { - if ( GTK_IS_CELL_RENDERER_TOGGLE (renderers->data)) + if (GTK_IS_CELL_RENDERER_TOGGLE (renderers->data)) g_signal_connect_swapped (renderers->data, "toggled", G_CALLBACK (psppire_dialog_notify_change), dialog); renderers = renderers->next; @@ -416,7 +416,7 @@ psppire_dialog_run (PsppireDialog *dialog) if (title == NULL) g_warning ("PsppireDialog %s has no title", gtk_widget_get_name (GTK_WIDGET (dialog))); - if ( dialog->contents_are_valid != NULL ) + if (dialog->contents_are_valid != NULL) gtk_container_foreach (GTK_CONTAINER (gtk_bin_get_child(GTK_BIN(dialog))), connect_notify_signal, dialog); diff --git a/src/ui/gui/psppire-dialog.h b/src/ui/gui/psppire-dialog.h index 29381261bf..0066dc1976 100644 --- a/src/ui/gui/psppire-dialog.h +++ b/src/ui/gui/psppire-dialog.h @@ -74,10 +74,10 @@ void psppire_dialog_close (PsppireDialog *); gint psppire_dialog_run (PsppireDialog *); void psppire_dialog_set_valid_predicate (PsppireDialog *, ContentsAreValid, - gpointer ); + gpointer); void psppire_dialog_set_accept_predicate (PsppireDialog *, ContentsAreValid, - gpointer ); + gpointer); gboolean psppire_dialog_is_acceptable (const PsppireDialog *); void psppire_dialog_notify_change (PsppireDialog *); diff --git a/src/ui/gui/psppire-dict.c b/src/ui/gui/psppire-dict.c index 9c3c38fa5a..640598e716 100644 --- a/src/ui/gui/psppire-dict.c +++ b/src/ui/gui/psppire-dict.c @@ -300,7 +300,7 @@ addcb (struct dictionary *d, int idx, void *pd) { PsppireDict *dict = PSPPIRE_DICT (pd); - if ( ! dict->disable_insert_signal) + if (! dict->disable_insert_signal) { g_signal_emit (dict, signals [VARIABLE_INSERTED], 0, idx); g_signal_emit_by_name (dict, "items-changed", idx, 1, 1); @@ -494,10 +494,10 @@ psppire_dict_set_name (PsppireDict* d, gint idx, const gchar *name) g_assert (d); g_assert (PSPPIRE_IS_DICT (d)); - if ( ! dict_id_is_valid (d->dict, name, false)) + if (! dict_id_is_valid (d->dict, name, false)) return FALSE; - if ( idx < dict_get_var_cnt (d->dict)) + if (idx < dict_get_var_cnt (d->dict)) { /* This is an existing variable? */ var = dict_get_var (d->dict, idx); @@ -523,7 +523,7 @@ psppire_dict_get_variable (const PsppireDict *d, gint idx) g_return_val_if_fail (d, NULL); g_return_val_if_fail (d->dict, NULL); - if ( dict_get_var_cnt (d->dict) <= idx ) + if (dict_get_var_cnt (d->dict) <= idx) return NULL; return dict_get_var (d->dict, idx); @@ -596,12 +596,12 @@ gboolean psppire_dict_check_name (const PsppireDict *dict, const gchar *name, gboolean report) { - if ( ! dict_id_is_valid (dict->dict, name, report ) ) + if (! dict_id_is_valid (dict->dict, name, report)) return FALSE; if (psppire_dict_lookup_var (dict, name)) { - if ( report ) + if (report) msg (ME, _("Duplicate variable name.")); return FALSE; } @@ -754,7 +754,7 @@ tree_model_get_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreePath *path) n = indices [0]; - if ( n < 0 || n >= psppire_dict_get_var_cnt (dict)) + if (n < 0 || n >= psppire_dict_get_var_cnt (dict)) { iter->stamp = 0; iter->user_data = NULL; @@ -779,7 +779,7 @@ tree_model_iter_next (GtkTreeModel *model, GtkTreeIter *iter) struct variable *var; gint idx; - if ( iter == NULL || iter->user_data == NULL) + if (iter == NULL || iter->user_data == NULL) return FALSE; g_return_val_if_fail (iter->stamp == dict->stamp, FALSE); @@ -788,7 +788,7 @@ tree_model_iter_next (GtkTreeModel *model, GtkTreeIter *iter) idx = var_get_dict_index (var); - if ( idx + 1 >= psppire_dict_get_var_cnt (dict)) + if (idx + 1 >= psppire_dict_get_var_cnt (dict)) { iter->user_data = NULL; iter->stamp = 0; @@ -911,16 +911,16 @@ tree_model_nth_child (GtkTreeModel *model, GtkTreeIter *iter, dict = PSPPIRE_DICT (model); - if ( parent ) + if (parent) return FALSE; - if ( n >= psppire_dict_get_var_cnt (dict) ) + if (n >= psppire_dict_get_var_cnt (dict)) return FALSE; iter->stamp = dict->stamp; iter->user_data = psppire_dict_get_variable (dict, n); - if ( !iter->user_data) + if (!iter->user_data) return FALSE; return TRUE; @@ -931,11 +931,11 @@ gboolean psppire_dict_rename_var (PsppireDict *dict, struct variable *v, const gchar *name) { - if ( ! dict_id_is_valid (dict->dict, name, false)) + if (! dict_id_is_valid (dict->dict, name, false)) return FALSE; /* Make sure no other variable has this name */ - if ( NULL != psppire_dict_lookup_var (dict, name)) + if (NULL != psppire_dict_lookup_var (dict, name)) return FALSE; dict_rename_var (dict->dict, v, name); diff --git a/src/ui/gui/psppire-dictview.c b/src/ui/gui/psppire-dictview.c index fc2c032561..a42b80d5bc 100644 --- a/src/ui/gui/psppire-dictview.c +++ b/src/ui/gui/psppire-dictview.c @@ -189,7 +189,7 @@ set_model (PsppireDictView *dict_view) { GtkTreeModel *model = NULL; - if ( dict_view->dict == NULL) + if (dict_view->dict == NULL) return; dict_view->sorted_model = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (dict_view->dict)); @@ -197,7 +197,7 @@ set_model (PsppireDictView *dict_view) gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (dict_view->sorted_model), GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, GTK_SORT_ASCENDING); - if ( dict_view->predicate ) + if (dict_view->predicate) { model = gtk_tree_model_filter_new (dict_view->sorted_model, NULL); @@ -491,7 +491,7 @@ set_tooltip_for_variable (GtkTreeView *treeview, gtk_tree_model_get (tree_model, &iter, DICT_TVM_COL_VAR, &var, -1); - if ( ! var_has_label (var)) + if (! var_has_label (var)) return FALSE; { @@ -500,7 +500,7 @@ set_tooltip_for_variable (GtkTreeView *treeview, get_base_model (tree_model, NULL, &m, NULL); - if ( use_labels (PSPPIRE_DICT_VIEW (treeview))) + if (use_labels (PSPPIRE_DICT_VIEW (treeview))) tip = var_get_name (var); else tip = var_get_label (var); diff --git a/src/ui/gui/psppire-keypad.c b/src/ui/gui/psppire-keypad.c index f3b1df39c0..417d6a99c3 100644 --- a/src/ui/gui/psppire-keypad.c +++ b/src/ui/gui/psppire-keypad.c @@ -139,7 +139,7 @@ button_click (GtkButton *b, PsppireKeypad *kp) const gchar *s = g_hash_table_lookup (kp->frag_table, b); - if ( s ) + if (s) g_signal_emit (kp, keypad_signals [INSERT_SYNTAX], 0, s); else g_signal_emit (kp, keypad_signals [ERASE], 0); @@ -166,7 +166,7 @@ add_button (PsppireKeypad *kp, GtkWidget **button, 30 * cols / (float) rows); g_hash_table_insert (kp->frag_table, *button, - (void *) keypad_insert_text[(button - &kp->digit[0])] ); + (void *) keypad_insert_text[(button - &kp->digit[0])]); g_signal_connect (*button, "clicked", G_CALLBACK (button_click), kp); @@ -211,7 +211,7 @@ key_release_callback (GtkWidget *widget, GdkEventKey *event, gpointer user_data) { - if ( ! gtk_widget_has_focus (widget)) + if (! gtk_widget_has_focus (widget)) return FALSE; switch (event->keyval) @@ -332,7 +332,7 @@ psppire_keypad_init (PsppireKeypad *kp) g_snprintf (buf, 5, "%d", i); kp->digit[i] = gtk_button_new_with_label (buf); - if ( i == 0 ) + if (i == 0) add_button (kp, &kp->digit[i], digit_hoffset + 0, digit_hoffset + 2, digit_voffset + 3, digit_voffset + 4); diff --git a/src/ui/gui/psppire-keypad.h b/src/ui/gui/psppire-keypad.h index 0e6fa8e5b9..a128ddd149 100644 --- a/src/ui/gui/psppire-keypad.h +++ b/src/ui/gui/psppire-keypad.h @@ -31,7 +31,7 @@ | | | / >= 0 . | + + - | y != = ( ) | + | y != = () | |x | +---+---+---+---+---+ diff --git a/src/ui/gui/psppire-lex-reader.c b/src/ui/gui/psppire-lex-reader.c index 6a87e0a6ab..dac318a838 100644 --- a/src/ui/gui/psppire-lex-reader.c +++ b/src/ui/gui/psppire-lex-reader.c @@ -93,7 +93,7 @@ lex_gtk_text_buffer_read (struct lex_reader *r_, char *buf, size_t n, int offset = gtk_text_iter_get_offset (&iter); int end_offset = gtk_text_iter_get_offset (&r->stop); - if ( end_offset - offset < n) + if (end_offset - offset < n) n_chars = end_offset - offset; gtk_text_iter_set_offset (&iter, offset + n_chars); diff --git a/src/ui/gui/psppire-output-view.c b/src/ui/gui/psppire-output-view.c index b7d2c2074c..ff71057309 100644 --- a/src/ui/gui/psppire-output-view.c +++ b/src/ui/gui/psppire-output-view.c @@ -534,7 +534,7 @@ clipboard_get_cb (GtkClipboard *clipboard, GList *rows = gtk_tree_selection_get_selected_rows (sel, &model); GList *n = rows; - if ( n == NULL) + if (n == NULL) return; if (path_search (dirname, sizeof dirname, NULL, NULL, true) @@ -592,7 +592,7 @@ clipboard_get_cb (GtkClipboard *clipboard, n = n->next; } - if ( driver->class->flush) + if (driver->class->flush) driver->class->flush (driver); @@ -601,7 +601,7 @@ clipboard_get_cb (GtkClipboard *clipboard, output_driver_destroy (driver); driver = NULL; - if ( g_file_get_contents (filename, &text, &length, NULL) ) + if (g_file_get_contents (filename, &text, &length, NULL)) { gtk_selection_data_set (selection_data, gtk_selection_data_get_target (selection_data), 8, @@ -902,7 +902,7 @@ paginate (GtkPrintOperation *operation, complete. Don't let that screw up printing. */ return TRUE; } - else if ( view->print_item < view->n_items ) + else if (view->print_item < view->n_items) { xr_driver_output_item (view->print_xrd, view->items[view->print_item++].item); diff --git a/src/ui/gui/psppire-output-window.c b/src/ui/gui/psppire-output-window.c index de57f17f9d..6e2c42d722 100644 --- a/src/ui/gui/psppire-output-window.c +++ b/src/ui/gui/psppire-output-window.c @@ -298,12 +298,12 @@ on_combo_change (GtkFileChooser *chooser) else { gint i; - if ( x != 0 ) + if (x != 0) sensitive = TRUE; for (i = 1 ; i < N_EXTENSIONS ; ++i) { - if ( g_str_has_suffix (fn, ft[i].ext)) + if (g_str_has_suffix (fn, ft[i].ext)) { sensitive = TRUE; break; @@ -324,11 +324,11 @@ on_file_chooser_change (GObject *w, GParamSpec *pspec, gpointer data) GtkFileChooser *chooser = data; const gchar *name = g_param_spec_get_name (pspec); - if ( ! gtk_widget_get_realized (GTK_WIDGET (chooser))) + if (! gtk_widget_get_realized (GTK_WIDGET (chooser))) return; /* Ignore this one. It causes recursion. */ - if ( 0 == strcmp ("tooltip-text", name)) + if (0 == strcmp ("tooltip-text", name)) return; on_combo_change (chooser); @@ -340,7 +340,7 @@ on_file_chooser_change (GObject *w, GParamSpec *pspec, gpointer data) static void iterate_widgets (GtkWidget *w, gpointer data) { - if ( GTK_IS_CONTAINER (w)) + if (GTK_IS_CONTAINER (w)) gtk_container_forall (GTK_CONTAINER (w), iterate_widgets, data); else g_signal_connect (w, "notify", G_CALLBACK (on_file_chooser_change), data); @@ -395,7 +395,7 @@ psppire_output_window_export (PsppireOutputWindow *window) { /* Create text cell renderer */ GtkCellRenderer *cell = gtk_cell_renderer_text_new(); - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), cell, FALSE ); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), cell, FALSE); gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo), cell, "text", 0); } @@ -415,7 +415,7 @@ psppire_output_window_export (PsppireOutputWindow *window) response = gtk_dialog_run (GTK_DIALOG (dialog)); - if ( response == GTK_RESPONSE_ACCEPT ) + if (response == GTK_RESPONSE_ACCEPT) { gint file_type = gtk_combo_box_get_active (GTK_COMBO_BOX (combo)); gchar *filename = gtk_file_chooser_get_filename (chooser); @@ -431,7 +431,7 @@ psppire_output_window_export (PsppireOutputWindow *window) gint i; for (i = 1 ; i < N_EXTENSIONS ; ++i) { - if ( g_str_has_suffix (filename, ft[i].ext)) + if (g_str_has_suffix (filename, ft[i].ext)) { file_type = i; break; diff --git a/src/ui/gui/psppire-scanf.c b/src/ui/gui/psppire-scanf.c index 52446b3892..951b27357f 100644 --- a/src/ui/gui/psppire-scanf.c +++ b/src/ui/gui/psppire-scanf.c @@ -54,12 +54,12 @@ ship_label (PsppireScanf *box, const char **s, GtkWidget *label ; GString *str = g_string_new (*s); - if ( dirs) + if (dirs) { char_directive dir = dirs->dir[dir_idx]; int n = 0; - while (dir_idx < dirs->count && dir.conversion == '%' ) + while (dir_idx < dirs->count && dir.conversion == '%') { g_string_erase (str, dir.dir_start - *s, 1); dir = dirs->dir[++dir_idx]; @@ -68,7 +68,7 @@ ship_label (PsppireScanf *box, const char **s, g_string_truncate (str, dir.dir_start - *s - n); - if ( dir_idx >= dirs->count) + if (dir_idx >= dirs->count) *s = NULL; else *s = dir.dir_end; @@ -92,31 +92,31 @@ guts (PsppireScanf *scanf) /* Get the number of args into D */ g_return_if_fail (0 == printf_parse (scanf->format, &scanf->d, &a)); - if ( scanf->d.count > 0) + if (scanf->d.count > 0) scanf->widgets = xcalloc (scanf->d.count, sizeof (*scanf->widgets)); /* A is not used, so get rid of it */ if (a.arg != a.direct_alloc_arg) free (a.arg); - for (i = 0 ; i < scanf->d.count ; ++i ) + for (i = 0 ; i < scanf->d.count ; ++i) { GtkWidget **w; char_directive dir = scanf->d.dir[i]; int precision = 0; int width = 0; - if ( dir.precision_start && dir.precision_end) + if (dir.precision_start && dir.precision_end) precision = strtol (dir.precision_start + 1, (char **) &dir.precision_end, 10); - if ( dir.width_start && dir.width_end ) + if (dir.width_start && dir.width_end) width = strtol (dir.width_start, (char **) &dir.width_end, 10); - if ( dir.dir_start > s ) + if (dir.dir_start > s) ship_label (scanf, &s, &scanf->d, i); - if ( dir.conversion == '%') + if (dir.conversion == '%') { if (s) s++; continue; @@ -142,7 +142,7 @@ guts (PsppireScanf *scanf) gtk_widget_show (*w); } - if ( s && *s ) + if (s && *s) ship_label (scanf, &s, NULL, 0); } @@ -156,10 +156,10 @@ set_mnemonic (PsppireScanf *scanf) GList *l = gtk_container_get_children (GTK_CONTAINER (scanf)); while (l) { - if ( GTK_IS_LABEL (l->data)) + if (GTK_IS_LABEL (l->data)) { const gchar *t = gtk_label_get_label (l->data); - if ( g_strstr_len (t, -1, "_")) + if (g_strstr_len (t, -1, "_")) { g_object_set (l->data, "use-underline", TRUE, @@ -337,14 +337,14 @@ psppire_scanf_init (PsppireScanf *w) gchar psppire_get_conversion_char (PsppireScanf *w, gint n) { - g_return_val_if_fail ( n < w->d.count, '\0'); + g_return_val_if_fail (n < w->d.count, '\0'); return w->d.dir[n].conversion; } GtkWidget * psppire_scanf_get_child (PsppireScanf *w, gint n) { - g_return_val_if_fail ( n < w->d.count, NULL); + g_return_val_if_fail (n < w->d.count, NULL); return w->widgets[n]; } @@ -371,11 +371,11 @@ psppire_scanf_new (const gchar *fmt, ...) va_start (ap, fmt); - for (i = 0 ; i < n ; ++i ) + for (i = 0 ; i < n ; ++i) { GtkWidget **field; - if ( psppire_get_conversion_char (PSPPIRE_SCANF (w), i) == '%') + if (psppire_get_conversion_char (PSPPIRE_SCANF (w), i) == '%') continue; field = va_arg (ap, GtkWidget **); diff --git a/src/ui/gui/psppire-selector.c b/src/ui/gui/psppire-selector.c index b4c3335d18..a021d92190 100644 --- a/src/ui/gui/psppire-selector.c +++ b/src/ui/gui/psppire-selector.c @@ -377,16 +377,16 @@ on_source_select (GtkTreeSelection *treeselection, gpointer data) set_direction (selector, PSPPIRE_SELECTOR_SOURCE_TO_DEST); - if ( selector->allow_selection ) + if (selector->allow_selection) { gtk_widget_set_sensitive (GTK_WIDGET (selector), selector->allow_selection (selector->source, selector->dest)); } - else if ( GTK_IS_ENTRY (selector->dest) ) + else if (GTK_IS_ENTRY (selector->dest)) { gtk_widget_set_sensitive (GTK_WIDGET (selector), gtk_tree_selection_count_selected_rows - (treeselection) <= 1 ); + (treeselection) <= 1); } } @@ -403,12 +403,12 @@ on_realize (GtkWidget *w) if (GTK_WIDGET_CLASS (parent_class)->realize) GTK_WIDGET_CLASS (parent_class)->realize (w); - if ( NULL == list) + if (NULL == list) return; - if ( g_list_first (list)->data == selector) + if (g_list_first (list)->data == selector) { - if ( selector->row_activate_id ) + if (selector->row_activate_id) g_signal_handler_disconnect (selector->source, selector->row_activate_id); selector->row_activate_id = @@ -417,7 +417,7 @@ on_realize (GtkWidget *w) selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (selector->source)); - if ( selector->source_select_id ) + if (selector->source_select_id) g_signal_handler_disconnect (selection, selector->source_select_id); selector->source_select_id = @@ -468,7 +468,7 @@ set_direction (PsppireSelector *selector, enum psppire_selector_dir d) /* FIXME: Need to reverse the arrow direction if an RTL locale is in effect */ - if ( d == PSPPIRE_SELECTOR_SOURCE_TO_DEST ) + if (d == PSPPIRE_SELECTOR_SOURCE_TO_DEST) { switch (selector->orientation) { @@ -554,7 +554,7 @@ static void de_select_selection_tree_view (PsppireSelector *selector) { GtkTreeSelection* selection = - gtk_tree_view_get_selection ( GTK_TREE_VIEW (selector->dest)); + gtk_tree_view_get_selection (GTK_TREE_VIEW (selector->dest)); GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (selector->dest)); @@ -628,13 +628,13 @@ de_select_selection (PsppireSelector *selector) { selector->selecting = TRUE; - if ( GTK_IS_TREE_VIEW (selector->dest ) ) + if (GTK_IS_TREE_VIEW (selector->dest)) de_select_selection_tree_view (selector); - else if ( GTK_IS_ENTRY (selector->dest)) + else if (GTK_IS_ENTRY (selector->dest)) de_select_selection_entry (selector); - else if ( PSPPIRE_IS_MEANS_LAYER (selector->dest)) + else if (PSPPIRE_IS_MEANS_LAYER (selector->dest)) de_select_selection_means_layer (selector); else @@ -654,7 +654,7 @@ select_selection (PsppireSelector *selector) { GList *item ; GtkTreeSelection* selection = - gtk_tree_view_get_selection ( GTK_TREE_VIEW (selector->source)); + gtk_tree_view_get_selection (GTK_TREE_VIEW (selector->source)); GList *selected_rows = gtk_tree_selection_get_selected_rows (selection, NULL); @@ -688,7 +688,7 @@ select_selection (PsppireSelector *selector) selector->dest, childmodel, selector->select_user_data - ); + ); } g_list_foreach (selected_rows, (GFunc) gtk_tree_path_free, NULL); @@ -778,7 +778,7 @@ is_source_item_visible (GtkTreeModel *childmodel, { PsppireSelector *selector = list->data; - if ( selector->filter && selector->filter (childmodel, iter, selector)) + if (selector->filter && selector->filter (childmodel, iter, selector)) return FALSE; list = list->next; @@ -796,7 +796,7 @@ set_tree_view_source (PsppireSelector *selector) PsppireSelectorClass *class = g_type_class_peek (PSPPIRE_SELECTOR_TYPE); - if ( ! (list = g_hash_table_lookup (class->source_hash, selector->source))) + if (! (list = g_hash_table_lookup (class->source_hash, selector->source))) { /* Base case: This widget is currently not the source of any selector. Create a hash entry and make this selector @@ -812,9 +812,9 @@ set_tree_view_source (PsppireSelector *selector) { /* Append this selector to the list and push the pair onto the hash table */ - if ( NULL == g_list_find (list, selector) ) + if (NULL == g_list_find (list, selector)) { - if ( selector->primary_requested ) + if (selector->primary_requested) { list = g_list_prepend (list, selector); selector->source_litem = list; @@ -838,7 +838,7 @@ update_model ( GtkTreeView *source, GParamSpec *psp, PsppireSelector *selector - ) +) { GtkTreeModel *model = gtk_tree_view_get_model (source); @@ -885,7 +885,7 @@ on_dest_data_change (GtkTreeModel *tree_model, { PsppireSelector *selector = user_data; - if ( selector->selecting) return; + if (selector->selecting) return; refilter (selector); } @@ -898,7 +898,7 @@ on_dest_data_delete (GtkTreeModel *tree_model, { PsppireSelector *selector = user_data; - if ( selector->selecting ) return; + if (selector->selecting) return; refilter (selector); } @@ -926,7 +926,7 @@ on_dest_model_changed (PsppireSelector *selector) g_signal_connect (selector, "destroy", G_CALLBACK (remove_selector_handlers), model); - if ( selector->selecting ) return; + if (selector->selecting) return; refilter (selector); } @@ -1000,7 +1000,7 @@ set_entry_dest (PsppireSelector *selector, static void set_default_filter (PsppireSelector *selector) { - if ( selector->filter == NULL) + if (selector->filter == NULL) { if (GTK_IS_TREE_VIEW (selector->dest)) selector->filter = is_item_in_dest; @@ -1011,15 +1011,15 @@ set_default_filter (PsppireSelector *selector) void psppire_selector_update_subjects (PsppireSelector *selector) { - if ( NULL == selector->dest ) + if (NULL == selector->dest) return; set_default_filter (selector); - if ( NULL == selector->source ) + if (NULL == selector->source) return; - if ( GTK_IS_TREE_VIEW (selector->source)) + if (GTK_IS_TREE_VIEW (selector->source)) { set_tree_view_source (selector); @@ -1031,13 +1031,13 @@ psppire_selector_update_subjects (PsppireSelector *selector) else g_error ("Unsupported source widget: %s", G_OBJECT_TYPE_NAME (selector->source)); - if ( NULL == selector->dest) + if (NULL == selector->dest) ; - else if ( GTK_IS_TREE_VIEW (selector->dest)) + else if (GTK_IS_TREE_VIEW (selector->dest)) { set_tree_view_dest (selector, GTK_TREE_VIEW (selector->dest)); } - else if ( GTK_IS_ENTRY (selector->dest)) + else if (GTK_IS_ENTRY (selector->dest)) { set_entry_dest (selector, GTK_ENTRY (selector->dest)); } @@ -1053,7 +1053,7 @@ psppire_selector_update_subjects (PsppireSelector *selector) g_error ("Unsupported destination widget: %s", G_OBJECT_TYPE_NAME (selector->dest)); - if ( PSPPIRE_IS_DICT_VIEW (selector->source) && selector->select_items == NULL) + if (PSPPIRE_IS_DICT_VIEW (selector->source) && selector->select_items == NULL) { GObjectClass *class = G_OBJECT_GET_CLASS (selector); GType type = G_OBJECT_TYPE (selector->dest); @@ -1061,7 +1061,7 @@ psppire_selector_update_subjects (PsppireSelector *selector) SelectItemsFunc *func = g_hash_table_lookup (PSPPIRE_SELECTOR_CLASS (class)->default_selection_funcs, (gpointer) type); - if ( func ) + if (func) psppire_selector_set_select_func (PSPPIRE_SELECTOR (selector), func, NULL); } diff --git a/src/ui/gui/psppire-syntax-window.c b/src/ui/gui/psppire-syntax-window.c index 2e398ade4a..c392fad870 100644 --- a/src/ui/gui/psppire-syntax-window.c +++ b/src/ui/gui/psppire-syntax-window.c @@ -261,7 +261,7 @@ on_edit_delete (PsppireSyntaxWindow *sw) GtkTextIter begin, end; GtkTextBuffer *buffer = GTK_TEXT_BUFFER (sw->buffer); - if ( gtk_text_buffer_get_selection_bounds (buffer, &begin, &end) ) + if (gtk_text_buffer_get_selection_bounds (buffer, &begin, &end)) gtk_text_buffer_delete (buffer, &begin, &end); } @@ -331,7 +331,7 @@ set_clip (PsppireSyntaxWindow *sw, GtkTextIter *begin, GtkTextIter *end) GtkClipboard *clipboard ; GtkTextBuffer *buffer = GTK_TEXT_BUFFER (sw->buffer); - if ( ! gtk_text_buffer_get_selection_bounds (buffer, begin, end) ) + if (! gtk_text_buffer_get_selection_bounds (buffer, begin, end)) return FALSE; g_free (sw->cliptext); @@ -354,7 +354,7 @@ on_edit_cut (PsppireSyntaxWindow *sw) { GtkTextIter begin, end; - if ( set_clip (sw, &begin, &end)) + if (set_clip (sw, &begin, &end)) gtk_text_buffer_delete (GTK_TEXT_BUFFER (sw->buffer), &begin, &end); } @@ -390,7 +390,7 @@ set_paste_sensitivity (GtkClipboard *clip, GdkEventOwnerChange *event, gpointer for (i = 0 ; i < sizeof (targets) / sizeof (targets[0]) ; ++i) { GdkAtom atom = gdk_atom_intern (targets[i].target, TRUE); - if ( gtk_clipboard_wait_is_target_available (clip, atom)) + if (gtk_clipboard_wait_is_target_available (clip, atom)) { compatible_target = TRUE; break; @@ -421,7 +421,7 @@ on_run_selection (PsppireSyntaxWindow *se) { GtkTextIter begin, end; - if ( gtk_text_buffer_get_selection_bounds (GTK_TEXT_BUFFER (se->buffer), &begin, &end) ) + if (gtk_text_buffer_get_selection_bounds (GTK_TEXT_BUFFER (se->buffer), &begin, &end)) editor_execute_syntax (se, begin, end); } @@ -439,7 +439,7 @@ on_run_to_end (PsppireSyntaxWindow *se) gtk_text_buffer_get_iter_at_mark (GTK_TEXT_BUFFER (se->buffer), &here, gtk_text_buffer_get_insert (GTK_TEXT_BUFFER (se->buffer)) - ); + ); line = gtk_text_iter_get_line (&here) ; @@ -465,7 +465,7 @@ on_run_current_line (PsppireSyntaxWindow *se) gtk_text_buffer_get_iter_at_mark (GTK_TEXT_BUFFER (se->buffer), &here, gtk_text_buffer_get_insert (GTK_TEXT_BUFFER (se->buffer)) - ); + ); line = gtk_text_iter_get_line (&here) ; @@ -485,8 +485,8 @@ on_run_current_line (PsppireSyntaxWindow *se) static gchar * append_suffix (const gchar *filename) { - if ( ! g_str_has_suffix (filename, ".sps" ) && - ! g_str_has_suffix (filename, ".SPS" ) ) + if (! g_str_has_suffix (filename, ".sps") && + ! g_str_has_suffix (filename, ".SPS")) { return g_strdup_printf ("%s.sps", filename); } @@ -529,7 +529,7 @@ save_editor_to_file (PsppireSyntaxWindow *se, ss_dealloc (&text_locale); g_free (suffixedname); - if ( result ) + if (result) { char *fn = g_filename_display_name (filename); gchar *msg = g_strdup_printf (_("Saved file `%s'"), fn); @@ -583,12 +583,12 @@ syntax_pick_filename (PsppireWindow *window) response = gtk_dialog_run (GTK_DIALOG (dialog)); - if ( response == GTK_RESPONSE_ACCEPT ) + if (response == GTK_RESPONSE_ACCEPT) { gchar *encoding; char *filename; - filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog) ); + filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); psppire_window_set_filename (window, filename); free (filename); @@ -612,7 +612,7 @@ syntax_save (PsppireWindow *se) const gchar *filename = psppire_window_get_filename (se); GError *err = NULL; save_editor_to_file (PSPPIRE_SYNTAX_WINDOW (se), filename, &err); - if ( err ) + if (err) { msg (ME, "%s", err->message); g_error_free (err); @@ -630,7 +630,7 @@ load_and_show_syntax_window (GtkWidget *se, const gchar *filename, ok = psppire_window_load (PSPPIRE_WINDOW (se), filename, encoding, NULL); gtk_source_buffer_end_not_undoable_action (PSPPIRE_SYNTAX_WINDOW (se)->buffer); - if (ok ) + if (ok) gtk_widget_show (se); else gtk_widget_destroy (se); @@ -649,7 +649,7 @@ open_syntax_window (const char *file_name, const gchar *encoding) { GtkWidget *se = psppire_syntax_window_new (NULL); - if ( file_name) + if (file_name) load_and_show_syntax_window (se, file_name, encoding); return GTK_WINDOW (se); @@ -978,7 +978,7 @@ syntax_load (PsppireWindow *window, const gchar *filename, GtkTextBuffer *buffer = GTK_TEXT_BUFFER (sw->buffer); /* FIXME: What if it's a very big file ? */ - if ( ! g_file_get_contents (filename, &text_locale, &len_locale, &err) ) + if (! g_file_get_contents (filename, &text_locale, &len_locale, &err)) { error_dialog (GTK_WINDOW (window), filename, err); g_clear_error (&err); @@ -1009,7 +1009,7 @@ syntax_load (PsppireWindow *window, const gchar *filename, NULL).string; free (text_locale); - if ( text_utf8 == NULL ) + if (text_utf8 == NULL) { error_dialog (GTK_WINDOW (window), filename, err); g_clear_error (&err); diff --git a/src/ui/gui/psppire-val-chooser.c b/src/ui/gui/psppire-val-chooser.c index 0dbb3c0b4d..09c0ec35d0 100644 --- a/src/ui/gui/psppire-val-chooser.c +++ b/src/ui/gui/psppire-val-chooser.c @@ -237,7 +237,7 @@ static void simple_set (PsppireValChooser *vr, struct old_value *ov, const struc { const gchar *text = gtk_entry_get_text (rw->e1); - if ( vr->input_var_is_string) + if (vr->input_var_is_string) { ov->type = OV_STRING; ov->v.s = g_strdup (text); @@ -441,7 +441,7 @@ old_value_copy (struct old_value *ov) { struct old_value *copy = g_memdup (ov, sizeof (*copy)); - if ( ov->type == OV_STRING ) + if (ov->type == OV_STRING) copy->v.s = g_strdup (ov->v.s); return copy; @@ -539,7 +539,7 @@ old_value_get_type (void) { static GType t = 0; - if (t == 0 ) + if (t == 0) { t = g_boxed_type_register_static ("psppire-recode-old-values", (GBoxedCopyFunc) old_value_copy, @@ -610,7 +610,7 @@ psppire_val_chooser_get_status (PsppireValChooser *vr, struct old_value *ov) for (i = 0; i < n_VAL_CHOOSER_BUTTONS; ++i) { - if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (vr->rw[i].rb))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (vr->rw[i].rb))) { range_opt[i].set (vr, ov, &vr->rw[i]); break; @@ -633,7 +633,7 @@ void psppire_val_chooser_set_status (PsppireValChooser *vr, const struct old_value *ov) { gint i; - if ( !ov ) + if (!ov) return; for (i = 0; i < n_VAL_CHOOSER_BUTTONS; ++i) diff --git a/src/ui/gui/psppire-var-ptr.c b/src/ui/gui/psppire-var-ptr.c index 52eb3e4dbc..a2f65a3946 100644 --- a/src/ui/gui/psppire-var-ptr.c +++ b/src/ui/gui/psppire-var-ptr.c @@ -49,7 +49,7 @@ variable_to_string (const GValue *src, { const struct variable *v = g_value_get_boxed (src); - if ( v == NULL) + if (v == NULL) g_value_set_string (dest, ""); else g_value_set_string (dest, var_get_name (v)); @@ -63,7 +63,7 @@ variable_to_int (const GValue *src, { const struct variable *v = g_value_get_boxed (src); - if ( v == NULL) + if (v == NULL) g_value_set_int (dest, -1); else g_value_set_int (dest, var_get_dict_index (v)); @@ -77,7 +77,7 @@ psppire_var_ptr_get_type (void) { static GType t = 0; - if (t == 0 ) + if (t == 0) { t = g_boxed_type_register_static ("psppire-var-ptr", (GBoxedCopyFunc) variable_copy, diff --git a/src/ui/gui/psppire-var-view.c b/src/ui/gui/psppire-var-view.c index e47b7b61e8..2e019d5946 100644 --- a/src/ui/gui/psppire-var-view.c +++ b/src/ui/gui/psppire-var-view.c @@ -326,7 +326,7 @@ psppire_var_view_get_var_from_model (GtkTreeModel *model, gint column, GtkTreeIt GValue value = {0}; gtk_tree_model_get_value (model, iter, column, &value); - if ( G_VALUE_TYPE (&value) == PSPPIRE_VAR_PTR_TYPE) + if (G_VALUE_TYPE (&value) == PSPPIRE_VAR_PTR_TYPE) var = g_value_get_boxed (&value); else g_critical ("Unsupported type `%s', in variable name treeview.", @@ -356,7 +356,7 @@ psppire_var_view_append_names (PsppireVarView *vv, gint column, GString *string) gint n_vars = 0; GtkTreeIter iter; - if ( psppire_var_view_get_iter_first (vv, &iter) ) + if (psppire_var_view_get_iter_first (vv, &iter)) { do { @@ -384,7 +384,7 @@ psppire_var_view_list_names (PsppireVarView *vv, gint column) GtkTreeIter iter; GSList *list = NULL; - if ( psppire_var_view_get_iter_first (vv, &iter) ) + if (psppire_var_view_get_iter_first (vv, &iter)) { do { @@ -408,7 +408,7 @@ psppire_var_view_append_names_str (PsppireVarView *vv, gint column, struct strin gint n_vars = 0; GtkTreeIter iter; - if ( psppire_var_view_get_iter_first (vv, &iter) ) + if (psppire_var_view_get_iter_first (vv, &iter)) { do { diff --git a/src/ui/gui/psppire-window.c b/src/ui/gui/psppire-window.c index 3c80523a9a..48a64c6f72 100644 --- a/src/ui/gui/psppire-window.c +++ b/src/ui/gui/psppire-window.c @@ -333,7 +333,7 @@ insert_item (gpointer key, gpointer value, gpointer data) { PsppireWindow *window = PSPPIRE_WINDOW (data); - if ( NULL != g_hash_table_lookup (window->menuitem_table, key)) + if (NULL != g_hash_table_lookup (window->menuitem_table, key)) return; insert_menuitem_into_menu (window, key); @@ -368,7 +368,7 @@ on_delete (PsppireWindow *w, GdkEvent *event, gpointer user_data) { PsppireWindowRegister *reg = psppire_window_register_new (); - if ( w->dirty ) + if (w->dirty) { gint response = psppire_window_query_save (w); @@ -391,7 +391,7 @@ on_delete (PsppireWindow *w, GdkEvent *event, gpointer user_data) } } - if ( 1 == psppire_window_register_n_items (reg)) + if (1 == psppire_window_register_n_items (reg)) gtk_main_quit (); return FALSE; @@ -508,7 +508,7 @@ psppire_window_set_filename (PsppireWindow *w, const gchar *filename) void psppire_window_set_unsaved (PsppireWindow *w) { - if ( w->dirty == FALSE) + if (w->dirty == FALSE) g_get_current_time (&w->savetime); w->dirty = TRUE; @@ -632,7 +632,7 @@ psppire_window_load (PsppireWindow *w, const gchar *file, ok = i->load (w, file, encoding, hint); - if ( ok ) + if (ok) { psppire_window_set_filename (w, file); w->dirty = FALSE; @@ -702,7 +702,7 @@ psppire_window_file_chooser_dialog (PsppireWindow *toplevel) const gchar *filename = toplevel->filename; gchar *dir_name; - if ( ! g_path_is_absolute (filename)) + if (! g_path_is_absolute (filename)) { gchar *path = g_build_filename (g_get_current_dir (), filename, NULL); @@ -891,7 +891,7 @@ add_most_recent (const char *file_name, const char *mime_type, const char *encoding) { gchar *uri = g_filename_to_uri (file_name, NULL, NULL); - if ( uri ) + if (uri) { GtkRecentData recent_data; gchar *full_mime_type; @@ -930,7 +930,7 @@ delete_recent (const char *file_name) { gchar *uri = g_filename_to_uri (file_name, NULL, NULL); - if ( uri ) + if (uri) gtk_recent_manager_remove_item (gtk_recent_manager_get_default (), uri, NULL); g_free (uri); diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c index e3f8589f71..ea8250a6b9 100644 --- a/src/ui/gui/psppire.c +++ b/src/ui/gui/psppire.c @@ -105,7 +105,7 @@ initialize (const struct init_source *is) bind_textdomain_codeset (PACKAGE, "UTF-8"); break; case 8: - if ( ! gtk_parse_args (is->argc, is->argv) ) + if (! gtk_parse_args (is->argc, is->argv)) { perror ("Error parsing arguments"); exit (1); diff --git a/src/ui/gui/spreadsheet-test.c b/src/ui/gui/spreadsheet-test.c index b8ce870d46..995872f437 100644 --- a/src/ui/gui/spreadsheet-test.c +++ b/src/ui/gui/spreadsheet-test.c @@ -103,7 +103,7 @@ print_msg (const struct msg *m, void *aux UNUSED) int -main (int argc, char *argv[] ) +main (int argc, char *argv[]) { GtkWidget *window; GtkWidget *hbox; @@ -119,7 +119,7 @@ main (int argc, char *argv[] ) gtk_init (&argc, &argv); - if ( argc < 2) + if (argc < 2) g_error ("Usage: prog file\n"); msg_set_handler (print_msg, 0); diff --git a/src/ui/gui/t-test-options.c b/src/ui/gui/t-test-options.c index 1b28eefdb6..17d2d52508 100644 --- a/src/ui/gui/t-test-options.c +++ b/src/ui/gui/t-test-options.c @@ -105,7 +105,7 @@ tt_options_dialog_run (struct tt_options_dialog *tto) { gint response; - if ( tto->excl == EXCL_ANALYSIS) + if (tto->excl == EXCL_ANALYSIS) gtk_toggle_button_set_active (tto->analysis, TRUE); else gtk_toggle_button_set_active (tto->listwise, TRUE); @@ -114,12 +114,12 @@ tt_options_dialog_run (struct tt_options_dialog *tto) response = psppire_dialog_run (PSPPIRE_DIALOG (tto->dialog)); - if ( response == PSPPIRE_RESPONSE_CONTINUE) + if (response == PSPPIRE_RESPONSE_CONTINUE) { tto->non_default_options = TRUE; tto->confidence_interval = gtk_spin_button_get_value (tto->conf_percent); - if ( gtk_toggle_button_get_active (tto->analysis) ) + if (gtk_toggle_button_get_active (tto->analysis)) tto->excl = EXCL_ANALYSIS; else tto->excl = EXCL_LISTWISE; diff --git a/src/ui/gui/val-labs-dialog.c b/src/ui/gui/val-labs-dialog.c index ab56135ccc..d1649e900b 100644 --- a/src/ui/gui/val-labs-dialog.c +++ b/src/ui/gui/val-labs-dialog.c @@ -232,14 +232,14 @@ select_treeview_from_value (GtkTreeView *treeview, union value *val) v.f = g_value_get_double (&gvalue); - if ( 0 == memcmp (&v, val, sizeof (union value))) + if (0 == memcmp (&v, val, sizeof (union value))) { break; } } path = gtk_tree_model_get_path (model, &iter); - if ( path ) + if (path) { gtk_tree_view_set_cursor (treeview, path, 0, 0); gtk_tree_path_free (path); @@ -268,7 +268,7 @@ on_value_entry_change (GtkEntry *entry, gpointer data) gtk_entry_set_text (GTK_ENTRY (dialog->label_entry),""); - if ( (s = val_labs_find (dialog->labs, &v)) ) + if ((s = val_labs_find (dialog->labs, &v))) { gtk_entry_set_text (GTK_ENTRY (dialog->label_entry), s); gtk_widget_set_sensitive (dialog->add_button, FALSE); @@ -376,7 +376,7 @@ on_add (GtkWidget *w, gpointer data) { if (val_labs_add (dialog->labs, &v, gtk_entry_get_text - ( GTK_ENTRY (dialog->label_entry)) ) ) + (GTK_ENTRY (dialog->label_entry)))) { gtk_widget_set_sensitive (dialog->add_button, FALSE); diff --git a/src/ui/gui/var-display.c b/src/ui/gui/var-display.c index 52342b3d83..8f084e7f1d 100644 --- a/src/ui/gui/var-display.c +++ b/src/ui/gui/var-display.c @@ -39,20 +39,20 @@ missing_values_to_string (const struct variable *pv, GError **err) { gchar *s; const struct missing_values *miss = var_get_missing_values (pv); - if ( mv_is_empty (miss)) + if (mv_is_empty (miss)) return xstrdup (gettext (none)); else { - if ( ! mv_has_range (miss)) + if (! mv_has_range (miss)) { GString *gstr = g_string_sized_new (10); const int n = mv_n_values (miss); gchar *mv[4] = {0,0,0,0}; gint i; - for (i = 0 ; i < n; ++i ) + for (i = 0 ; i < n; ++i) { mv[i] = value_to_text (*mv_get_value (miss, i), pv); - if ( i > 0 ) + if (i > 0) g_string_append (gstr, ", "); g_string_append (gstr, mv[i]); g_free (mv[i]); @@ -74,7 +74,7 @@ missing_values_to_string (const struct variable *pv, GError **err) g_free (l); g_free (h); - if ( mv_has_value (miss)) + if (mv_has_value (miss)) { gchar *ss = NULL; diff --git a/src/ui/gui/var-type-dialog.c b/src/ui/gui/var-type-dialog.c index 514d983c3d..66eb0827f5 100644 --- a/src/ui/gui/var-type-dialog.c +++ b/src/ui/gui/var-type-dialog.c @@ -230,7 +230,7 @@ on_toggle (GtkToggleButton *togglebutton, gpointer dialog_) { PsppireVarTypeDialog *dialog = dialog_; - if ( gtk_toggle_button_get_active (togglebutton) == TRUE) + if (gtk_toggle_button_get_active (togglebutton) == TRUE) refresh_active_button (dialog); } @@ -419,7 +419,7 @@ preview_custom (GtkWidget *w, gpointer data) PsppireVarTypeDialog *dialog = data; - if ( dialog->active_button != BUTTON_CUSTOM ) + if (dialog->active_button != BUTTON_CUSTOM) return; text = gtk_entry_get_text (GTK_ENTRY (dialog->entry_decimals)); @@ -429,7 +429,7 @@ preview_custom (GtkWidget *w, gpointer data) dialog->fmt_l.w = atoi (text); msg_disable (); - if ( ! fmt_check_output (&dialog->fmt_l)) + if (! fmt_check_output (&dialog->fmt_l)) { gtk_label_set_text (GTK_LABEL (dialog->label_psample), "---"); gtk_label_set_text (GTK_LABEL (dialog->label_nsample), "---"); @@ -605,7 +605,7 @@ psppire_var_type_dialog_constructor (GType type, add_to_group, sizeGroup); - for (i = 0 ; i < num_BUTTONS; ++i ) + for (i = 0 ; i < num_BUTTONS; ++i) g_signal_connect (dialog->radioButton[i], "toggled", G_CALLBACK (on_toggle), dialog); @@ -627,7 +627,7 @@ psppire_var_type_dialog_constructor (GType type, list_store = gtk_list_store_new (1, G_TYPE_STRING); - for ( i = 0 ; i < sizeof (date_format) / sizeof (date_format[0]) ; ++i ) + for (i = 0 ; i < sizeof (date_format) / sizeof (date_format[0]) ; ++i) { const struct fmt_spec *f = &date_format[i]; gtk_list_store_append (list_store, &iter); @@ -661,7 +661,7 @@ psppire_var_type_dialog_constructor (GType type, list_store = gtk_list_store_new (1, G_TYPE_STRING); - for ( i = 0 ; i < sizeof (dollar_format)/sizeof (dollar_format[0]) ; ++i ) + for (i = 0 ; i < sizeof (dollar_format)/sizeof (dollar_format[0]) ; ++i) { char *template = settings_dollar_template (&dollar_format[i]); gtk_list_store_append (list_store, &iter); @@ -701,7 +701,7 @@ psppire_var_type_dialog_constructor (GType type, list_store = gtk_list_store_new (1, G_TYPE_STRING); - for ( i = 0 ; i < 5 ; ++i ) + for (i = 0 ; i < 5 ; ++i) { enum fmt_type cc_fmts[5] = {FMT_CCA, FMT_CCB, FMT_CCC, FMT_CCD, FMT_CCE}; gtk_list_store_append (list_store, &iter); diff --git a/src/ui/gui/widget-io.c b/src/ui/gui/widget-io.c index da9c9cb1e8..9612e44e7f 100644 --- a/src/ui/gui/widget-io.c +++ b/src/ui/gui/widget-io.c @@ -48,14 +48,14 @@ widget_printf (const gchar *fmt, ...) va_list ap; const char *s = fmt; - if ( 0 != printf_parse (fmt, &d, &a) ) + if (0 != printf_parse (fmt, &d, &a)) return NULL; widgets = xcalloc (d.count, sizeof (*widgets)); va_start (ap, fmt); - for (i = 0 ; i < d.count ; ++i ) + for (i = 0 ; i < d.count ; ++i) { - if ( d.dir[i].conversion != '%') + if (d.dir[i].conversion != '%') widgets[i] = va_arg (ap, GtkWidget *); } va_end (ap); @@ -65,13 +65,13 @@ widget_printf (const gchar *fmt, ...) output = g_string_sized_new (strlen (fmt)); - for (i = 0 ; i < d.count ; ++i ) + for (i = 0 ; i < d.count ; ++i) { char_directive dir = d.dir[i]; GtkWidget *w ; const gchar *entry_text; - if ( dir.conversion == '%') + if (dir.conversion == '%') { s++; continue; @@ -80,7 +80,7 @@ widget_printf (const gchar *fmt, ...) w = widgets [dir.arg_index]; entry_text = gtk_entry_get_text (GTK_ENTRY (w)); - if ( dir.dir_start > s ) + if (dir.dir_start > s) g_string_append_len (output, s, dir.dir_start - s); s = dir.dir_end; diff --git a/src/ui/gui/windows-menu.c b/src/ui/gui/windows-menu.c index 6974bc65be..4659259fce 100644 --- a/src/ui/gui/windows-menu.c +++ b/src/ui/gui/windows-menu.c @@ -97,7 +97,7 @@ repopulate_windows_menu (GObject *inst, gchar *name, gpointer data) gtk_menu_attach (GTK_MENU (menu), minimize, 0, 1, 0, 1); - if (PSPPIRE_DATA_WINDOW_TYPE == G_OBJECT_TYPE (toplevel) ) + if (PSPPIRE_DATA_WINDOW_TYPE == G_OBJECT_TYPE (toplevel)) { gtk_menu_attach (GTK_MENU (menu), split, 0, 1, 1, 2); g_signal_connect_swapped (split, "toggled", diff --git a/src/ui/source-init-opts.c b/src/ui/source-init-opts.c index baa24d303f..c5f5b4d457 100644 --- a/src/ui/source-init-opts.c +++ b/src/ui/source-init-opts.c @@ -88,7 +88,7 @@ source_init_option_callback (int id, void *aux UNUSED) break; case OPT_SYNTAX: - if (!strcmp (optarg, "compatible") ) + if (!strcmp (optarg, "compatible")) settings_set_syntax (COMPATIBLE); else if (!strcmp (optarg, "enhanced")) settings_set_syntax (ENHANCED); diff --git a/src/ui/terminal/terminal-reader.c b/src/ui/terminal/terminal-reader.c index 2f2a533d15..c23fad186f 100644 --- a/src/ui/terminal/terminal-reader.c +++ b/src/ui/terminal/terminal-reader.c @@ -264,13 +264,13 @@ interruptible_getc (FILE *fp) max_fd = (max_fd > fd) ? max_fd : fd; FD_SET (fd, &what); ret = select (max_fd + 1, &what, NULL, NULL, &timeout); - if ( ret == -1 && errno != EINTR) + if (ret == -1 && errno != EINTR) { perror ("Select failed"); continue; } - if (ret > 0 ) + if (ret > 0) { if (FD_ISSET (pfd[0], &what)) { @@ -302,10 +302,10 @@ handler (int sig) static void readline_init (void) { - if ( 0 != pipe2 (pfd, O_NONBLOCK)) + if (0 != pipe2 (pfd, O_NONBLOCK)) perror ("Cannot create pipe"); - if ( SIG_ERR == signal (SIGINT, handler)) + if (SIG_ERR == signal (SIGINT, handler)) perror ("Cannot add signal handler"); rl_catch_signals = 0; @@ -327,7 +327,7 @@ readline_init (void) static void readline_done (void) { - if (history_file != NULL && false == settings_get_testing_mode () ) + if (history_file != NULL && false == settings_get_testing_mode ()) write_history (history_file); clear_history (); free (history_file); diff --git a/tests/language/lexer/segment-test.c b/tests/language/lexer/segment-test.c index 62db481426..e7a6db11e8 100644 --- a/tests/language/lexer/segment-test.c +++ b/tests/language/lexer/segment-test.c @@ -197,7 +197,7 @@ check_segmentation (const char *input, size_t length, bool print_segments) for (i = MIN (15, strlen (type_name)); i < 16; i++) putchar (' '); - for (i = 0; i < n; ) + for (i = 0; i < n;) { const uint8_t *u_input = CHAR_CAST (const uint8_t *, input); ucs4_t uc; diff --git a/tests/libpspp/abt-test.c b/tests/libpspp/abt-test.c index fb6ddd704b..1b0d00998b 100644 --- a/tests/libpspp/abt-test.c +++ b/tests/libpspp/abt-test.c @@ -252,7 +252,7 @@ static struct element * find_by_position (struct abt *abt, int position) { struct abt_node *p; - for (p = abt->root; p != NULL; ) + for (p = abt->root; p != NULL;) { int p_pos = p->down[0] ? abt_node_to_element (p->down[0])->count : 0; if (position == p_pos) diff --git a/tests/libpspp/range-map-test.c b/tests/libpspp/range-map-test.c index b6a1b49322..6a710a5550 100644 --- a/tests/libpspp/range-map-test.c +++ b/tests/libpspp/range-map-test.c @@ -124,7 +124,7 @@ factorial (unsigned int n) unsigned int value = 1; /* Disallow N values that overflow on 32-bit machines. */ assert (n <= 12); - for (; n > 1; ) + for (; n > 1;) value *= n--; return value; } diff --git a/tests/libpspp/range-set-test.c b/tests/libpspp/range-set-test.c index 7ae8c21e87..127d4223f1 100644 --- a/tests/libpspp/range-set-test.c +++ b/tests/libpspp/range-set-test.c @@ -128,7 +128,7 @@ prev_region (unsigned int pattern, unsigned int offset, unsigned int i; assert (offset <= UINT_BIT); - for (i = offset; i-- > 0; ) + for (i = offset; i-- > 0;) if (pattern & (1u << i)) { *start = i; diff --git a/tests/libpspp/range-tower-test.c b/tests/libpspp/range-tower-test.c index dce8f8b1e1..9270753a02 100644 --- a/tests/libpspp/range-tower-test.c +++ b/tests/libpspp/range-tower-test.c @@ -130,7 +130,7 @@ prev_region (unsigned int pattern, unsigned int offset, unsigned int i; assert (offset <= UINT_BIT); - for (i = offset; i-- > 0; ) + for (i = offset; i-- > 0;) if (pattern & (1u << i)) { *start = i; diff --git a/tests/libpspp/tower-test.c b/tests/libpspp/tower-test.c index 78198cb554..8eae829407 100644 --- a/tests/libpspp/tower-test.c +++ b/tests/libpspp/tower-test.c @@ -140,7 +140,7 @@ factorial (unsigned int n) unsigned int value = 1; /* Disallow N values that overflow on 32-bit machines. */ assert (n <= 12); - for (; n > 1; ) + for (; n > 1;) value *= n--; return value; } diff --git a/tests/libpspp/zip-test.c b/tests/libpspp/zip-test.c index e132cb93da..9b44c1e7c2 100644 --- a/tests/libpspp/zip-test.c +++ b/tests/libpspp/zip-test.c @@ -42,32 +42,32 @@ check_die (void) int main (int argc, char **argv) { - if ( argc < 4) + if (argc < 4) { fprintf (stderr, "Usage zip-test: {r|w} archive file0 file1 ... filen\n"); check_die (); } - if ( 0 == strcmp ("w", argv[1])) + if (0 == strcmp ("w", argv[1])) { int i; struct zip_writer *zw = zip_writer_create (argv[2]); for (i = 3; i < argc; ++i) { FILE *fp = fopen (argv[i], "r"); - if (!fp ) check_die (); + if (!fp) check_die (); zip_writer_add (zw, fp, argv[i]); } zip_writer_close (zw); } - else if ( 0 == strcmp ("r", argv[1])) + else if (0 == strcmp ("r", argv[1])) { const int BUFSIZE=256; char buf[BUFSIZE]; int i; struct string str; struct zip_reader *zr = zip_reader_create (argv[2], &str); - if ( NULL == zr) + if (NULL == zr) { fprintf (stderr, "Could not create zip reader: %s\n", ds_cstr (&str)); check_die (); @@ -77,14 +77,14 @@ main (int argc, char **argv) int x = 0; struct zip_member *zm ; FILE *fp = fopen (argv[i], "w"); - if ( NULL == fp) + if (NULL == fp) { int e = errno; fprintf (stderr, "Could not create file %s: %s\n", argv[i], strerror(e)); check_die (); } zm = zip_member_open (zr, argv[i]); - if ( NULL == zm) + if (NULL == zm) { fprintf (stderr, "Could not open zip member %s from archive: %s\n", argv[i], ds_cstr (&str)); @@ -97,7 +97,7 @@ main (int argc, char **argv) } zip_member_finish (zm); fclose (fp); - if ( x < 0) + if (x < 0) { fprintf (stderr, "Unzip failed: %s\n", ds_cstr (&str)); check_die (); diff --git a/tests/output/render-test.c b/tests/output/render-test.c index 49a76a66ad..19bb0ccfab 100644 --- a/tests/output/render-test.c +++ b/tests/output/render-test.c @@ -346,7 +346,7 @@ replace_newlines (char *p) { char *q; - for (q = p; *p != '\0'; ) + for (q = p; *p != '\0';) if (*p == '\\' && p[1] == 'n') { *q++ = '\n'; diff --git a/utilities/pspp-convert.c b/utilities/pspp-convert.c index a9e075a0e7..1bd2e0a78d 100644 --- a/utilities/pspp-convert.c +++ b/utilities/pspp-convert.c @@ -232,7 +232,7 @@ main (int argc, char *argv[]) break; case 'a': - for (const char *p = optarg; *p; ) + for (const char *p = optarg; *p;) if (p[1] == '-' && p[2] > p[0]) { for (int ch = p[0]; ch <= p[2]; ch++) diff --git a/utilities/pspp-dump-sav.c b/utilities/pspp-dump-sav.c index 0aed9cf614..4a44e49057 100644 --- a/utilities/pspp-dump-sav.c +++ b/utilities/pspp-dump-sav.c @@ -1231,7 +1231,7 @@ read_simple_compressed_data (struct sfm_reader *r, int max_cases) { printf ("%08llx: case %d's uncompressible data begins\n", (long long int) ftello (r->file), case_num); - for (i = 0; i < r->n_var_widths; ) + for (i = 0; i < r->n_var_widths;) { int width = r->var_widths[i]; char raw_value[8]; -- 2.30.2