From bd46f64dcb2cf4f37c2cbfeb808f4e380d9d5931 Mon Sep 17 00:00:00 2001 From: Joachim Nilsson Date: Sat, 9 May 2020 13:31:33 +0200 Subject: archival: avoid std namespace for local includes Avoid using same include file naming pattern as available in GLIBC. Renamed to match grp_.h et al. Signed-off-by: Joachim Nilsson Signed-off-by: Denys Vlasenko --- archival/ar.c | 2 +- archival/libarchive/get_header_ar.c | 2 +- archival/libarchive/unpack_ar_archive.c | 2 +- include/ar.h | 26 -------------------------- include/ar_.h | 26 ++++++++++++++++++++++++++ 5 files changed, 29 insertions(+), 29 deletions(-) delete mode 100644 include/ar.h create mode 100644 include/ar_.h diff --git a/archival/ar.c b/archival/ar.c index f4edeb087..2839d85d5 100644 --- a/archival/ar.c +++ b/archival/ar.c @@ -60,7 +60,7 @@ #include "libbb.h" #include "bb_archive.h" -#include "ar.h" +#include "ar_.h" #if ENABLE_FEATURE_AR_CREATE /* filter out entries with same names as specified on the command line */ diff --git a/archival/libarchive/get_header_ar.c b/archival/libarchive/get_header_ar.c index b6ecd596c..3a19d6ff7 100644 --- a/archival/libarchive/get_header_ar.c +++ b/archival/libarchive/get_header_ar.c @@ -6,7 +6,7 @@ */ #include "libbb.h" #include "bb_archive.h" -#include "ar.h" +#include "ar_.h" /* WARNING: Clobbers str[len], so fields must be read in reverse order! */ static unsigned read_num(char *str, int base, int len) diff --git a/archival/libarchive/unpack_ar_archive.c b/archival/libarchive/unpack_ar_archive.c index 584c18ce8..125d424c9 100644 --- a/archival/libarchive/unpack_ar_archive.c +++ b/archival/libarchive/unpack_ar_archive.c @@ -4,7 +4,7 @@ */ #include "libbb.h" #include "bb_archive.h" -#include "ar.h" +#include "ar_.h" void FAST_FUNC unpack_ar_archive(archive_handle_t *ar_archive) { diff --git a/include/ar.h b/include/ar.h deleted file mode 100644 index 386fe0456..000000000 --- a/include/ar.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * busybox ar archive data structures - * Licensed under GPLv2 or later, see file LICENSE in this source tree. - */ -#ifndef AR_H -#define AR_H - -PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN - -struct ar_header { - char name[16]; - char date[12]; - char uid[6]; - char gid[6]; - char mode[8]; - char size[10]; - char magic[2]; -}; - -#define AR_HEADER_LEN sizeof(struct ar_header) -#define AR_MAGIC "!" -#define AR_MAGIC_LEN 7 - -POP_SAVED_FUNCTION_VISIBILITY - -#endif diff --git a/include/ar_.h b/include/ar_.h new file mode 100644 index 000000000..386fe0456 --- /dev/null +++ b/include/ar_.h @@ -0,0 +1,26 @@ +/* + * busybox ar archive data structures + * Licensed under GPLv2 or later, see file LICENSE in this source tree. + */ +#ifndef AR_H +#define AR_H + +PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN + +struct ar_header { + char name[16]; + char date[12]; + char uid[6]; + char gid[6]; + char mode[8]; + char size[10]; + char magic[2]; +}; + +#define AR_HEADER_LEN sizeof(struct ar_header) +#define AR_MAGIC "!" +#define AR_MAGIC_LEN 7 + +POP_SAVED_FUNCTION_VISIBILITY + +#endif -- cgit v1.2.3