From: John Darrington <john@darrington.wattle.id.au>
Date: Fri, 25 Oct 2013 19:00:44 +0000 (+0200)
Subject: Corrected logical errors in tests for error conditions.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd308174a81b1702426720536acd3aa4a3021801;p=pspp

Corrected logical errors in tests for error conditions.

Fixed several places where && had bee used where || was intended
and vici-versa.

Reported-By: David Binderman <dcb314@hotmail.com>
---

diff --git a/src/data/data-in.c b/src/data/data-in.c
index db99aa4fb8..ace167090c 100644
--- a/src/data/data-in.c
+++ b/src/data/data-in.c
@@ -919,7 +919,7 @@ parse_year (struct data_in *i, long *year, size_t max_digits)
       else
         *year += epoch_century + 100;
     }
-  if (*year >= 1582 || *year <= 19999)
+  if (*year >= 1582 && *year <= 19999)
     return NULL;
 
   return xasprintf (_("Year (%ld) must be between 1582 and 19999."), *year);
diff --git a/src/language/lexer/q2c.c b/src/language/lexer/q2c.c
index 20bdd56496..27ff530d31 100644
--- a/src/language/lexer/q2c.c
+++ b/src/language/lexer/q2c.c
@@ -1729,7 +1729,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, "{");
 
diff --git a/src/language/stats/glm.c b/src/language/stats/glm.c
index 82ca9896e1..13d878176e 100644
--- a/src/language/stats/glm.c
+++ b/src/language/stats/glm.c
@@ -267,7 +267,7 @@ cmd_glm (struct lexer *lexer, struct dataset *ds)
 	    }
 
 	  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;
diff --git a/src/ui/gui/psppire-var-sheet.c b/src/ui/gui/psppire-var-sheet.c
index bb2c56ba7a..a681748086 100644
--- a/src/ui/gui/psppire-var-sheet.c
+++ b/src/ui/gui/psppire-var-sheet.c
@@ -591,7 +591,7 @@ get_string_width (PsppSheetView *treeview, GtkCellRenderer *renderer,
 }
 
 static gint
-get_monospace_width (PsppSheetView *treeview, GtkCellRenderer *renderer,
+get_monospac_width (PsppSheetView *treeview, GtkCellRenderer *renderer,
                      size_t char_cnt)
 {
   struct string s;