Author: pfg
Date: Mon Sep 19 18:35:22 2016
New Revision: 305990
URL: https://svnweb.freebsd.org/changeset/base/305990
Log:
hexdump(1): Simplify by using asprintf(3)
Instead of strlen() + calloc() + snprintf, just use asprintf().
No functional change.
Obtained from: OpenBSD (CVS Rev. 1.22)
Modified:
head/usr.bin/hexdump/parse.c
Modified: head/usr.bin/hexdump/parse.c
==============================================================================
--- head/usr.bin/hexdump/parse.c Mon Sep 19 17:51:56 2016
(r305989)
+++ head/usr.bin/hexdump/parse.c Mon Sep 19 18:35:22 2016
(r305990)
@@ -208,7 +208,6 @@ rewrite(FS *fs)
unsigned char *p1, *p2, *fmtp;
char savech, cs[3];
int nconv, prec;
- size_t len;
prec = 0;
@@ -389,10 +388,8 @@ isint2:
switch(fu->bcnt) {
*/
savech = *p2;
p1[0] = '\0';
- len = strlen(fmtp) + strlen(cs) + 1;
- if ((pr->fmt = calloc(1, len)) == NULL)
+ if (asprintf(&pr->fmt, "%s%s", fmtp, cs) == -1)
err(1, NULL);
- snprintf(pr->fmt, len, "%s%s", fmtp, cs);
*p2 = savech;
pr->cchar = pr->fmt + (p1 - fmtp);
fmtp = p2;
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
