aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorDevin Teske <dteske@FreeBSD.org>2016-01-31 21:30:02 +0000
committerDevin Teske <dteske@FreeBSD.org>2016-01-31 21:30:02 +0000
commit3c8cd13bf135ac6095428c1010a2b39c4485e9ec (patch)
tree43001f1e0ffe4fd449d0daf153712e081c7ef67c /usr.sbin
parent0cb8bea7ed1ff70957b0c99e86cd0ce1988b2948 (diff)
downloadsrc-3c8cd13bf135ac6095428c1010a2b39c4485e9ec.tar.gz
src-3c8cd13bf135ac6095428c1010a2b39c4485e9ec.zip
Move f_sprintf() above f_snprintf()
Ordering functions by appearance of use
Notes
Notes: svn path=/head/; revision=295103
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/bsdconfig/share/strings.subr30
1 files changed, 15 insertions, 15 deletions
diff --git a/usr.sbin/bsdconfig/share/strings.subr b/usr.sbin/bsdconfig/share/strings.subr
index bb2e95d15579..4237f42aee0f 100644
--- a/usr.sbin/bsdconfig/share/strings.subr
+++ b/usr.sbin/bsdconfig/share/strings.subr
@@ -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