diff options
Diffstat (limited to 'src/fe_utils/print.c')
| -rw-r--r-- | src/fe_utils/print.c | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/src/fe_utils/print.c b/src/fe_utils/print.c index 66a50f183f5..508f537c0c7 100644 --- a/src/fe_utils/print.c +++ b/src/fe_utils/print.c @@ -305,20 +305,6 @@ format_numeric_locale(const char *my_str) } -/* - * fputnbytes: print exactly N bytes to a file - * - * We avoid using %.*s here because it can misbehave if the data - * is not valid in what libc thinks is the prevailing encoding. - */ -static void -fputnbytes(FILE *f, const char *str, size_t n) -{ - while (n-- > 0) - fputc(*str++, f); -} - - static void print_separator(struct separator sep, FILE *fout) { @@ -1042,16 +1028,14 @@ print_aligned_text(const printTableContent *cont, FILE *fout, bool is_pager) { /* spaces first */ fprintf(fout, "%*s", width_wrap[j] - chars_to_output, ""); - fputnbytes(fout, - (char *) (this_line->ptr + bytes_output[j]), - bytes_to_output); + fwrite((char *) (this_line->ptr + bytes_output[j]), + 1, bytes_to_output, fout); } else /* Left aligned cell */ { /* spaces second */ - fputnbytes(fout, - (char *) (this_line->ptr + bytes_output[j]), - bytes_to_output); + fwrite((char *) (this_line->ptr + bytes_output[j]), + 1, bytes_to_output, fout); } bytes_output[j] += bytes_to_output; @@ -1637,8 +1621,8 @@ print_aligned_vertical(const printTableContent *cont, */ bytes_to_output = strlen_max_width(dlineptr[dline].ptr + offset, &target_width, encoding); - fputnbytes(fout, (char *) (dlineptr[dline].ptr + offset), - bytes_to_output); + fwrite((char *) (dlineptr[dline].ptr + offset), + 1, bytes_to_output, fout); chars_to_output -= target_width; offset += bytes_to_output; |