Convert to use the <sys/queue.h> macros rather than fiddling with the queue

structure internals.

Reviewed by:	markm

2 files changed, 4 insertions, 4 deletions

diff --git a/usr.sbin/pw/pw.c b/usr.sbin/pw/pw.c
index ca3a10a..dd23df9 100644
--- a/usr.sbin/pw/pw.c
+++ b/usr.sbin/pw/pw.c
@@ -420,10 +420,10 @@ cmdhelp(int mode, int which)
 struct carg    *
 getarg(struct cargs * _args, int ch)
 {
-	struct carg    *c = _args->lh_first;
+	struct carg    *c = LIST_FIRST(_args);
 
 	while (c != NULL && c->ch != ch)
-		c = c->list.le_next;
+		c = LIST_NEXT(c, list);
 	return c;
 }
 
diff --git a/usr.sbin/pw/pw_user.c b/usr.sbin/pw/pw_user.c
index c4e66b4..26615b7 100644
--- a/usr.sbin/pw/pw_user.c
+++ b/usr.sbin/pw/pw_user.c
@@ -891,9 +891,9 @@ pw_gidpolicy(struct userconf * cnf, struct cargs * args, char *nam, gid_t prefer
 			if ((grp = GETGRNAM(nam)) != NULL)
 				gid = grp->gr_gid;
 		}
-		a_gid = grpargs.lh_first;
+		a_gid = LIST_FIRST(&grpargs);
 		while (a_gid != NULL) {
-			struct carg    *t = a_gid->list.le_next;
+			struct carg    *t = LIST_NEXT(a_gid, list);
 			LIST_REMOVE(a_gid, list);
 			a_gid = t;
 		}