diff options
| author | Karel Zak | 2015-12-15 12:48:30 +0100 |
|---|---|---|
| committer | Karel Zak | 2015-12-15 12:48:30 +0100 |
| commit | 48d20d4dae7c41b1a4e49a491e2d7778b86f0147 (patch) | |
| tree | 84c1a3987f6e1febdd80b33c5c690e0d02db6371 | |
| parent | login, mount: fix __SC_GETPW_R_SIZE_MAX usage (diff) | |
| parent | scols/table_print: restore old stream after printing to str (diff) | |
| download | kernel-qcow2-util-linux-48d20d4dae7c41b1a4e49a491e2d7778b86f0147.tar.gz kernel-qcow2-util-linux-48d20d4dae7c41b1a4e49a491e2d7778b86f0147.tar.xz kernel-qcow2-util-linux-48d20d4dae7c41b1a4e49a491e2d7778b86f0147.zip | |
Merge branch 'scols_print_to_string' of https://github.com/ignatenkobrain/util-linux
| -rw-r--r-- | libsmartcols/src/table_print.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libsmartcols/src/table_print.c b/libsmartcols/src/table_print.c index caae98c14..eca61bc04 100644 --- a/libsmartcols/src/table_print.c +++ b/libsmartcols/src/table_print.c @@ -1062,7 +1062,7 @@ done: int scols_print_table_to_string(struct libscols_table *tb, char **data) { #ifdef HAVE_OPEN_MEMSTREAM - FILE *stream; + FILE *stream, *old_stream; size_t sz; int rc; @@ -1076,9 +1076,11 @@ int scols_print_table_to_string(struct libscols_table *tb, char **data) if (!stream) return -ENOMEM; + old_stream = scols_table_get_stream(tb); scols_table_set_stream(tb, stream); rc = scols_print_table(tb); fclose(stream); + scols_table_set_stream(tb, old_stream); return rc; #else |