svn commit: r295103 - head/usr.sbin/bsdconfig/share

[Devin Teske]

Author: dteske
Date: Sun Jan 31 21:30:02 2016
New Revision: 295103
URL: https://svnweb.freebsd.org/changeset/base/295103

Log:
  Move f_sprintf() above f_snprintf()
  
  Ordering functions by appearance of use

Modified:
  head/usr.sbin/bsdconfig/share/strings.subr

Modified: head/usr.sbin/bsdconfig/share/strings.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/strings.subr	Sun Jan 31 21:28:41 2016	(r295102)
+++ head/usr.sbin/bsdconfig/share/strings.subr	Sun Jan 31 21:30:02 2016	(r295103)
@@ -139,21 +139,6 @@ f_substr()
 	setvar "$__var_to_set" "$__tmp"
 }
 
-# f_snprintf $var_to_set $size $format [$arguments ...]
-#
-# Similar to snprintf(3), write at most $size number of bytes into $var_to_set
-# using printf(1) syntax (`$format [$arguments ...]').
-#
-f_snprintf()
-{
-	local __var_to_set="$1" __size="$2"
-	shift 2 # var_to_set size
-
-	local __f_snprintf_tmp
-	f_sprintf __f_snprintf_tmp "$@"
-	f_substr "$__var_to_set" "$__f_snprintf_tmp" 1 "$__size"
-}
-
 # f_sprintf $var_to_set $format [$arguments ...]
 #
 # Similar to sprintf(3), write a string into $var_to_set using printf(1) syntax
@@ -174,6 +159,21 @@ f_sprintf()
 	esac
 }
 
+# f_snprintf $var_to_set $size $format [$arguments ...]
+#
+# Similar to snprintf(3), write at most $size number of bytes into $var_to_set
+# using printf(1) syntax (`$format [$arguments ...]').
+#
+f_snprintf()
+{
+	local __var_to_set="$1" __size="$2"
+	shift 2 # var_to_set size
+
+	local __f_snprintf_tmp
+	f_sprintf __f_snprintf_tmp "$@"
+	f_substr "$__var_to_set" "$__f_snprintf_tmp" 1 "$__size"
+}
+
 # f_vsnprintf $var_to_set $size $format $format_args
 #
 # Similar to vsnprintf(3), write at most $size number of bytes into $var_to_set