From af52460b4361b4895eb85b42819f8ac1ef57e3fe Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Mon, 15 May 2017 21:00:56 -0700 Subject: [PATCH] factor: Fix return type of do_factor_by_matrix(). This function had a "bool" return type but nothing used it. Fixes GCC warning "'return' with no value, in function returning non-void". Reported by Jeremy Lavergne. --- src/language/stats/factor.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/language/stats/factor.c b/src/language/stats/factor.c index c1ce93aaec..fc3eb5b4d2 100644 --- a/src/language/stats/factor.c +++ b/src/language/stats/factor.c @@ -1005,7 +1005,7 @@ iterate_factor_matrix (const gsl_matrix *r, gsl_vector *communalities, gsl_matri static bool run_factor (struct dataset *ds, const struct cmd_factor *factor); -static bool do_factor_by_matrix (const struct cmd_factor *factor, struct idata *idata); +static void do_factor_by_matrix (const struct cmd_factor *factor, struct idata *idata); @@ -2227,13 +2227,13 @@ do_factor (const struct cmd_factor *factor, struct casereader *r) casereader_destroy (r); } -static bool +static void do_factor_by_matrix (const struct cmd_factor *factor, struct idata *idata) { if (!idata->mm.cov && !idata->mm.corr) { msg (ME, _("The dataset has no complete covariance or correlation matrix.")); - return false; + return; } if (idata->mm.cov && !idata->mm.corr) @@ -2414,7 +2414,7 @@ do_factor_by_matrix (const struct cmd_factor *factor, struct idata *idata) if (idata->n_extractions == 0) { msg (MW, _("The %s criteria result in zero factors extracted. Therefore no analysis will be performed."), "FACTOR"); - goto finish; + return; } if (idata->n_extractions > factor->n_vars) @@ -2422,7 +2422,7 @@ do_factor_by_matrix (const struct cmd_factor *factor, struct idata *idata) msg (MW, _("The %s criteria result in more factors than variables, which is not meaningful. No analysis will be performed."), "FACTOR"); - goto finish; + return; } { @@ -2543,9 +2543,6 @@ do_factor_by_matrix (const struct cmd_factor *factor, struct idata *idata) gsl_vector_free (initial_communalities); gsl_vector_free (extracted_communalities); } - - finish: - return; } -- 2.30.2