Module Name: src
Committed By: tron
Date: Wed Feb 20 22:45:13 UTC 2013
Modified Files:
src/external/cddl/osnet/dist/lib/libdtrace/common: dt_printf.c
Log Message:
Fix dodgy arguments to snprintf(3) which cause a warning that breaks
the build (at least with "USE_SSP" set to "yes").
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_printf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/lib/libdtrace/common/dt_printf.c
diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/dt_printf.c:1.3 src/external/cddl/osnet/dist/lib/libdtrace/common/dt_printf.c:1.4
--- src/external/cddl/osnet/dist/lib/libdtrace/common/dt_printf.c:1.3 Sat Feb 27 23:43:52 2010
+++ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_printf.c Wed Feb 20 22:45:12 2013
@@ -1482,11 +1482,15 @@ dt_printf_format(dtrace_hdl_t *dtp, FILE
if (func == pfprint_stack && (pfd->pfd_flags & DT_PFCONV_LEFT))
width = 0;
- if (width != 0)
- f += snprintf(f, sizeof (format), "%d", ABS(width));
+ if (width != 0) {
+ f += snprintf(f, format + sizeof (format) - f,
+ "%d", ABS(width));
+ }
- if (prec > 0)
- f += snprintf(f, sizeof (format), ".%d", prec);
+ if (prec > 0) {
+ f += snprintf(f, format + sizeof (format) - f,
+ ".%d", prec);
+ }
(void) strcpy(f, pfd->pfd_fmt);
pfd->pfd_rec = rec;
