From 580b899fd45754a69df875ccba1e84948b69fb39 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 5 Jan 2025 16:19:18 +0000 Subject: [PATCH] Drop PAKFIRE_PRIVATE Everything is now private so we won't need this guard any more. Signed-off-by: Michael Tremer --- Makefile.am | 27 ++++++++++----------------- src/pakfire/arch.h | 4 ---- src/pakfire/archive.h | 11 +++-------- src/pakfire/base64.h | 3 --- src/pakfire/cgroup.h | 4 ---- src/pakfire/compress.h | 4 ---- src/pakfire/constants.h | 4 ---- src/pakfire/ctx.h | 9 +-------- src/pakfire/daemon.h | 2 -- src/pakfire/db.h | 4 ---- src/pakfire/deps.h | 8 ++------ src/pakfire/digest.h | 17 +++++++---------- src/pakfire/dist.h | 7 +------ src/pakfire/elf.h | 5 ----- src/pakfire/env.h | 3 --- src/pakfire/file.h | 13 +++++-------- src/pakfire/filelist.h | 11 +++-------- src/pakfire/hex.h | 3 --- src/pakfire/httpclient.h | 4 +--- src/pakfire/jail.h | 3 --- src/pakfire/job.h | 2 -- src/pakfire/key.h | 4 ---- src/pakfire/linter-file.h | 3 --- src/pakfire/linter.h | 3 --- src/pakfire/log_buffer.h | 3 --- src/pakfire/log_stream.h | 3 --- src/pakfire/logging.h | 12 ++++-------- src/pakfire/mirrorlist.h | 4 ---- src/pakfire/mount.h | 4 ---- src/pakfire/os.h | 4 ---- src/pakfire/package.h | 15 +++++---------- src/pakfire/packagelist.h | 11 +++-------- src/pakfire/packager.h | 4 ---- src/pakfire/pakfire.h | 16 +++++----------- src/pakfire/parse.h | 4 ---- src/pakfire/parser.h | 4 ---- src/pakfire/problem.h | 12 ++++-------- src/pakfire/progress.h | 6 ------ src/pakfire/pty.h | 4 +--- src/pakfire/pwd.h | 4 ---- src/pakfire/repo.h | 21 ++++++++------------- src/pakfire/scriptlet.h | 6 ------ src/pakfire/snapshot.h | 3 --- src/pakfire/solution.h | 9 +++------ src/pakfire/stripper.h | 3 --- src/pakfire/syscalls.h | 3 --- src/pakfire/transaction.h | 12 ++++-------- src/pakfire/util.h | 4 ---- src/pakfire/xfer.h | 3 --- 49 files changed, 70 insertions(+), 262 deletions(-) diff --git a/Makefile.am b/Makefile.am index a0a6d5d5a..d027a020e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -54,7 +54,9 @@ AM_CPPFLAGS = \ -include $(top_builddir)/config.h \ $(OUR_CPPFLAGS) -AM_CFLAGS = $(OUR_CFLAGS) \ +AM_CFLAGS = \ + $(OUR_CFLAGS) \ + $(JSON_C_CFLAGS) \ -ffunction-sections \ -fdata-sections @@ -166,14 +168,12 @@ libpakfire_parser_la_SOURCES = \ libpakfire_parser_la_CFLAGS = \ $(AM_CFLAGS) \ - $(COVERAGE_CFLAGS) \ - $(JSON_C_CFLAGS) + $(COVERAGE_CFLAGS) libpakfire_parser_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir)/src \ - -include $(top_builddir)/config.h \ - -DPAKFIRE_PRIVATE + -include $(top_builddir)/config.h BUILT_SOURCES += \ src/pakfire/parser/grammar.h @@ -296,7 +296,6 @@ libpakfire_la_SOURCES = \ libpakfire_la_CFLAGS = \ $(AM_CFLAGS) \ $(COVERAGE_CFLAGS) \ - -fvisibility=hidden \ $(BPF_CFLAGS) \ $(CAP_CFLAGS) \ $(CURL_CFLAGS) \ @@ -319,8 +318,7 @@ libpakfire_la_CFLAGS = \ libpakfire_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir)/src \ - -include $(top_builddir)/config.h \ - -DPAKFIRE_PRIVATE + -include $(top_builddir)/config.h libpakfire_la_LDFLAGS = \ $(AM_LDFLAGS) \ @@ -542,13 +540,11 @@ libcli_la_SOURCES = \ libcli_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ - -DPAKFIRE_PRIVATE \ -I$(top_srcdir)/src libcli_la_CFLAGS = \ $(AM_CFLAGS) \ - $(COVERAGE_CFLAGS) \ - $(JSON_C_CFLAGS) + $(COVERAGE_CFLAGS) libcli_la_LDFLAGS = \ $(AM_LDFLAGS) \ @@ -1004,8 +1000,7 @@ dist_tests_parser_test_SOURCES = \ tests_parser_test_CPPFLAGS = \ $(AM_CPPFLAGS) \ - -I$(top_srcdir)/src \ - -DPAKFIRE_PRIVATE + -I$(top_srcdir)/src tests_parser_test_CFLAGS = \ $(TESTSUITE_CFLAGS) @@ -1172,13 +1167,11 @@ TESTSUITE_CPPFLAGS = \ -DTEST_CONFIG_FILE=\"$(abs_top_srcdir)/contrib/config/pakfire.conf\" \ -DTEST_DATA_DIR=\"$(abs_top_srcdir)/tests/data\" \ -DTEST_ROOTFS=\"$(TEST_ROOTFS)\" \ - -DTEST_STUB_ROOT=\"$(TEST_STUB_ROOT)\" \ - -DPAKFIRE_PRIVATE + -DTEST_STUB_ROOT=\"$(TEST_STUB_ROOT)\" TESTSUITE_CFLAGS = \ $(AM_CFLAGS) \ - $(COVERAGE_CFLAGS) \ - $(JSON_C_CFLAGS) + $(COVERAGE_CFLAGS) TESTSUITE_LDFLAGS = \ $(AM_LDFLAGS) \ diff --git a/src/pakfire/arch.h b/src/pakfire/arch.h index ac7649cc0..e02a0475f 100644 --- a/src/pakfire/arch.h +++ b/src/pakfire/arch.h @@ -27,8 +27,6 @@ const char* pakfire_arch_native(void); const char* pakfire_arch_is_supported_by_host(const char* name); -#ifdef PAKFIRE_PRIVATE - unsigned long pakfire_arch_personality(const char* name); #define pakfire_arch_machine(buffer, arch, vendor) \ @@ -44,6 +42,4 @@ int pakfire_arch_is_compatible(const char* name, const char* compatible_arch); char* pakfire_arch_find_interpreter(const char* name); -#endif - #endif /* PAKFIRE_ARCH_H */ diff --git a/src/pakfire/archive.h b/src/pakfire/archive.h index f9465b62b..a795f1d9e 100644 --- a/src/pakfire/archive.h +++ b/src/pakfire/archive.h @@ -23,12 +23,15 @@ #include +#include + struct pakfire_archive; #include #include #include #include +#include #include #include @@ -59,12 +62,6 @@ int pakfire_archive_make_package(struct pakfire_archive* archive, int pakfire_archive_lint(struct pakfire_archive* archive, pakfire_linter_result_callback callback, void* data); -#ifdef PAKFIRE_PRIVATE - -#include - -#include - // Walk typedef int (*pakfire_archive_walk_callback)(struct pakfire_archive* archive, @@ -103,6 +100,4 @@ struct pakfire_scriptlet* pakfire_archive_get_scriptlet( int pakfire_archive_apply_systemd_sysusers(struct pakfire_archive* archive); -#endif - #endif /* PAKFIRE_ARCHIVE_H */ diff --git a/src/pakfire/base64.h b/src/pakfire/base64.h index 91b236e44..bd56ce2a4 100644 --- a/src/pakfire/base64.h +++ b/src/pakfire/base64.h @@ -21,8 +21,6 @@ #ifndef PAKFIRE_BASE64_H #define PAKFIRE_BASE64_H -#ifdef PAKFIRE_PRIVATE - #include int pakfire_b64encode( @@ -31,5 +29,4 @@ int pakfire_b64encode( int pakfire_b64decode( struct pakfire_ctx* ctx, void** output, size_t* length, const char* buffer); -#endif /* PAKFIRE_PRIVATE */ #endif /* PAKFIRE_BASE64_H */ diff --git a/src/pakfire/cgroup.h b/src/pakfire/cgroup.h index 493acae0a..3d7f067a7 100644 --- a/src/pakfire/cgroup.h +++ b/src/pakfire/cgroup.h @@ -21,8 +21,6 @@ #ifndef PAKFIRE_CGROUP_H #define PAKFIRE_CGROUP_H -#ifdef PAKFIRE_PRIVATE - #include enum pakfire_cgroup_controllers { @@ -238,6 +236,4 @@ int pakfire_cgroup_stat(struct pakfire_cgroup* cgroup, int pakfire_cgroup_stat_dump(struct pakfire_cgroup* cgroup, const struct pakfire_cgroup_stats* stats); -#endif /* PAKFIRE_PRIVATE */ - #endif /* PAKFIRE_CGROUP_H */ diff --git a/src/pakfire/compress.h b/src/pakfire/compress.h index f4f8005b7..88394e214 100644 --- a/src/pakfire/compress.h +++ b/src/pakfire/compress.h @@ -21,8 +21,6 @@ #ifndef PAKFIRE_COMPRESS_H #define PAKFIRE_COMPRESS_H -#ifdef PAKFIRE_PRIVATE - #include #include @@ -67,6 +65,4 @@ int pakfire_compress(struct pakfire* pakfire, struct archive* archive, int pakfire_compress_create_archive(struct pakfire* pakfire, struct archive** archive, FILE* f, const enum pakfire_compressions compression, const unsigned int level); -#endif - #endif /* PAKFIRE_COMPRESS_H */ diff --git a/src/pakfire/constants.h b/src/pakfire/constants.h index 8005e2107..45a866351 100644 --- a/src/pakfire/constants.h +++ b/src/pakfire/constants.h @@ -27,11 +27,7 @@ // Maximum length of an architecture name #define ARCH_MAX 16 -#ifdef PAKFIRE_PRIVATE - // The file format that this version generates #define PACKAGE_FORMAT 6 -#endif /* PAKFIRE_PRIVATE */ - #endif /* PAKFIRE_CONSTANTS_H */ diff --git a/src/pakfire/ctx.h b/src/pakfire/ctx.h index 696985e36..1e8068c23 100644 --- a/src/pakfire/ctx.h +++ b/src/pakfire/ctx.h @@ -25,6 +25,7 @@ struct pakfire_ctx; #include #include +#include #include #include #include @@ -38,10 +39,7 @@ struct pakfire_ctx* pakfire_ctx_unref(struct pakfire_ctx* ctx); enum pakfire_ctx_flags { PAKFIRE_CTX_OFFLINE = (1 << 0), - -#ifdef PAKFIRE_PRIVATE PAKFIRE_CTX_IN_JAIL = (1 << 1), -#endif /* PAKFIRE_PRIVATE */ }; int pakfire_ctx_has_flag(struct pakfire_ctx* ctx, int flag); @@ -88,10 +86,6 @@ typedef int (*pakfire_pick_solution_callback)(struct pakfire_ctx* ctx, void pakfire_ctx_set_pick_solution_callback(struct pakfire_ctx* ctx, pakfire_pick_solution_callback callback, void* data); -#ifdef PAKFIRE_PRIVATE - -#include - // Distro const struct pakfire_distro* pakfire_ctx_get_distro(struct pakfire_ctx* ctx); @@ -126,5 +120,4 @@ CURLSH* pakfire_ctx_curl_share(struct pakfire_ctx* ctx); magic_t pakfire_ctx_magic(struct pakfire_ctx* ctx); -#endif /* PAKFIRE_PRIVATE */ #endif /* PAKFIRE_CTX_H */ diff --git a/src/pakfire/daemon.h b/src/pakfire/daemon.h index d1dab407b..ccca574c6 100644 --- a/src/pakfire/daemon.h +++ b/src/pakfire/daemon.h @@ -21,7 +21,6 @@ #ifndef PAKFIRE_DAEMON_H #define PAKFIRE_DAEMON_H -#ifdef PAKFIRE_PRIVATE #ifdef CURL_HAS_WEBSOCKETS struct pakfire_daemon; @@ -44,5 +43,4 @@ int pakfire_daemon_main(struct pakfire_daemon* daemon); int pakfire_daemon_job_finished(struct pakfire_daemon* daemon, struct pakfire_job* job); #endif /* CURL_HAS_WEBSOCKETS */ -#endif /* PAKFIRE_PRIVATE */ #endif /* PAKFIRE_DAEMON_H */ diff --git a/src/pakfire/db.h b/src/pakfire/db.h index 72084c9d3..36a68cc56 100644 --- a/src/pakfire/db.h +++ b/src/pakfire/db.h @@ -21,8 +21,6 @@ #ifndef PAKFIRE_DB_H #define PAKFIRE_DB_H -#ifdef PAKFIRE_PRIVATE - #include #include @@ -60,6 +58,4 @@ int pakfire_db_filelist(struct pakfire_db* db, struct pakfire_filelist** filelis int pakfire_db_package_filelist(struct pakfire_db* db, struct pakfire_filelist** filelist, struct pakfire_package* pkg); -#endif - #endif /* PAKFIRE_DB_H */ diff --git a/src/pakfire/deps.h b/src/pakfire/deps.h index 3fb33f55f..f6802c78e 100644 --- a/src/pakfire/deps.h +++ b/src/pakfire/deps.h @@ -21,10 +21,6 @@ #ifndef PAKFIRE_DEPENDENCIES_H #define PAKFIRE_DEPENDENCIES_H -int pakfire_static_version_compare(const char* evr1, const char* evr2); - -#ifdef PAKFIRE_PRIVATE - #include #include @@ -33,12 +29,12 @@ extern const struct pakfire_dep { const char* name; } pakfire_deps[]; +int pakfire_static_version_compare(const char* evr1, const char* evr2); + const char* pakfire_dep2str(struct pakfire* pakfire, Id id); Id pakfire_str2dep(struct pakfire* pakfire, const char* s); int pakfire_str2deps(struct pakfire* pakfire, struct pakfire_package* pkg, const enum pakfire_package_key key, const char* deps); -#endif /* PAKFIRE_PRIVATE */ - #endif /* PAKFIRE_DEPENDENCIES_H */ diff --git a/src/pakfire/digest.h b/src/pakfire/digest.h index cbcde085e..a4789ee99 100644 --- a/src/pakfire/digest.h +++ b/src/pakfire/digest.h @@ -21,6 +21,11 @@ #ifndef PAKFIRE_DIGEST_H #define PAKFIRE_DIGEST_H +#include + +// OpenSSL +#include + // Pakfire knows these digests enum pakfire_digest_types { PAKFIRE_DIGEST_UNDEFINED = 0, @@ -34,17 +39,11 @@ enum pakfire_digest_types { #define PAKFIRE_DIGESTS_ALL (~PAKFIRE_DIGEST_UNDEFINED) +#include + const char* pakfire_digest_name(const enum pakfire_digest_types type); int pakfire_digest_get_by_name(const char* name); -#ifdef PAKFIRE_PRIVATE - -#include - -#include - -#include - // libsolv only supports storing one checksum which has to be of a supported type #define PAKFIRE_ARCHIVE_CHECKSUM PAKFIRE_DIGEST_SHA2_512 @@ -101,6 +100,4 @@ int pakfire_digests_compare(struct pakfire_ctx* ctx, const struct pakfire_digest int pakfire_digests_compare_one(struct pakfire_ctx* ctx, struct pakfire_digests* digests1, const enum pakfire_digest_types type, const unsigned char* digest, const size_t length); -#endif - #endif /* PAKFIRE_DIGEST_H */ diff --git a/src/pakfire/dist.h b/src/pakfire/dist.h index cec64bcff..587757ef8 100644 --- a/src/pakfire/dist.h +++ b/src/pakfire/dist.h @@ -22,17 +22,12 @@ #define PAKFIRE_DIST_H #include +#include int pakfire_dist(struct pakfire* pakfire, const char* path, const char* target, char** result); -#ifdef PAKFIRE_PRIVATE - -#include - int pakfire_read_makefile(struct pakfire_parser** parser, struct pakfire* pakfire, const char* path, struct pakfire_parser_error** error); -#endif - #endif /* PAKFIRE_DIST_H */ diff --git a/src/pakfire/elf.h b/src/pakfire/elf.h index 170698f59..1d0c88841 100644 --- a/src/pakfire/elf.h +++ b/src/pakfire/elf.h @@ -21,9 +21,6 @@ #ifndef PAKFIRE_ELF_H #define PAKFIRE_ELF_H -// This is all private stuff -#ifdef PAKFIRE_PRIVATE - struct pakfire_elf; #include @@ -75,6 +72,4 @@ typedef int (*pakfire_elf_foreach_source_file_callback) int pakfire_elf_foreach_source_file(struct pakfire_elf* self, pakfire_elf_foreach_source_file_callback callback, void* data); -#endif /* PAKFIRE_PRIVATE */ - #endif /* PAKFIRE_ELF_H */ diff --git a/src/pakfire/env.h b/src/pakfire/env.h index 5dc361f97..ff720fe99 100644 --- a/src/pakfire/env.h +++ b/src/pakfire/env.h @@ -21,8 +21,6 @@ #ifndef PAKFIRE_ENV_H #define PAKFIRE_ENV_H -#ifdef PAKFIRE_PRIVATE - struct pakfire_env; #include @@ -42,5 +40,4 @@ int pakfire_env_import(struct pakfire_env* env, const char** e); int pakfire_env_merge(struct pakfire_env* env1, struct pakfire_env* env2); -#endif /* PAKFIRE_PRIVATE */ #endif /* PAKFIRE_ENV_H */ diff --git a/src/pakfire/file.h b/src/pakfire/file.h index e77f3d00f..84ff7099a 100644 --- a/src/pakfire/file.h +++ b/src/pakfire/file.h @@ -21,10 +21,15 @@ #ifndef PAKFIRE_FILE_H #define PAKFIRE_FILE_H +#include #include #include #include +// libarchive +#include +#include + struct pakfire_file; #include @@ -100,13 +105,6 @@ struct pakfire_file* pakfire_file_parse_from_file(const char* list, unsigned int int pakfire_file_matches(struct pakfire_file* file, const char* pattern); -#ifdef PAKFIRE_PRIVATE - -#include -#include - -#include - enum pakfire_file_classes { PAKFIRE_FILE_UNKNOWN = 0, @@ -182,5 +180,4 @@ int pakfire_file_consume(struct pakfire_file* file, int srcfd); int pakfire_file_fix_interpreter(struct pakfire_file* file); -#endif /* PAKFIRE_PRIVATE */ #endif /* PAKFIRE_FILE_H */ diff --git a/src/pakfire/filelist.h b/src/pakfire/filelist.h index 8d47a20e2..137701988 100644 --- a/src/pakfire/filelist.h +++ b/src/pakfire/filelist.h @@ -21,8 +21,11 @@ #ifndef PAKFIRE_FILELIST_H #define PAKFIRE_FILELIST_H +#include + struct pakfire_filelist; +#include #include #include @@ -39,12 +42,6 @@ struct pakfire_file* pakfire_filelist_get(struct pakfire_filelist* list, size_t int pakfire_filelist_add(struct pakfire_filelist* list, struct pakfire_file* file); -#ifdef PAKFIRE_PRIVATE - -#include - -#include - size_t pakfire_filelist_total_size(struct pakfire_filelist* list); int pakfire_filelist_remove_all(struct pakfire_filelist* list, @@ -77,6 +74,4 @@ int pakfire_filelist_cleanup(struct pakfire_filelist* list, int flags); int pakfire_filelist_matches_class(struct pakfire_filelist* list, int class); -#endif - #endif /* PAKFIRE_FILELIST_H */ diff --git a/src/pakfire/hex.h b/src/pakfire/hex.h index 4caa929c2..f79dc32a3 100644 --- a/src/pakfire/hex.h +++ b/src/pakfire/hex.h @@ -21,8 +21,6 @@ #ifndef PAKFIRE_HEX_H #define PAKFIRE_HEX_H -#ifdef PAKFIRE_PRIVATE - #define pakfire_hexlify(digest) __pakfire_hexlify(digest, sizeof(digest)) char* __pakfire_hexlify(const unsigned char* digest, const size_t length); @@ -31,5 +29,4 @@ char* __pakfire_hexlify(const unsigned char* digest, const size_t length); int __pakfire_unhexlify(unsigned char* dst, const size_t l, const char* src); -#endif /* PAKFIRE_PRIVATE */ #endif /* PAKFIRE_HEX_H */ diff --git a/src/pakfire/httpclient.h b/src/pakfire/httpclient.h index 9c3836c39..334ddda66 100644 --- a/src/pakfire/httpclient.h +++ b/src/pakfire/httpclient.h @@ -21,8 +21,7 @@ #ifndef PAKFIRE_HTTPCLIENT_H #define PAKFIRE_HTTPCLIENT_H -#ifdef PAKFIRE_PRIVATE - +// systemd #include struct pakfire_httpclient; @@ -45,5 +44,4 @@ int pakfire_httpclient_remove_xfer( int pakfire_httpclient_run(struct pakfire_httpclient* client, const char* title); -#endif /* PAKFIRE_PRIVATE */ #endif /* PAKFIRE_HTTPCLIENT_H */ diff --git a/src/pakfire/jail.h b/src/pakfire/jail.h index e217eeb2c..63c6ec200 100644 --- a/src/pakfire/jail.h +++ b/src/pakfire/jail.h @@ -21,8 +21,6 @@ #ifndef PAKFIRE_JAIL_H #define PAKFIRE_JAIL_H -#ifdef PAKFIRE_PRIVATE - #include #include #include @@ -98,5 +96,4 @@ int pakfire_jail_shell(struct pakfire_jail* jail, struct pakfire_env* env); int pakfire_jail_ldconfig(struct pakfire* pakfire); int pakfire_jail_run_systemd_tmpfiles(struct pakfire* pakfire); -#endif /* PAKFIRE_PRIVATE */ #endif /* PAKFIRE_JAIL_H */ diff --git a/src/pakfire/job.h b/src/pakfire/job.h index e131c7db9..e83cb2d85 100644 --- a/src/pakfire/job.h +++ b/src/pakfire/job.h @@ -21,7 +21,6 @@ #ifndef PAKFIRE_JOB_H #define PAKFIRE_JOB_H -#ifdef PAKFIRE_PRIVATE #ifdef CURL_HAS_WEBSOCKETS #include @@ -41,5 +40,4 @@ int pakfire_job_terminate(struct pakfire_job* worker, int signal); int pakfire_job_exited(sd_event_source* s, const siginfo_t* si, void* data); #endif /* CURL_HAS_WEBSOCKETS */ -#endif /* PAKFIRE_PRIVATE */ #endif /* PAKFIRE_JOB_H */ diff --git a/src/pakfire/key.h b/src/pakfire/key.h index 15a0056a2..c7eedeb35 100644 --- a/src/pakfire/key.h +++ b/src/pakfire/key.h @@ -60,13 +60,9 @@ int pakfire_key_sign(struct pakfire_key* key, int pakfire_key_verify(struct pakfire_key* key, FILE* f, const void* data, const size_t length); -#ifdef PAKFIRE_PRIVATE - int pakfire_key_import_from_string(struct pakfire_key** key, struct pakfire_ctx* ctx, const char* data, const size_t length); int pakfire_key_signf(struct pakfire_key* key, FILE* s, FILE* f, const char* comment); -#endif - #endif /* PAKFIRE_KEY_H */ diff --git a/src/pakfire/linter-file.h b/src/pakfire/linter-file.h index 976f2356a..88845f608 100644 --- a/src/pakfire/linter-file.h +++ b/src/pakfire/linter-file.h @@ -21,8 +21,6 @@ #ifndef PAKFIRE_LINTER_FILE_H #define PAKFIRE_LINTER_FILE_H -#ifdef PAKFIRE_PRIVATE - struct pakfire_linter_file; #include @@ -37,5 +35,4 @@ struct pakfire_linter_file* pakfire_linter_file_unref(struct pakfire_linter_file int pakfire_linter_file_lint(struct pakfire_linter_file* lfile); -#endif /* PAKFIRE_PRIVATE */ #endif /* PAKFIRE_LINTER_FILE_H */ diff --git a/src/pakfire/linter.h b/src/pakfire/linter.h index 010d2fc3d..586f9283c 100644 --- a/src/pakfire/linter.h +++ b/src/pakfire/linter.h @@ -36,8 +36,6 @@ typedef int (*pakfire_linter_result_callback)(struct pakfire_ctx* ctx, struct pakfire_archive* archive, struct pakfire_package* package, struct pakfire_file* file, int priority, const char* message, void* data); -#ifdef PAKFIRE_PRIVATE - struct pakfire_linter; int pakfire_linter_create(struct pakfire_linter** linter, @@ -61,5 +59,4 @@ int pakfire_linter_result(struct pakfire_linter* linter, struct pakfire_file* fi #define pakfire_linter_error(linter, format, ...) \ pakfire_linter_result(linter, NULL, PAKFIRE_LINTER_ERROR, format, ## __VA_ARGS__) -#endif /* PAKFIRE_PRIVATE */ #endif /* PAKFIRE_LINTER_H */ diff --git a/src/pakfire/log_buffer.h b/src/pakfire/log_buffer.h index 1480f7bee..3dc865eab 100644 --- a/src/pakfire/log_buffer.h +++ b/src/pakfire/log_buffer.h @@ -21,8 +21,6 @@ #ifndef PAKFIRE_LOG_BUFFER_H #define PAKFIRE_LOG_BUFFER_H -#ifdef PAKFIRE_PRIVATE - #include /* @@ -38,5 +36,4 @@ struct pakfire_log_buffer* pakfire_log_buffer_unref(struct pakfire_log_buffer* b int pakfire_log_buffer_enqueue(struct pakfire_log_buffer* buffer, int priority, const char* line, ssize_t length); int pakfire_log_buffer_dequeue(struct pakfire_log_buffer* buffer, int* priority, char** line, size_t* length); -#endif /* PAKFIRE_PRIVATE */ #endif /* PAKFIRE_LOG_BUFFER_H */ diff --git a/src/pakfire/log_stream.h b/src/pakfire/log_stream.h index ca98ba95c..7d740a21f 100644 --- a/src/pakfire/log_stream.h +++ b/src/pakfire/log_stream.h @@ -21,8 +21,6 @@ #ifndef PAKFIRE_LOG_STREAM_H #define PAKFIRE_LOG_STREAM_H -#ifdef PAKFIRE_PRIVATE - #include #include @@ -45,5 +43,4 @@ int pakfire_log_stream_in_child(struct pakfire_log_stream* stream); int pakfire_log_stream_write(struct pakfire_log_stream* stream, const char* format, va_list args) __attribute__((format(printf, 2, 0))); -#endif /* PAKFIRE_PRIVATE */ #endif /* PAKFIRE_LOG_STREAM_H */ diff --git a/src/pakfire/logging.h b/src/pakfire/logging.h index 8ff9f8053..862005b29 100644 --- a/src/pakfire/logging.h +++ b/src/pakfire/logging.h @@ -22,10 +22,14 @@ #define PAKFIRE_LOGGING_H #include +#include typedef void (*pakfire_log_callback)(void* data, int priority, const char* file, int line, const char* fn, const char* format, va_list args); +#include +#include + void pakfire_log_stderr(void* data, int priority, const char* file, int line, const char* fn, const char* format, va_list args) __attribute__((format(printf, 6, 0))); @@ -33,13 +37,6 @@ void pakfire_log_syslog(void* data, int priority, const char* file, int line, const char* fn, const char* format, va_list args) __attribute__((format(printf, 6, 0))); -#ifdef PAKFIRE_PRIVATE - -#include - -#include -#include - #define pakfire_ctx_log_condition(ctx, level, arg...) \ do { \ if (pakfire_ctx_get_log_level(ctx) >= level) \ @@ -60,5 +57,4 @@ static inline void __attribute__((always_inline, format(printf, 2, 3))) # define DEBUG pakfire_ctx_log_null #endif -#endif /* PAKFIRE_PRIVATE */ #endif /* PAKFIRE_LOGGING_H */ diff --git a/src/pakfire/mirrorlist.h b/src/pakfire/mirrorlist.h index 9330b2300..a37822828 100644 --- a/src/pakfire/mirrorlist.h +++ b/src/pakfire/mirrorlist.h @@ -21,8 +21,6 @@ #ifndef PAKFIRE_MIRRORLIST_H #define PAKFIRE_MIRRORLIST_H -#ifdef PAKFIRE_PRIVATE - struct pakfire_mirrorlist; #include @@ -44,6 +42,4 @@ struct pakfire_mirror* pakfire_mirrorlist_get_first(struct pakfire_mirrorlist* l struct pakfire_mirror* pakfire_mirrorlist_get_next( struct pakfire_mirrorlist* list, struct pakfire_mirror* mirror); -#endif /* PAKFIRE_PRIVATE */ - #endif /* PAKFIRE_MIRRORLIST_H */ diff --git a/src/pakfire/mount.h b/src/pakfire/mount.h index f907113d4..fc50eb9c9 100644 --- a/src/pakfire/mount.h +++ b/src/pakfire/mount.h @@ -21,8 +21,6 @@ #ifndef PAKFIRE_MOUNT_H #define PAKFIRE_MOUNT_H -#ifdef PAKFIRE_PRIVATE - #include #include @@ -51,6 +49,4 @@ enum pakfire_mount_flags { int pakfire_mount_all(struct pakfire_ctx* ctx, struct pakfire* pakfire, pakfire_mntns_t ns, int flags); -#endif /* PAKFIRE_PRIVATE */ - #endif /* PAKFIRE_MOUNT_H */ diff --git a/src/pakfire/os.h b/src/pakfire/os.h index 26a74103a..522fb9017 100644 --- a/src/pakfire/os.h +++ b/src/pakfire/os.h @@ -21,8 +21,6 @@ #ifndef PAKFIRE_OS_H #define PAKFIRE_OS_H -#ifdef PAKFIRE_PRIVATE - #include #include @@ -103,6 +101,4 @@ struct pakfire_distro { int pakfire_distro(struct pakfire_distro* distro, const char* path); -#endif /* PAKFIRE_PRIVATE */ - #endif /* PAKFIRE_OS_H */ diff --git a/src/pakfire/package.h b/src/pakfire/package.h index 87e52ee4a..e6312296b 100644 --- a/src/pakfire/package.h +++ b/src/pakfire/package.h @@ -21,8 +21,13 @@ #ifndef PAKFIRE_PACKAGE_H #define PAKFIRE_PACKAGE_H +#include #include +#include + +#include + #include struct pakfire_package; @@ -148,14 +153,6 @@ enum pakfire_package_dump_flags { // Installcheck int pakfire_package_installcheck(struct pakfire_package* pkg, char** problem, int flags); -#ifdef PAKFIRE_PRIVATE - -#include - -#include - -#include - int pakfire_package_create_from_solvable(struct pakfire_package** package, struct pakfire* pakfire, Id id); @@ -186,6 +183,4 @@ int pakfire_package_matches_dep(struct pakfire_package* pkg, struct json_object* pakfire_package_to_json(struct pakfire_package* pkg); -#endif - #endif /* PAKFIRE_PACKAGE_H */ diff --git a/src/pakfire/packagelist.h b/src/pakfire/packagelist.h index 8877b9b08..328c3a74f 100644 --- a/src/pakfire/packagelist.h +++ b/src/pakfire/packagelist.h @@ -21,10 +21,13 @@ #ifndef PAKFIRE_PACKAGELIST_H #define PAKFIRE_PACKAGELIST_H +#include + struct pakfire_packagelist; #include #include +#include int pakfire_packagelist_create(struct pakfire_packagelist** list, struct pakfire_ctx* ctx); struct pakfire_packagelist* pakfire_packagelist_ref(struct pakfire_packagelist* list); @@ -45,15 +48,7 @@ enum pakfire_packagelist_walk_flags { int pakfire_packagelist_walk(struct pakfire_packagelist* list, pakfire_packagelist_walk_callback callback, void* p, int flags); -#ifdef PAKFIRE_PRIVATE - -#include - -#include - int pakfire_packagelist_import_solvables(struct pakfire_packagelist* list, struct pakfire* pakfire, Queue* q); -#endif - #endif /* PAKFIRE_PACKAGELIST_H */ diff --git a/src/pakfire/packager.h b/src/pakfire/packager.h index 150a2c60c..7025da6ec 100644 --- a/src/pakfire/packager.h +++ b/src/pakfire/packager.h @@ -21,8 +21,6 @@ #ifndef PAKFIRE_PACKAGER_H #define PAKFIRE_PACKAGER_H -#ifdef PAKFIRE_PRIVATE - #include #include #include @@ -57,6 +55,4 @@ int pakfire_packager_add_scriptlet(struct pakfire_packager* packager, int pakfire_packager_cleanup(struct pakfire_packager* packager); -#endif - #endif /* PAKFIRE_PACKAGER_H */ diff --git a/src/pakfire/pakfire.h b/src/pakfire/pakfire.h index bac39cb18..149a80739 100644 --- a/src/pakfire/pakfire.h +++ b/src/pakfire/pakfire.h @@ -25,8 +25,12 @@ #include #include #include +#include #include +// libsolv +#include + struct pakfire; #include @@ -36,6 +40,7 @@ struct pakfire; #include #include #include +#include #include #include #include @@ -90,15 +95,6 @@ int pakfire_check(struct pakfire* pakfire, struct pakfire_filelist* errors); // Snapshots int pakfire_update_snapshot(struct pakfire* pakfire); -#ifdef PAKFIRE_PRIVATE - -#include - -#include - -#include -#include - int pakfire_clone(struct pakfire** clone, struct pakfire* pakfire, const char* path); struct pakfire_ctx* pakfire_ctx(struct pakfire* pakfire); @@ -159,6 +155,4 @@ int pakfire_repo_walk(struct pakfire* pakfire, struct archive* pakfire_get_disk_reader(struct pakfire* pakfire); struct archive* pakfire_get_disk_writer(struct pakfire* pakfire); -#endif - #endif /* PAKFIRE_PAKFIRE_H */ diff --git a/src/pakfire/parse.h b/src/pakfire/parse.h index abf6121ce..30f6f6802 100644 --- a/src/pakfire/parse.h +++ b/src/pakfire/parse.h @@ -21,8 +21,6 @@ #ifndef PAKFIRE_PARSE_H #define PAKFIRE_PARSE_H -#ifdef PAKFIRE_PRIVATE - /* A callback that is called for each line that there is to parse. */ @@ -34,6 +32,4 @@ int pakfire_parse_file(const char* path, pakfire_parse_line parse, void* data); // Splits a line into two parts separated by the given delimiter int pakfire_parse_split_line(char* line, size_t length, char** key, char** value, char delim); -#endif /* PAKFIRE_PRIVATE */ - #endif /* PAKFIRE_PARSE_H */ diff --git a/src/pakfire/parser.h b/src/pakfire/parser.h index d8f56f16f..54a0fb186 100644 --- a/src/pakfire/parser.h +++ b/src/pakfire/parser.h @@ -21,8 +21,6 @@ #ifndef PAKFIRE_PARSER_H #define PAKFIRE_PARSER_H -#ifdef PAKFIRE_PRIVATE - #include #include @@ -116,6 +114,4 @@ int pakfire_parser_parse_data(struct pakfire_parser* parent, const char* data, s int pakfire_parser_set_env(struct pakfire_parser* parser, struct pakfire_env* env); -#endif /* PAKFIRE_PRIVATE */ - #endif /* PAKFIRE_PARSER_H */ diff --git a/src/pakfire/problem.h b/src/pakfire/problem.h index 780794bf4..3b75ad871 100644 --- a/src/pakfire/problem.h +++ b/src/pakfire/problem.h @@ -21,9 +21,13 @@ #ifndef PAKFIRE_PROBLEM_H #define PAKFIRE_PROBLEM_H +// libsolv +#include + struct pakfire_problem; #include +#include struct pakfire_problem* pakfire_problem_ref(struct pakfire_problem* problem); struct pakfire_problem* pakfire_problem_unref(struct pakfire_problem* problem); @@ -33,12 +37,6 @@ const char* pakfire_problem_to_string(struct pakfire_problem* problem); struct pakfire_solution** pakfire_problem_get_solutions( struct pakfire_problem* problem); -#ifdef PAKFIRE_PRIVATE - -#include - -#include - int pakfire_problem_create(struct pakfire_problem** problem, struct pakfire* pakfire, struct pakfire_transaction* transaction, Id id); @@ -46,6 +44,4 @@ struct pakfire_transaction* pakfire_problem_get_transaction(struct pakfire_probl Id pakfire_problem_get_id(struct pakfire_problem* problem); -#endif - #endif /* PAKFIRE_PROBLEM_H */ diff --git a/src/pakfire/progress.h b/src/pakfire/progress.h index 76bf73cfd..42205ea14 100644 --- a/src/pakfire/progress.h +++ b/src/pakfire/progress.h @@ -71,10 +71,6 @@ time_t pakfire_progress_get_elapsed_time(struct pakfire_progress* p); time_t pakfire_progress_get_eta(struct pakfire_progress* p); double pakfire_progress_get_transfer_speed(struct pakfire_progress* p); -#ifdef PAKFIRE_PRIVATE - -#include - int pakfire_progress_create(struct pakfire_progress** progress, struct pakfire_ctx* ctx, int flags, struct pakfire_progress* parent); @@ -91,6 +87,4 @@ int pakfire_progress_set_title(struct pakfire_progress* p, const char* format, . __attribute__((format(printf, 2, 3))); void pakfire_progress_set_max_value(struct pakfire_progress* p, unsigned long int value); -#endif - #endif /* PAKFIRE_PROGRESS_H */ diff --git a/src/pakfire/pty.h b/src/pakfire/pty.h index bf7a78b28..0a8856e89 100644 --- a/src/pakfire/pty.h +++ b/src/pakfire/pty.h @@ -21,8 +21,7 @@ #ifndef PAKFIRE_PTY_H #define PAKFIRE_PTY_H -#ifdef PAKFIRE_PRIVATE - +// libsystemd #include #include @@ -59,5 +58,4 @@ void pakfire_pty_set_stdin_callback(struct pakfire_pty* pty, void pakfire_pty_set_stdout_callback(struct pakfire_pty* pty, pakfire_pty_stdout_callback callback, void* data); -#endif /* PAKFIRE_PRIVATE */ #endif /* PAKFIRE_PTY_H */ diff --git a/src/pakfire/pwd.h b/src/pakfire/pwd.h index 2c38e46e8..2c76de2b5 100644 --- a/src/pakfire/pwd.h +++ b/src/pakfire/pwd.h @@ -21,8 +21,6 @@ #ifndef PAKFIRE_PWD_H #define PAKFIRE_PWD_H -#ifdef PAKFIRE_PRIVATE - #include #include @@ -41,6 +39,4 @@ struct group* pakfire_getgrgid(struct pakfire* pakfire, gid_t gid); int pakfire_getsubuid(struct pakfire* pakfire, const char* owner, struct pakfire_subid* subid); int pakfire_getsubgid(struct pakfire* pakfire, const char* owner, struct pakfire_subid* subid); -#endif - #endif /* PAKFIRE_PWD_H */ diff --git a/src/pakfire/repo.h b/src/pakfire/repo.h index 71b07753b..7b6b11e2e 100644 --- a/src/pakfire/repo.h +++ b/src/pakfire/repo.h @@ -25,10 +25,18 @@ #include #include +#include + struct pakfire_repo; +#include +#include +#include #include +#include +#include #include +#include int pakfire_repo_create(struct pakfire_repo** repo, struct pakfire* pakfire, const char* name); @@ -92,17 +100,6 @@ int pakfire_repo_refresh(struct pakfire_repo* repo, int force); int pakfire_repo_compose(struct pakfire* pakfire, const char* path, struct pakfire_key* key, const char** files); -#ifdef PAKFIRE_PRIVATE - -#include - -#include -#include -#include -#include -#include -#include - #define PAKFIRE_REPO_COMMANDLINE "@commandline" #define PAKFIRE_REPO_DUMMY "@dummy" #define PAKFIRE_REPO_LOCAL "local" @@ -141,6 +138,4 @@ struct pakfire_mirrorlist* pakfire_repo_get_mirrorlist(struct pakfire_repo* repo int pakfire_repo_to_packagelist(struct pakfire_repo* repo, struct pakfire_packagelist* list); -#endif - #endif /* PAKFIRE_REPO_H */ diff --git a/src/pakfire/scriptlet.h b/src/pakfire/scriptlet.h index 6c098a926..94396b1f6 100644 --- a/src/pakfire/scriptlet.h +++ b/src/pakfire/scriptlet.h @@ -21,10 +21,6 @@ #ifndef PAKFIRE_SCRIPTLET_H #define PAKFIRE_SCRIPTLET_H -// This is an internal data structure - -#ifdef PAKFIRE_PRIVATE - #include #include @@ -42,6 +38,4 @@ const char* pakfire_scriptlet_get_data(struct pakfire_scriptlet* scriptlet, size int pakfire_scriptlet_execute(struct pakfire_scriptlet* scriptlet, struct pakfire* pakfire); -#endif /* PAKFIRE_PRIVATE */ - #endif /* PAKFIRE_SCRIPTLET_H */ diff --git a/src/pakfire/snapshot.h b/src/pakfire/snapshot.h index 280322687..4f5cb0d01 100644 --- a/src/pakfire/snapshot.h +++ b/src/pakfire/snapshot.h @@ -21,8 +21,6 @@ #ifndef PAKFIRE_SNAPSHOT_H #define PAKFIRE_SNAPSHOT_H -#ifdef PAKFIRE_PRIVATE - #include #include @@ -46,5 +44,4 @@ int pakfire_snapshot_make(struct pakfire_snapshot** snapshot, struct pakfire* pa int pakfire_snapshot_clean(struct pakfire* pakfire); -#endif /* PAKFIRE_PRIVATE */ #endif /* PAKFIRE_SNAPSHOT_H */ diff --git a/src/pakfire/solution.h b/src/pakfire/solution.h index bc6a160de..78c5b417a 100644 --- a/src/pakfire/solution.h +++ b/src/pakfire/solution.h @@ -21,6 +21,9 @@ #ifndef PAKFIRE_SOLUTION_H #define PAKFIRE_SOLUTION_H +// libsolv +#include + struct pakfire_solution; #include @@ -31,15 +34,9 @@ struct pakfire_solution* pakfire_solution_unref(struct pakfire_solution* solutio const char* pakfire_solution_to_string(struct pakfire_solution* solution); -#ifdef PAKFIRE_PRIVATE - -#include - int pakfire_solution_create(struct pakfire_solution** solution, struct pakfire* pakfire, struct pakfire_problem* problem, Id id); struct pakfire_problem* pakfire_solution_get_problem(struct pakfire_solution* solution); Id pakfire_solution_get_id(struct pakfire_solution* solution); -#endif /* PAKFIRE_PRIVATE */ - #endif /* PAKFIRE_SOLUTION_H */ diff --git a/src/pakfire/stripper.h b/src/pakfire/stripper.h index 9233b4759..59a0f0050 100644 --- a/src/pakfire/stripper.h +++ b/src/pakfire/stripper.h @@ -21,8 +21,6 @@ #ifndef PAKFIRE_STRIPPER_H #define PAKFIRE_STRIPPER_H -#ifdef PAKFIRE_PRIVATE - #define BUILD_SRC_DIR "/build/source" #define DEBUG_SRC_DIR "/usr/src/debug" @@ -39,5 +37,4 @@ struct pakfire_stripper* pakfire_stripper_unref(struct pakfire_stripper* strippe int pakfire_stripper_run(struct pakfire_stripper* stripper); -#endif /* PAKFIRE_PRIVATE */ #endif /* PAKFIRE_STRIPPER_H */ diff --git a/src/pakfire/syscalls.h b/src/pakfire/syscalls.h index 4e5147b92..b66054a09 100644 --- a/src/pakfire/syscalls.h +++ b/src/pakfire/syscalls.h @@ -21,8 +21,6 @@ #ifndef PAKFIRE_SYSCALLS_H #define PAKFIRE_SYSCALLS_H -#ifdef PAKFIRE_PRIVATE - #include static inline int clone3(struct clone_args* args, size_t size) { @@ -33,5 +31,4 @@ static inline int pidfd_send_signal(int pidfd, int sig, siginfo_t* info, unsigne return syscall(SYS_pidfd_send_signal, pidfd, sig, info, flags); } -#endif /* PAKFIRE_PRIVATE */ #endif /* PAKFIRE_SYSCALLS_H */ diff --git a/src/pakfire/transaction.h b/src/pakfire/transaction.h index 37091ef33..1d5089494 100644 --- a/src/pakfire/transaction.h +++ b/src/pakfire/transaction.h @@ -21,8 +21,12 @@ #ifndef PAKFIRE_TRANSACTION_H #define PAKFIRE_TRANSACTION_H +// libsolv +#include + struct pakfire_transaction; +#include #include #include #include @@ -79,12 +83,6 @@ int pakfire_transaction_run(struct pakfire_transaction* transaction); int pakfire_transaction_download(struct pakfire_transaction* transaction); -#ifdef PAKFIRE_PRIVATE - -#include - -#include - // XXX needs removal enum pakfire_request_solve_flags { PAKFIRE_REQ_SOLVE_INTERACTIVE, @@ -95,6 +93,4 @@ Solver* pakfire_transaction_get_solver(struct pakfire_transaction* transaction); int pakfire_transaction_compose_repo(struct pakfire_transaction* transaction, struct pakfire_key* key, const char* path); -#endif - #endif /* PAKFIRE_TRANSACTION_H */ diff --git a/src/pakfire/util.h b/src/pakfire/util.h index dba9f347a..b2cdf80f1 100644 --- a/src/pakfire/util.h +++ b/src/pakfire/util.h @@ -21,8 +21,6 @@ #ifndef PAKFIRE_UTIL_H #define PAKFIRE_UTIL_H -#ifdef PAKFIRE_PRIVATE - #include #define PCRE2_CODE_UNIT_WIDTH 8 @@ -112,6 +110,4 @@ static inline double pakfire_timespec_delta(struct timespec* t1, struct timespec ) / 1000.0; } -#endif - #endif /* PAKFIRE_UTIL_H */ diff --git a/src/pakfire/xfer.h b/src/pakfire/xfer.h index 1c9f6f58b..57317620e 100644 --- a/src/pakfire/xfer.h +++ b/src/pakfire/xfer.h @@ -21,8 +21,6 @@ #ifndef PAKFIRE_XFER_H #define PAKFIRE_XFER_H -#ifdef PAKFIRE_PRIVATE - #include #include @@ -146,5 +144,4 @@ int pakfire_xfer_socket(struct pakfire_xfer* xfer, pakfire_xfer_open_callback op int pakfire_xfer_send_message(struct pakfire_xfer* xfer, const char* message, const size_t length); #endif /* CURL_HAS_WEBSOCKETS */ -#endif /* PAKFIRE_PRIVATE */ #endif /* PAKFIRE_XFER_H */ -- 2.47.3