 @@ -1,14 +1,14 @@
-/*	$NetBSD: gencat.c,v 1.35 2012/03/09 18:54:28 ginsbach Exp $	*/
+/*	$NetBSD: gencat.c,v 1.36 2013/11/27 17:38:11 apb Exp $	*/
 /*
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by J.T. Conklin.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -21,27 +21,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: gencat.c,v 1.35 2012/03/09 18:54:28 ginsbach Exp $");
+__RCSID("$NetBSD: gencat.c,v 1.36 2013/11/27 17:38:11 apb Exp $");
 #endif
 /***********************************************************
 Copyright 1990, by Alfalfa Software Incorporated, Cambridge, Massachusetts.
                         All Rights Reserved
 Permission to use, copy, modify, and distribute this software and its
 documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
 both that copyright notice and this permission notice appear in
 supporting documentation, and that Alfalfa's name not be used in
 advertising or publicity pertaining to distribution of the software
 @@ -98,27 +98,27 @@ up-to-date.  Many thanks.
 struct _msgT {
 	long    msgId;
 	char   *str;
         LIST_ENTRY(_msgT) entries;
 };
 struct _setT {
 	long    setId;
         LIST_HEAD(msghead, _msgT) msghead;
         LIST_ENTRY(_setT) entries;
 };
-static LIST_HEAD(sethead, _setT) sethead;
+static LIST_HEAD(sethead, _setT) sethead = LIST_HEAD_INITIALIZER(sethead);
 static struct _setT *curSet;
 static const char *curfile;
 static char *curline = NULL;
 static long lineno = 0;
 static	char   *cskip(char *);
 __dead static	void	error(const char *);
 static	char   *get_line(int);
 static	char   *getmsg(int, char *, char);
 static	void	warning(const char *, const char *);
 static	char   *wskip(char *);
 static	char   *xstrdup(const char *);
 @@ -460,28 +460,26 @@ getmsg(int fd, char *cptr, char quote)
 	*tptr = '\0';
 	return (msg);
+}
 static void
 MCParse(int fd)
+{
 	char   *cptr, *str;
 	int	msgid = 0;
 	int     setid = 0;
 	char    quote = 0;
 	/* XXX: init sethead? */
 	while ((cptr = get_line(fd))) {
 		if (*cptr == '$') {
 			++cptr;
 			if (strncmp(cptr, "set", 3) == 0) {
 				cptr += 3;
 				cptr = wskip(cptr);
 				setid = atoi(cptr);
 				MCAddSet(setid);
 				msgid = 0;
 			} else if (strncmp(cptr, "delset", 6) == 0) {
 				cptr += 6;
 				cptr = wskip(cptr);
 				setid = atoi(cptr);
 @@ -555,28 +553,26 @@ MCParse(int fd)
 static void
 MCReadCat(int fd)
+{
 	void   *msgcat;		/* message catalog data */
 	struct _nls_cat_hdr cat_hdr;
 	struct _nls_set_hdr *set_hdr;
 	struct _nls_msg_hdr *msg_hdr;
 	char   *strings;
 	ssize_t	n;
 	int	m, s;
 	int	msgno, setno;
 	/* XXX init sethead? */
 	n = read(fd, &cat_hdr, sizeof(cat_hdr));
 	if (n < (ssize_t)sizeof(cat_hdr)) {
 		if (n == 0)
 			return;		/* empty file */
 		else if (n == -1)
 			err(1, "header read");
 		else
 			errx(1, CORRUPT);
+	}
 	if (ntohl((uint32_t)cat_hdr.__magic) != _NLS_MAGIC)
 		errx(1, "%s: bad magic number (%#x)", CORRUPT, cat_hdr.__magic);
 	cat_hdr.__mem = ntohl(cat_hdr.__mem);
 @@ -664,32 +660,30 @@ MCWriteCat(int fd)
 	struct _nls_msg_hdr *msg_hdr;
 	char   *strings;
 	struct _setT *set;
 	struct _msgT *msg;
 	int     msg_index;
 	int     msg_offset;
 	/* determine number of sets, number of messages, and size of the
 	 * string pool */
 	nsets = 0;
 	nmsgs = 0;
 	string_size = 0;
-	for (set = sethead.lh_first; set != NULL;
+	LIST_FOREACH(set, &sethead, entries) {
 	    set = set->entries.le_next) {
 		nsets++;
-		for (msg = set->msghead.lh_first; msg != NULL;
+		LIST_FOREACH(msg, &set->msghead, entries) {
 		    msg = msg->entries.le_next) {
 			nmsgs++;
 			string_size += strlen(msg->str) + 1;
+		}
+	}
 #ifdef DEBUG
 	printf("number of sets: %d\n", nsets);
 	printf("number of msgs: %d\n", nmsgs);
 	printf("string pool size: %d\n", string_size);
 #endif
 	/* determine size and then allocate buffer for constructing external
 	 * message catalog representation */
 @@ -715,32 +709,30 @@ MCWriteCat(int fd)
 	/* compute offsets for set & msg header tables and string pool */
 	set_hdr = (struct _nls_set_hdr *) ((char *) msgcat +
 	    sizeof(struct _nls_cat_hdr));
 	msg_hdr = (struct _nls_msg_hdr *) ((char *) msgcat +
 	    sizeof(struct _nls_cat_hdr) +
 	    nsets * sizeof(struct _nls_set_hdr));
 	strings = (char *) msgcat +
 	    sizeof(struct _nls_cat_hdr) +
 	    nsets * sizeof(struct _nls_set_hdr) +
 	    nmsgs * sizeof(struct _nls_msg_hdr);
 	msg_index = 0;
 	msg_offset = 0;
-	for (set = sethead.lh_first; set != NULL;
+	LIST_FOREACH(set, &sethead, entries) {
 	    set = set->entries.le_next) {
 		nmsgs = 0;
-		for (msg = set->msghead.lh_first; msg != NULL;
+		LIST_FOREACH(msg, &set->msghead, entries) {
 		    msg = msg->entries.le_next) {
 			int32_t     msg_len = strlen(msg->str) + 1;
 			msg_hdr->__msgno = htonl(msg->msgId);
 			msg_hdr->__msglen = htonl(msg_len);
 			msg_hdr->__offset = htonl(msg_offset);
 			memcpy(strings, msg->str, msg_len);
 			strings += msg_len;
 			msg_offset += msg_len;
 			nmsgs++;
 			msg_hdr++;
+		}
 @@ -760,29 +752,30 @@ static void
 MCAddSet(int setId)
+{
 	struct _setT *p, *q;
 	if (setId <= 0) {
 		error("setId's must be greater than zero");
 		/* NOTREACHED */
+	}
 	if (setId > NL_SETMAX) {
 		error("setId exceeds limit");
 		/* NOTREACHED */
+	}
-	p = sethead.lh_first;
+	p = LIST_FIRST(&sethead);
 	q = NULL;
-	for (; p != NULL && p->setId < setId; q = p, p = p->entries.le_next);
+	for (; p != NULL && p->setId < setId; q = p, p = LIST_NEXT(p, entries))
 		continue;
 	if (p && p->setId == setId) {
+		;
 	} else {
 		p = xmalloc(sizeof(struct _setT));
 		memset(p, '\0', sizeof(struct _setT));
 		LIST_INIT(&p->msghead);
 		p->setId = setId;
 		if (q == NULL) {
 			LIST_INSERT_HEAD(&sethead, p, entries);
 		} else {
 @@ -800,29 +793,30 @@ MCAddMsg(int msgId, const char *str)
 	if (!curSet)
 		error("can't specify a message when no set exists");
 	if (msgId <= 0) {
 		error("msgId's must be greater than zero");
 		/* NOTREACHED */
+	}
 	if (msgId > NL_MSGMAX) {
 		error("msgID exceeds limit");
 		/* NOTREACHED */
+	}
-	p = curSet->msghead.lh_first;
+	p = LIST_FIRST(&curSet->msghead);
 	q = NULL;
-	for (; p != NULL && p->msgId < msgId; q = p, p = p->entries.le_next);
+	for (; p != NULL && p->msgId < msgId; q = p, p = LIST_NEXT(p, entries))
 		continue;
 	if (p && p->msgId == msgId) {
 		free(p->str);
 	} else {
 		p = xmalloc(sizeof(struct _msgT));
 		memset(p, '\0', sizeof(struct _msgT));
 		if (q == NULL) {
 			LIST_INSERT_HEAD(&curSet->msghead, p, entries);
 		} else {
 			LIST_INSERT_AFTER(q, p, entries);
+		}
+	}
 @@ -836,48 +830,50 @@ MCDelSet(int setId)
+{
 	struct _setT *set;
 	struct _msgT *msg;
 	if (setId <= 0) {
 		error("setId's must be greater than zero");
 		/* NOTREACHED */
+	}
 	if (setId > NL_SETMAX) {
 		error("setId exceeds limit");
 		/* NOTREACHED */
+	}
-	set = sethead.lh_first;
+	set = LIST_FIRST(&sethead);
-	for (; set != NULL && set->setId < setId; set = set->entries.le_next);
+	for (; set != NULL && set->setId < setId; set = LIST_NEXT(set, entries))
 		continue;
 	if (set && set->setId == setId) {
 		LIST_REMOVE(set, entries);
-		while ((msg = set->msghead.lh_first) != NULL) {
+		while ((msg = LIST_FIRST(&set->msghead)) != NULL) {
 			LIST_REMOVE(msg, entries);
 			free(msg->str);
 			free(msg);
+		}
 		free(set);
 		return;
+	}
 	warning(NULL, "specified set doesn't exist");
+}
 static void
 MCDelMsg(int msgId)
+{
 	struct _msgT *msg;
 	if (!curSet)
 		error("you can't delete a message before defining the set");
-	msg = curSet->msghead.lh_first;
+	msg = LIST_FIRST(&curSet->msghead);
-	for (; msg != NULL && msg->msgId < msgId; msg = msg->entries.le_next);
+	for (; msg != NULL && msg->msgId < msgId; msg = LIST_NEXT(msg, entries))
 		continue;
 	if (msg && msg->msgId == msgId) {
 		LIST_REMOVE(msg, entries);
 		free(msg->str);
 		free(msg);
 		return;
+	}
 	warning(NULL, "specified msg doesn't exist");
+}