From a55e0af46fbc1047e925f07b909e550d44543f58 Mon Sep 17 00:00:00 2001
From: okan
Date: Sat, 14 Feb 2015 18:24:12 +0000
Subject: simplify error messages; discussed with doug@

---
 parse.y | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'parse.y')

diff --git a/parse.y b/parse.y
index 5aa07d0..2b861e7 100644
--- a/parse.y
+++ b/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.61 2015/01/19 14:54:16 okan Exp $ */
+/*	$OpenBSD: parse.y,v 1.62 2015/02/14 18:24:12 okan Exp $ */
 
 /*
  * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -119,21 +119,21 @@ main		: FONTNAME STRING		{
 		}
 		| BORDERWIDTH NUMBER {
 			if ($2 < 0 || $2 > UINT_MAX) {
-				yyerror("invalid borderwidth: %lld", $2);
+				yyerror("invalid borderwidth");
 				YYERROR;
 			}
 			conf->bwidth = $2;
 		}
 		| MOVEAMOUNT NUMBER {
 			if ($2 < 0 || $2 > INT_MAX) {
-				yyerror("invalid movemount: %lld", $2);
+				yyerror("invalid movemount");
 				YYERROR;
 			}
 			conf->mamount = $2;
 		}
 		| SNAPDIST NUMBER {
 			if ($2 < 0 || $2 > INT_MAX) {
-				yyerror("invalid snapdist: %lld", $2);
+				yyerror("invalid snapdist");
 				YYERROR;
 			}
 			conf->snapdist = $2;
@@ -150,8 +150,8 @@ main		: FONTNAME STRING		{
 		}
 		| AUTOGROUP NUMBER STRING	{
 			if ($2 < 0 || $2 > 9) {
+				yyerror("invalid autogroup");
 				free($3);
-				yyerror("invalid autogroup: %lld", $2);
 				YYERROR;
 			}
 			conf_autogroup(conf, $2, $3);
@@ -176,8 +176,7 @@ main		: FONTNAME STRING		{
 			    $3 < 0 || $3 > INT_MAX ||
 			    $4 < 0 || $4 > INT_MAX ||
 			    $5 < 0 || $5 > INT_MAX) {
-				yyerror("invalid gap: %lld %lld %lld %lld",
-				    $2, $3, $4, $5);
+				yyerror("invalid gap");
 				YYERROR;
 			}
 			conf->gap.top = $2;
-- 
cgit v1.2.3-2-gb3c3