diff options
| author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2023-02-20 13:46:12 +0100 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2023-02-20 13:46:12 +0100 |
| commit | 91df00a92543a45a4916cbaeecbbf70bfa946b78 (patch) | |
| tree | fe7da4b37b97bd61c677c322e9fe171f59bdddac /include | |
| parent | 8bb081ad46bc9ce4387f8efed2d0f13690b4c143 (diff) | |
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 <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'include')
| -rw-r--r-- | include/compat.h | 8 | ||||
| -rw-r--r-- | include/io/ostream.h | 20 |
2 files changed, 7 insertions, 21 deletions
diff --git a/include/compat.h b/include/compat.h index 8969d6c..7d0a646 100644 --- a/include/compat.h +++ b/include/compat.h @@ -8,12 +8,18 @@ #define COMPAT_H #include "sqfs/predef.h" -#include "io/ostream.h" #include "config.h" #include <limits.h> #include <stdio.h> +#if defined(__GNUC__) || defined(__clang__) +# define PRINTF_ATTRIB(fmt, elipsis) \ + __attribute__ ((format (printf, fmt, elipsis))) +#else +# define PRINTF_ATTRIB(fmt, elipsis) +#endif + #if defined(__GNUC__) && __GNUC__ >= 5 # define SZ_ADD_OV __builtin_add_overflow # define SZ_MUL_OV __builtin_mul_overflow diff --git a/include/io/ostream.h b/include/io/ostream.h index 21850d4..c1602ab 100644 --- a/include/io/ostream.h +++ b/include/io/ostream.h @@ -10,13 +10,6 @@ #include "sqfs/predef.h" #include "io/istream.h" -#if defined(__GNUC__) || defined(__clang__) -# define PRINTF_ATTRIB(fmt, elipsis) \ - __attribute__ ((format (printf, fmt, elipsis))) -#else -# define PRINTF_ATTRIB(fmt, elipsis) -#endif - /** * @struct ostream_t * @@ -112,19 +105,6 @@ SQFS_INLINE const char *ostream_get_filename(ostream_t *strm) } /** - * @brief Printf like function that appends to an output stream - * - * @memberof ostream_t - * - * @param strm The output stream to append to. - * @param fmt A printf style format string. - * - * @return The number of characters written on success, -1 on failure. - */ -SQFS_INTERNAL int ostream_printf(ostream_t *strm, const char *fmt, ...) - PRINTF_ATTRIB(2, 3); - -/** * @brief Read data from an input stream and append it to an output stream * * @memberof ostream_t |