From b6ad58bde953d53ba1e0225c1c6070147682b6e9 Mon Sep 17 00:00:00 2001
From: okan
Date: Tue, 16 Jul 2013 14:04:44 +0000
Subject: max -> nitems

---
 calmwm.h | 8 ++++----
 conf.c   | 4 ++--
 parse.y  | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/calmwm.h b/calmwm.h
index 1ef7bc9..a544fe0 100644
--- a/calmwm.h
+++ b/calmwm.h
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: calmwm.h,v 1.219 2013/07/15 23:53:19 okan Exp $
+ * $OpenBSD: calmwm.h,v 1.220 2013/07/16 14:04:44 okan Exp $
  */
 
 #ifndef _CALMWM_H_
@@ -103,7 +103,7 @@ enum color {
 	CWM_COLOR_MENU_BG,
 	CWM_COLOR_MENU_FONT,
 	CWM_COLOR_MENU_FONT_SEL,
-	CWM_COLOR_MAX
+	CWM_COLOR_NITEMS
 };
 
 struct geom {
@@ -223,7 +223,7 @@ struct screen_ctx {
 	struct geom		 work; /* workable area, gap-applied */
 	struct gap		 gap;
 	struct cycle_entry_q	 mruq;
-	XftColor		 xftcolor[CWM_COLOR_MAX];
+	XftColor		 xftcolor[CWM_COLOR_NITEMS];
 	XftDraw			*xftdraw;
 	XftFont			*xftfont;
 	int			 xinerama_no;
@@ -297,7 +297,7 @@ struct conf {
 #define	CONF_SNAPDIST			0
 	int			 snapdist;
 	struct gap		 gap;
-	char			*color[CWM_COLOR_MAX];
+	char			*color[CWM_COLOR_NITEMS];
 	char			 termpath[MAXPATHLEN];
 	char			 lockpath[MAXPATHLEN];
 	char			 known_hosts[MAXPATHLEN];
diff --git a/conf.c b/conf.c
index 058feb5..067e4ed 100644
--- a/conf.c
+++ b/conf.c
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: conf.c,v 1.143 2013/07/15 14:50:44 okan Exp $
+ * $OpenBSD: conf.c,v 1.144 2013/07/16 14:04:44 okan Exp $
  */
 
 #include <sys/param.h>
@@ -288,7 +288,7 @@ conf_clear(struct conf *c)
 		free(mb);
 	}
 
-	for (i = 0; i < CWM_COLOR_MAX; i++)
+	for (i = 0; i < CWM_COLOR_NITEMS; i++)
 		free(c->color[i]);
 
 	free(c->font);
diff --git a/parse.y b/parse.y
index 06578e6..1af6f64 100644
--- a/parse.y
+++ b/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.46 2013/07/08 16:32:51 okan Exp $ */
+/*	$OpenBSD: parse.y,v 1.47 2013/07/16 14:04:44 okan Exp $ */
 
 /*
  * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -597,7 +597,7 @@ parse_config(const char *filename, struct conf *xconf)
 		(void)strlcpy(xconf->lockpath, conf->lockpath,
 		    sizeof(xconf->lockpath));
 
-		for (i = 0; i < CWM_COLOR_MAX; i++)
+		for (i = 0; i < CWM_COLOR_NITEMS; i++)
 			xconf->color[i] = conf->color[i];
 
 		xconf->font = conf->font;
-- 
cgit v1.2.3-2-gb3c3