svn commit: r268881 - stable/10/lib/libc/stdlib

Pedro F. Giffuni pfg at FreeBSD.org
Sat Jul 19 15:12:38 UTC 2014


Author: pfg
Date: Sat Jul 19 15:12:38 2014
New Revision: 268881
URL: http://svnweb.freebsd.org/changeset/base/268881

Log:
  MFC	r268569:
  strfmon: reduce unnecessary snprintf.
  
  No need for the snprintf/asprintf dance; use fixed width formats.
  
  Obtained from:	NetBSD (CVS rev. 1.8)

Modified:
  stable/10/lib/libc/stdlib/strfmon.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libc/stdlib/strfmon.c
==============================================================================
--- stable/10/lib/libc/stdlib/strfmon.c	Sat Jul 19 15:11:58 2014	(r268880)
+++ stable/10/lib/libc/stdlib/strfmon.c	Sat Jul 19 15:12:38 2014	(r268881)
@@ -526,7 +526,6 @@ __format_grouped_double(double value, in
 	char		*rslt;
 	char		*avalue;
 	int		avalue_size;
-	char		fmt[32];
 
 	size_t		bufsize;
 	char		*bufend;
@@ -567,14 +566,13 @@ __format_grouped_double(double value, in
 		left_prec += get_groups(left_prec, grouping);
 
 	/* convert to string */
-	snprintf(fmt, sizeof(fmt), "%%%d.%df", left_prec + right_prec + 1,
-	    right_prec);
-	avalue_size = asprintf(&avalue, fmt, value);
+	avalue_size = asprintf(&avalue, "%*.*f", left_prec + right_prec + 1,
+	    right_prec, value);
 	if (avalue_size < 0)
 		return (NULL);
 
 	/* make sure that we've enough space for result string */
-	bufsize = strlen(avalue)*2+1;
+	bufsize = avalue_size * 2 + 1;
 	rslt = calloc(1, bufsize);
 	if (rslt == NULL) {
 		free(avalue);


More information about the svn-src-stable-10 mailing list