From 91df00a92543a45a4916cbaeecbbf70bfa946b78 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Mon, 20 Feb 2023 13:46:12 +0100 Subject: Remove ostream_printf By cobbling together the xattr lines manually in libtar, the need (and thus the function itself) are removed. Signed-off-by: David Oberhollenzer --- lib/tar/src/write_header.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'lib/tar/src') diff --git a/lib/tar/src/write_header.c b/lib/tar/src/write_header.c index 5d98686..ed780b5 100644 --- a/lib/tar/src/write_header.c +++ b/lib/tar/src/write_header.c @@ -164,13 +164,21 @@ static int write_schily_xattr(ostream_t *fp, const struct stat *orig, return -1; for (it = xattr; it != NULL; it = it->next) { + char buffer[64]; + len = strlen(prefix) + strlen(it->key) + it->value_len + 3; len += prefix_digit_len(len); - if (ostream_printf(fp, PRI_SZ " %s%s=", - len, prefix, it->key) < 0) { + sprintf(buffer, PRI_SZ " ", len); + + if (ostream_append(fp, buffer, strlen(buffer))) + return -1; + if (ostream_append(fp, prefix, strlen(prefix))) + return -1; + if (ostream_append(fp, it->key, strlen(it->key))) + return -1; + if (ostream_append(fp, "=", 1)) return -1; - } if (ostream_append(fp, it->value, it->value_len)) return -1; if (ostream_append(fp, "\n", 1)) -- cgit v1.2.3