From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sun, 12 Sep 2010 21:06:55 +0000 (-0700)
Subject: AGGREGATE: Simplify code.
X-Git-Tag: sav-api~16
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=cf43c539407ac9a76154605d83247aa98d712426

AGGREGATE: Simplify code.

ds_chomp() returns whether it trimmed off a character, and we might as well
use that instead of doing a redundant check.
---

diff --git a/src/language/stats/aggregate.c b/src/language/stats/aggregate.c
index bcc8a3be09..15376f62b8 100644
--- a/src/language/stats/aggregate.c
+++ b/src/language/stats/aggregate.c
@@ -453,14 +453,8 @@ parse_aggregate_functions (struct lexer *lexer, const struct dictionary *dict,
 	  goto error;
 	}
 
-      exclude = MV_ANY;
-
       ds_assign_string (&function_name, lex_tokstr (lexer));
-
-      ds_chomp (&function_name, '.');
-
-      if (lex_tokid(lexer)[strlen (lex_tokid (lexer)) - 1] == '.')
-        exclude = MV_SYSTEM;
+      exclude = ds_chomp (&function_name, '.') ? MV_SYSTEM : MV_ANY;
 
       for (function = agr_func_tab; function->name; function++)
 	if (!strcasecmp (function->name, ds_cstr (&function_name)))