move platform depended include into system.h of libelf

All of these files either #include <system.h> directly or #include "libelfP.h"
And now "libelfP.h also #include <system.h>, so the platform depended include
can be moved to system.h safely

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 36c3131ff6a95d3b06f53478889691aa6c4404de..e4f00a8f4968000082c1f35fd774b4a153b6075e 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,13 @@
+2022-10-16  Yonggang Luo  <luoyonggang@gmail.com>
+
+       * system.h: Add sys/mman.h as system dependend header.
+       * common.h: Remove ar.h, byteswap.h and endian.h.
+       * elf32_checksum.c: Remove endian.h.
+       * elf32_getphdr.c: Remove unistd.h and system.h.
+       * elf32_getshdr.c: Remove unistd.h.h and system.h.
+       * elf32_updatefile.c: Remove unistd.h, sys/mman.h and system.h.
+       * elf32_updatenull.c: Remove endian.h and system.h.
+
 2022-08-05  Mark Wielaard  <mark@klomp.org>
 
        * dynamicsizehash_concurrent.c (resize_helper): Add documentation.

diff --git a/lib/system.h b/lib/system.h
index d3f42c91913002aadd1740cfcae4ac8b98a4a452..48004df19e99877d97c8076ea14b998ef8dc3235 100644 (file)
--- a/lib/system.h
+++ b/lib/system.h
@@ -35,14 +35,17 @@
 #include <errno.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <sys/param.h>
-#include <endian.h>
-#include <byteswap.h>
-#include <unistd.h>
 #include <string.h>
 #include <stdarg.h>
 #include <stdlib.h>
 
+/* System dependend headers */
+#include <byteswap.h>
+#include <endian.h>
+#include <sys/mman.h>
+#include <sys/param.h>
+#include <unistd.h>
+
 #if defined(HAVE_ERROR_H)
 #include <error.h>
 #elif defined(HAVE_ERR_H)

diff --git a/libelf/ChangeLog b/libelf/ChangeLog
index 558d795eb6bcb3d660490d141afbfdc1c89dcb99..1c6c492111397c9b95c0a1b0e0b2090c916cc4ed 100644 (file)
--- a/libelf/ChangeLog
+++ b/libelf/ChangeLog
@@ -1,3 +1,28 @@
+2022-10-16  Yonggang Luo  <luoyonggang@gmail.com>
+
+       * common.h: Remove ar.h, byteswap.h and endian.h.
+       * elf32_checksum.c: Remove endian.h.
+       * elf32_getphdr.c: Remove unistd.h and system.h.
+       * elf32_getshdr.c: Remove unistd.h.h and system.h.
+       * elf32_updatefile.c: Remove unistd.h, sys/mman.h and system.h.
+       * elf32_updatenull.c: Remove endian.h and system.h.
+       * elf32_xlatetof.c: Remove endian.h.
+       * elf32_xlatetom.c: Likewise.
+       * elf_begin.c: Remove unistd.h, sys/mman.h and system.h.
+       * elf_cntl.c: Remove unistd.h.
+       * elf_compress.c: Remove system.h and unistd.h.
+       * elf_end.c: Remove sys.mman.h.
+       * elf_getarsym.c: Remove byteswap.h, endian.h, unistd.h and
+       system.h.
+       * elf_getdata.c: Remove unistd.h and system.h.
+       * elf_getdata_rawchunk.c: Remove unistd.h and system.h.
+       * elf_getshdrstrndx.c: Likewise.
+       * elf_readall.c: Likewise.
+       * elf_update.c: Remove unistd.h and sys/mman.h.
+       * gelf_xlate.c: Remove byteswap.h.
+       * libelfP.h: Add system.h.
+       * nlist.c: Remove unistd.h.
+
 2022-08-28  Mark Wielaard  <mark@klomp.org>
 
        * elf_begin.c (__libelf_next_arhdr_wrlock): Add OCT_FIELD macro,

diff --git a/libelf/common.h b/libelf/common.h
index 3718b3fd036ec2b8e48b6b4ab21031163610c665..4561854fb3f7bb451b3d38b88af8258d0f02d3e1 100644 (file)
--- a/libelf/common.h
+++ b/libelf/common.h
@@ -30,9 +30,6 @@
 #ifndef _COMMON_H
 #define _COMMON_H       1
 
-#include <ar.h>
-#include <byteswap.h>
-#include <endian.h>
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/libelf/elf32_checksum.c b/libelf/elf32_checksum.c
index c5f27bbe2ef4ab03b53b4b785e3f872fa17ff736..521668a7485c4311e2c0e026d336ad7b49ac2e00 100644 (file)
--- a/libelf/elf32_checksum.c
+++ b/libelf/elf32_checksum.c
@@ -32,7 +32,6 @@
 #endif
 
 #include <assert.h>
-#include <endian.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <string.h>

