d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hexdump(1): Simplify by using asprintf(3)

Browse Source 
Instead of strlen() + calloc() + snprintf, just use asprintf().
No functional change.

Obtained from:	OpenBSD (CVS Rev. 1.22)
This commit is contained in:
pfg 2016-09-19 18:35:22 +00:00
parent dd3b117843
commit e19ced0f56
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
usr.bin/hexdump/parse.c
View File

@ -208,7 +208,6 @@ rewrite(FS *fs)
unsigned char *p1, *p2, *fmtp; unsigned char *p1, *p2, *fmtp;
char savech, cs[3]; char savech, cs[3];
int nconv, prec; int nconv, prec;
size_t len;
prec = 0; prec = 0;
@ -389,10 +388,8 @@ isint2: switch(fu->bcnt) {
*/ */
savech = *p2; savech = *p2;
p1[0] = '\0'; p1[0] = '\0';
len = strlen(fmtp) + strlen(cs) + 1; if (asprintf(&pr->fmt, "%s%s", fmtp, cs) == -1)
if ((pr->fmt = calloc(1, len)) == NULL)
err(1, NULL); err(1, NULL);
snprintf(pr->fmt, len, "%s%s", fmtp, cs);
*p2 = savech; *p2 = savech;
pr->cchar = pr->fmt + (p1 - fmtp); pr->cchar = pr->fmt + (p1 - fmtp);
fmtp = p2; fmtp = p2;