Skip to content

Commit 2deb156

Browse files
committed
lib: only include fetch.h where required
This results in a lot of places where limits.h was missing, so this diff is larger than necessary.
1 parent be7e532 commit 2deb156

11 files changed

Lines changed: 40 additions & 28 deletions

include/xbps_api_impl.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
#endif
4343

4444
#include "queue.h"
45-
#include "fetch.h"
4645
#include "compat.h"
4746

4847
#define EXTRACT_FLAGS ARCHIVE_EXTRACT_SECURE_NODOTDOT | \

lib/conf.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,17 @@
2929
#ifdef __FreeBSD__
3030
#define _WITH_GETLINE /* getline() */
3131
#endif
32+
#include <ctype.h>
33+
#include <dirent.h>
34+
#include <errno.h>
35+
#include <glob.h>
36+
#include <libgen.h>
37+
#include <limits.h>
38+
#include <stdarg.h>
3239
#include <stdio.h>
3340
#include <stdlib.h>
3441
#include <string.h>
3542
#include <strings.h>
36-
#include <errno.h>
37-
#include <stdarg.h>
38-
#include <dirent.h>
39-
#include <ctype.h>
40-
#include <glob.h>
41-
#include <libgen.h>
4243

4344
#include "xbps_api_impl.h"
4445

lib/package_config_files.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@
2323
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2424
*/
2525

26+
#include <errno.h>
27+
#include <limits.h>
2628
#include <stdio.h>
2729
#include <stdlib.h>
2830
#include <string.h>
29-
#include <errno.h>
3031

3132
#include "xbps_api_impl.h"
3233

lib/package_remove.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,15 @@
2323
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2424
*/
2525

26-
#include <stdio.h>
26+
#include <dirent.h>
27+
#include <errno.h>
28+
#include <fcntl.h>
29+
#include <libgen.h>
30+
#include <limits.h>
2731
#include <stdbool.h>
32+
#include <stdio.h>
2833
#include <stdlib.h>
2934
#include <string.h>
30-
#include <errno.h>
31-
#include <dirent.h>
32-
#include <libgen.h>
33-
#include <fcntl.h>
3435
#include <unistd.h>
3536

3637
#include "xbps_api_impl.h"

lib/pkgdb.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,16 @@
2323
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2424
*/
2525

26-
#include <stdio.h>
27-
#include <stdbool.h>
28-
#include <stdlib.h>
29-
#include <string.h>
30-
#include <errno.h>
3126
#include <sys/types.h>
3227
#include <sys/stat.h>
28+
29+
#include <errno.h>
3330
#include <fcntl.h>
31+
#include <limits.h>
32+
#include <stdbool.h>
33+
#include <stdio.h>
34+
#include <stdlib.h>
35+
#include <string.h>
3436

3537
#include "xbps_api_impl.h"
3638

lib/plist_fetch.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
#include <errno.h>
3333

3434
#include "xbps_api_impl.h"
35+
#include "fetch.h"
3536

3637
/**
3738
* @file lib/plist_fetch.c

lib/rpool.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
#include <errno.h>
3333

3434
#include "xbps_api_impl.h"
35+
#include "fetch.h"
3536

3637
struct rpool_fpkg {
3738
xbps_array_t revdeps;

lib/transaction_fetch.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,14 @@
2424
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2525
*/
2626

27+
#include <errno.h>
28+
#include <limits.h>
2729
#include <stdlib.h>
2830
#include <string.h>
29-
#include <errno.h>
3031
#include <unistd.h>
3132

3233
#include "xbps_api_impl.h"
34+
#include "fetch.h"
3335

3436
static int
3537
verify_binpkg(struct xbps_handle *xhp, xbps_dictionary_t pkgd)

lib/transaction_files.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include <dirent.h>
2828
#include <errno.h>
2929
#include <fcntl.h>
30+
#include <limits.h>
3031
#include <stdlib.h>
3132
#include <string.h>
3233

lib/util.c

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,18 @@
3333

3434
#include "compat.h"
3535

36-
#include <stdio.h>
37-
#include <stdbool.h>
38-
#include <stdlib.h>
39-
#include <stdarg.h>
40-
#include <string.h>
36+
#include <sys/utsname.h>
37+
38+
#include <ctype.h>
4139
#include <errno.h>
4240
#include <fnmatch.h>
43-
#include <ctype.h>
4441
#include <libgen.h>
45-
#include <sys/utsname.h>
42+
#include <limits.h>
43+
#include <stdarg.h>
44+
#include <stdbool.h>
45+
#include <stdio.h>
46+
#include <stdlib.h>
47+
#include <string.h>
4648

4749
#include "xbps_api_impl.h"
4850

0 commit comments

Comments
 (0)