diff --git a/libelf/elf32_getphdr.c b/libelf/elf32_getphdr.c
index 99b4ac09a85fe2c622d8d4a2344529226c3350ce..4bfca24b8d06e708087da4dc927f77d0cb2d2f9b 100644 (file)
--- a/libelf/elf32_getphdr.c
+++ b/libelf/elf32_getphdr.c
@@ -34,10 +34,8 @@
 #include <errno.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <assert.h>
 
-#include <system.h>
 #include "libelfP.h"
 #include "common.h"
 

diff --git a/libelf/elf32_getshdr.c b/libelf/elf32_getshdr.c
index 237d912261ee23cbe81be216eeabc373fc6c65c6..fc696302b8b69ff39c13e114cd6a06a675d1c9f3 100644 (file)
--- a/libelf/elf32_getshdr.c
+++ b/libelf/elf32_getshdr.c
@@ -34,9 +34,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <stdbool.h>
-#include <unistd.h>
 
-#include <system.h>
 #include "libelfP.h"
 #include "common.h"
 

diff --git a/libelf/elf32_updatefile.c b/libelf/elf32_updatefile.c
index 1ff589004f76745b4a2ac9626aa8722df241e299..46afa1f4e275732c293701090967850c78393e70 100644 (file)
--- a/libelf/elf32_updatefile.c
+++ b/libelf/elf32_updatefile.c
@@ -37,10 +37,7 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
-#include <sys/mman.h>
 
-#include <system.h>
 #include "libelfP.h"
 
 

diff --git a/libelf/elf32_updatenull.c b/libelf/elf32_updatenull.c
index d0d4d1eb6f33f7562fc71eb58172fa1b7f8627e2..6c06e5e4bc02fe5650f092b540090e79ad4aa910 100644 (file)
--- a/libelf/elf32_updatenull.c
+++ b/libelf/elf32_updatenull.c
@@ -32,12 +32,10 @@
 #endif
 
 #include <assert.h>
-#include <endian.h>
 #include <libelf.h>
 #include <stdbool.h>
 #include <string.h>
 
-#include <system.h>
 #include "libelfP.h"
 #include "elf-knowledge.h"
 

diff --git a/libelf/elf32_xlatetof.c b/libelf/elf32_xlatetof.c
index 082d833feae9020c8ebed8c99e696deb3dd3f31e..377659c8955594c2411768a071c65bc3e47f79c4 100644 (file)
--- a/libelf/elf32_xlatetof.c
+++ b/libelf/elf32_xlatetof.c
@@ -32,7 +32,6 @@
 #endif
 
 #include <assert.h>
-#include <endian.h>
 #include <string.h>
 
 #include "libelfP.h"

diff --git a/libelf/elf32_xlatetom.c b/libelf/elf32_xlatetom.c
index cb0bb8d524037549a9707b3c132f32ec5aacd422..fa3dc9a724a1565ef1a08121895c0e25797f0275 100644 (file)
--- a/libelf/elf32_xlatetom.c
+++ b/libelf/elf32_xlatetom.c
@@ -32,7 +32,6 @@
 #endif
 
 #include <assert.h>
-#include <endian.h>
 #include <string.h>
 
 #include "libelfP.h"

diff --git a/libelf/elf_begin.c b/libelf/elf_begin.c
index 71eb3594f11744c4be35e65ee546210c0023dca3..fe8c640a8107d941deed62ec9cee8fcf012e585c 100644 (file)
--- a/libelf/elf_begin.c
+++ b/libelf/elf_begin.c
@@ -39,11 +39,8 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <string.h>
-#include <unistd.h>
-#include <sys/mman.h>
 #include <sys/stat.h>
 
-#include <system.h>
 #include "libelfP.h"
 #include "common.h"
 

diff --git a/libelf/elf_cntl.c b/libelf/elf_cntl.c
index fd681789ff5f818f4c8a8fee29e042f8ecdf1427..04aa913205160cba1e6c36ec7dec33cec2894c24 100644 (file)
--- a/libelf/elf_cntl.c
+++ b/libelf/elf_cntl.c
@@ -31,8 +31,6 @@
 # include <config.h>
 #endif
 
-#include <unistd.h>
-
 #include "libelfP.h"
 
 

diff --git a/libelf/elf_compress.c b/libelf/elf_compress.c
index df0144e88188b525c10131da1e0f55e96e1a2495..d7f53af2a60401ab0f14707a3f37d0dfbe769859 100644 (file)
--- a/libelf/elf_compress.c
+++ b/libelf/elf_compress.c
@@ -31,14 +31,12 @@
 #endif
 
 #include <libelf.h>
-#include <system.h>
 #include "libelfP.h"
 #include "common.h"
 
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <zlib.h>
 
 /* Cleanup and return result.  Don't leak memory.  */

diff --git a/libelf/elf_end.c b/libelf/elf_end.c
index 160f0b885b0a6be2b98c852bc129403e8542ba3d..5c451f36daddd6ac33a43fd69911e1af6a6b4e92 100644 (file)
--- a/libelf/elf_end.c
+++ b/libelf/elf_end.c
@@ -34,7 +34,6 @@
 #include <assert.h>
 #include <stddef.h>
 #include <stdlib.h>
