svn commit: r262927 - stable/9/usr.bin/hexdump

[Christian Brueffer]

Author: brueffer
Date: Sat Mar  8 12:25:45 2014
New Revision: 262927
URL: http://svnweb.freebsd.org/changeset/base/262927

Log:
  MFC: r262333
  
  Simplify the way the end of a singly linked list is followed (for adding
  items), so it is more obvious that we aren't going to indirect through
  a NULL pointer.
  
  PR:             144723
  Submitted by:   Garrett Cooper <yaneurabeya at gmail.com>
  Obtained from:  NetBSD r1.19

Modified:
  stable/9/usr.bin/hexdump/parse.c
Directory Properties:
  stable/9/usr.bin/hexdump/   (props changed)

Modified: stable/9/usr.bin/hexdump/parse.c
==============================================================================
--- stable/9/usr.bin/hexdump/parse.c	Sat Mar  8 12:24:47 2014	(r262926)
+++ stable/9/usr.bin/hexdump/parse.c	Sat Mar  8 12:25:45 2014	(r262927)
@@ -210,7 +210,6 @@ rewrite(FS *fs)
 	int nconv, prec;
 	size_t len;
 
-	nextpr = NULL;
 	prec = 0;
 
 	for (fu = fs->nextfu; fu; fu = fu->nextfu) {
@@ -218,13 +217,11 @@ rewrite(FS *fs)
 		 * Break each format unit into print units; each conversion
 		 * character gets its own.
 		 */
+		nextpr = &fu->nextpr;
 		for (nconv = 0, fmtp = fu->fmt; *fmtp; nextpr = &pr->nextpr) {
 			if ((pr = calloc(1, sizeof(PR))) == NULL)
 				err(1, NULL);
-			if (!fu->nextpr)
-				fu->nextpr = pr;
-			else
-				*nextpr = pr;
+			*nextpr = pr;
 
 			/* Skip preceding text and up to the next % sign. */
 			for (p1 = fmtp; *p1 && *p1 != '%'; ++p1);