diff options
| author | Renato Botelho <renato@netgate.com> | 2015-12-01 08:32:21 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-12-01 08:32:21 -0200 |
| commit | 695ea8099809439ed40fe35451df301d75e2b39e (patch) | |
| tree | f5d371838e7b09643ac854d4c84c96d401175010 /lib/libc/stdio | |
| parent | 2572e1a27934f3539d0356653fcac9aa6b03b80e (diff) | |
| parent | ff68307fb48ebed764757b9f0ff301df2f3d8825 (diff) | |
| download | FreeBSD-src-695ea8099809439ed40fe35451df301d75e2b39e.zip FreeBSD-src-695ea8099809439ed40fe35451df301d75e2b39e.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'lib/libc/stdio')
| -rw-r--r-- | lib/libc/stdio/getline.3 | 1 | ||||
| -rw-r--r-- | lib/libc/stdio/xprintf_float.c | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/lib/libc/stdio/getline.3 b/lib/libc/stdio/getline.3 index 2161999..05f07d0 100644 --- a/lib/libc/stdio/getline.3 +++ b/lib/libc/stdio/getline.3 @@ -95,6 +95,7 @@ size_t linecap = 0; ssize_t linelen; while ((linelen = getline(&line, &linecap, fp)) > 0) fwrite(line, linelen, 1, stdout); +free(line); .Ed .Sh COMPATIBILITY Many application writers used the name diff --git a/lib/libc/stdio/xprintf_float.c b/lib/libc/stdio/xprintf_float.c index b719aac..ad17eb2 100644 --- a/lib/libc/stdio/xprintf_float.c +++ b/lib/libc/stdio/xprintf_float.c @@ -168,7 +168,6 @@ __printf_render_float(struct __printf_io *io, const struct printf_info *pi, cons int realsz; /* field size expanded by dprec, sign, etc */ int dprec; /* a copy of prec if [diouxX], 0 otherwise */ char ox[2]; /* space for 0x; ox[1] is either x, X, or \0 */ - int prsize; /* max size of printed field */ int ret; /* return value accumulator */ char *decimal_point; /* locale specific decimal point */ int n2; /* XXX: for PRINTANDPAD */ @@ -344,8 +343,6 @@ here: if (ox[1]) realsz += 2; - prsize = pi->width > realsz ? pi->width : realsz; - /* right-adjusting blank padding */ if (pi->pad != '0' && pi->left == 0) ret += __printf_pad(io, pi->width - realsz, 0); |