-#include <sys/mman.h>
 
 #include "libelfP.h"
 

diff --git a/libelf/elf_getarsym.c b/libelf/elf_getarsym.c
index 05ebf6a91ef7fa1ce4a2da07caa352deaa656c42..2203521fa50c63b86a11b2ee2aba8f9776476b2f 100644 (file)
--- a/libelf/elf_getarsym.c
+++ b/libelf/elf_getarsym.c
@@ -32,16 +32,12 @@
 #endif
 
 #include <assert.h>
-#include <byteswap.h>
-#include <endian.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 
-#include <system.h>
 #include <dl-hash.h>
 #include "libelfP.h"
 

diff --git a/libelf/elf_getdata.c b/libelf/elf_getdata.c
index a704aae3ae2bd10867d1e4961319ac94e810445a..5ebd270f80820b2350140f10d804970938e498c2 100644 (file)
--- a/libelf/elf_getdata.c
+++ b/libelf/elf_getdata.c
@@ -35,10 +35,8 @@
 #include <errno.h>
 #include <stddef.h>
 #include <string.h>
-#include <unistd.h>
 
 #include "libelfP.h"
-#include <system.h>
 #include "common.h"
 #include "elf-knowledge.h"
 

diff --git a/libelf/elf_getdata_rawchunk.c b/libelf/elf_getdata_rawchunk.c
index 2f55cbb472fa7d9f35d104b89fb4e4162acc7a6e..5a35ccdc6b2bf8cc80075448ad8b515be97ddb67 100644 (file)
--- a/libelf/elf_getdata_rawchunk.c
+++ b/libelf/elf_getdata_rawchunk.c
@@ -35,9 +35,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 
-#include <system.h>
 #include "libelfP.h"
 #include "common.h"
 

diff --git a/libelf/elf_getshdrstrndx.c b/libelf/elf_getshdrstrndx.c
index ad884fd3844702a52718b7b630eedcd5b4311b24..2391317bffe0c4e1c45e603c6d90d16eb70946f9 100644 (file)
--- a/libelf/elf_getshdrstrndx.c
+++ b/libelf/elf_getshdrstrndx.c
@@ -35,9 +35,7 @@
 #include <errno.h>
 #include <gelf.h>
 #include <stddef.h>
-#include <unistd.h>
 
-#include <system.h>
 #include "libelfP.h"
 #include "common.h"
 

diff --git a/libelf/elf_readall.c b/libelf/elf_readall.c
index 0a3a233d4d2700f4694ef5ecfe997fe9cc804053..d0f9a28cc59ea192165391babb31eed951a771ed 100644 (file)
--- a/libelf/elf_readall.c
+++ b/libelf/elf_readall.c
@@ -32,10 +32,8 @@
 #endif
 
 #include <errno.h>
-#include <unistd.h>
 #include <sys/stat.h>
 
-#include <system.h>
 #include "libelfP.h"
 #include "common.h"
 

diff --git a/libelf/elf_update.c b/libelf/elf_update.c
index 97ca9ca943e2dcc70ca985cec2eaf97d8333d78c..56af3a1cc204067e04e7466fa356387d85fae942 100644 (file)
--- a/libelf/elf_update.c
+++ b/libelf/elf_update.c
@@ -33,8 +33,6 @@
 
 #include <libelf.h>
 #include <fcntl.h>
-#include <unistd.h>
-#include <sys/mman.h>
 #include <sys/stat.h>
 
 #include "libelfP.h"

diff --git a/libelf/gelf_xlate.c b/libelf/gelf_xlate.c
index 6f8c57b7bb0dc89fdc6a95b8e10f3f9594aff970..d8ad0634433043ee9d69e4ff3912feaea15f5a47 100644 (file)
--- a/libelf/gelf_xlate.c
+++ b/libelf/gelf_xlate.c
@@ -32,7 +32,6 @@
 # include <config.h>
 #endif
 
-#include <byteswap.h>
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>

diff --git a/libelf/libelfP.h b/libelf/libelfP.h
index 56331f4526e25490d6d2f267fcd4b74e3ee4272e..d88a613cc9d530b3c7e4801e8cead1f4e764d86b 100644 (file)
--- a/libelf/libelfP.h
+++ b/libelf/libelfP.h
@@ -39,6 +39,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <system.h>
 
 /* Helper Macros to write 32 bit and 64 bit functions.  */
 #define __elfw2_(Bits, Name) __elf##Bits##_##Name

diff --git a/libelf/nlist.c b/libelf/nlist.c
index 8593c1de842a49aa18d97b11f03c4b0aaf770aaa..b3d604353a52c53df06908776ddd489f7e764b00 100644 (file)
--- a/libelf/nlist.c
+++ b/libelf/nlist.c
@@ -35,7 +35,6 @@
 #include <gelf.h>
 #include <libelf.h>
 #include <nlist.h>
-#include <unistd.h>
 
 #include "libelfP.h"