From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 27 Jun 2025 10:43:18 +0000 (+0000)
Subject: config: Create its own type
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=16e3135d5e76077c0fdefe12427ecd70fd4518b8;p=pakfire.git

config: Create its own type

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/cli/lib/config.c b/src/cli/lib/config.c
index d2c10632..252f0db1 100644
--- a/src/cli/lib/config.c
+++ b/src/cli/lib/config.c
@@ -25,7 +25,7 @@
 #include "config.h"
 
 const char* cli_get_default_distro(pakfire_ctx* ctx) {
-	struct pakfire_config* config = NULL;
+	pakfire_config* config = NULL;
 	const char* distro = NULL;
 
 	// Fetch the configuration
@@ -43,7 +43,7 @@ const char* cli_get_default_distro(pakfire_ctx* ctx) {
 	return distro;
 }
 
-int cli_read_distro_config(struct pakfire_config* config, const char* distro) {
+int cli_read_distro_config(pakfire_config* config, const char* distro) {
 	char path[PATH_MAX];
 	int r;
 
diff --git a/src/cli/lib/config.h b/src/cli/lib/config.h
index dbeba318..301c9321 100644
--- a/src/cli/lib/config.h
+++ b/src/cli/lib/config.h
@@ -26,6 +26,6 @@
 
 const char* cli_get_default_distro(pakfire_ctx* ctx);
 
-int cli_read_distro_config(struct pakfire_config* config, const char* distro);
+int cli_read_distro_config(pakfire_config* config, const char* distro);
 
 #endif /* PAKFIRE_CLI_CONFIG_H */
diff --git a/src/cli/lib/pakfire.c b/src/cli/lib/pakfire.c
index 3f8d5675..89bb5063 100644
--- a/src/cli/lib/pakfire.c
+++ b/src/cli/lib/pakfire.c
@@ -46,8 +46,8 @@ static void cli_set_repo_enabled(struct pakfire* pakfire, const char* name, int
 	pakfire_repo_unref(repo);
 }
 
-int cli_setup_config(struct pakfire_config** config, struct cli_global_args* args) {
-	struct pakfire_config* c = NULL;
+int cli_setup_config(pakfire_config** config, struct cli_global_args* args) {
+	pakfire_config* c = NULL;
 	int r;
 
 	// Create a new config object
@@ -80,7 +80,7 @@ ERROR:
 }
 
 int cli_setup_pakfire(struct pakfire** pakfire, struct cli_global_args* args) {
-	struct pakfire_config* config = NULL;
+	pakfire_config* config = NULL;
 	struct pakfire* p = NULL;
 	int r;
 
@@ -115,7 +115,7 @@ ERROR:
 }
 
 int cli_setup_build(pakfire_build** build, struct cli_global_args* args, int flags) {
-	struct pakfire_config* config = NULL;
+	pakfire_config* config = NULL;
 	pakfire_build* b = NULL;
 	int r;
 
@@ -154,7 +154,7 @@ static int auth_callback(pakfire_client* client, void* data) {
 
 int cli_setup_client(pakfire_client** client, struct cli_global_args* args) {
 	static struct auth_credentials creds = {};
-	struct pakfire_config* config = NULL;
+	pakfire_config* config = NULL;
 	const char* username = NULL;
 	const char* password = NULL;
 	const char* url = NULL;
diff --git a/src/cli/lib/pakfire.h b/src/cli/lib/pakfire.h
index 4ad983e5..24f4e9a7 100644
--- a/src/cli/lib/pakfire.h
+++ b/src/cli/lib/pakfire.h
@@ -46,7 +46,7 @@ struct cli_global_args {
 	unsigned int num_disable_repos;
 };
 
-int cli_setup_config(struct pakfire_config** config, struct cli_global_args* args);
+int cli_setup_config(pakfire_config** config, struct cli_global_args* args);
 int cli_setup_pakfire(struct pakfire** pakfire, struct cli_global_args* args);
 int cli_setup_build(pakfire_build** build, struct cli_global_args* args, int flags);
 int cli_setup_client(pakfire_client** client, struct cli_global_args* args);
diff --git a/src/pakfire/build.c b/src/pakfire/build.c
index f0eae9c7..0027f2f9 100644
--- a/src/pakfire/build.c
+++ b/src/pakfire/build.c
@@ -1803,7 +1803,7 @@ static int pakfire_build_parse_id(pakfire_build* build, const char* id) {
 	Sets up a new cgroup for this build
 */
 static int pakfire_build_setup_cgroup(pakfire_build* build) {
-	struct pakfire_config* config = NULL;
+	pakfire_config* config = NULL;
 	char path[PATH_MAX];
 	int r;
 
@@ -2038,7 +2038,7 @@ static int pakfire_build_set_time_start(pakfire_build* build) {
 }
 
 static int pakfire_build_setup_pakfire(
-		pakfire_build* build, struct pakfire_config* config, const char* arch) {
+		pakfire_build* build, pakfire_config* config, const char* arch) {
 	int flags = PAKFIRE_FLAGS_BUILD;
 	int r;
 
@@ -2091,7 +2091,7 @@ static int pakfire_build_setup_buildroot(pakfire_build* build) {
 }
 
 int pakfire_build_create(pakfire_build** build, pakfire_ctx* ctx,
-		struct pakfire_config* config, const char* arch, const char* id, int flags) {
+		pakfire_config* config, const char* arch, const char* id, int flags) {
 	int r;
 
 	// Allocate build object
diff --git a/src/pakfire/build.h b/src/pakfire/build.h
index 817eb16f..03f17126 100644
--- a/src/pakfire/build.h
+++ b/src/pakfire/build.h
@@ -39,7 +39,7 @@ typedef int (*pakfire_build_result_callback)(pakfire_ctx* ctx, struct pakfire* p
 	pakfire_build* build, pakfire_archive* archive, void* data);
 
 int pakfire_build_create(pakfire_build** build, pakfire_ctx* ctx,
-	struct pakfire_config* config, const char* arch, const char* id, int flags);
+	pakfire_config* config, const char* arch, const char* id, int flags);
 
 pakfire_build* pakfire_build_ref(pakfire_build* build);
 pakfire_build* pakfire_build_unref(pakfire_build* build);
diff --git a/src/pakfire/config.c b/src/pakfire/config.c
index f3830259..b4689bf4 100644
--- a/src/pakfire/config.c
+++ b/src/pakfire/config.c
@@ -33,7 +33,7 @@
 #define SECTION_MAX_LENGTH	256
 #define LINE_MAX_LENGTH		1024
 
-struct pakfire_config_section {
+typedef struct pakfire_config_section {
 	STAILQ_ENTRY(pakfire_config_section) nodes;
 
 	// Section name
@@ -41,15 +41,15 @@ struct pakfire_config_section {
 
 	// Entries
 	STAILQ_HEAD(entries, pakfire_config_entry) entries;
-};
+} pakfire_config_section;
 
-struct pakfire_config_entry {
+typedef struct pakfire_config_entry {
 	STAILQ_ENTRY(pakfire_config_entry) nodes;
 
 	// Key & Value
 	char key[KEY_MAX_LENGTH];
 	char value[VALUE_MAX_LENGTH];
-};
+} pakfire_config_entry;
 
 struct pakfire_config {
 	int nrefs;
@@ -57,8 +57,8 @@ struct pakfire_config {
 	STAILQ_HEAD(sections, pakfire_config_section) sections;
 };
 
-int pakfire_config_create(struct pakfire_config** config) {
-	struct pakfire_config* c = calloc(1, sizeof(*c));
+int pakfire_config_create(pakfire_config** config) {
+	pakfire_config* c = calloc(1, sizeof(*c));
 	if (!c)
 		return 1;
 
@@ -72,12 +72,12 @@ int pakfire_config_create(struct pakfire_config** config) {
 	return 0;
 }
 
-static void pakfire_config_free_entry(struct pakfire_config_entry* entry) {
+static void pakfire_config_free_entry(pakfire_config_entry* entry) {
 	free(entry);
 }
 
-static void pakfire_config_free_section(struct pakfire_config_section* section) {
-	struct pakfire_config_entry* entry = NULL;
+static void pakfire_config_free_section(pakfire_config_section* section) {
+	pakfire_config_entry* entry = NULL;
 
 	// Free all entries
 	while (!STAILQ_EMPTY(&section->entries)) {
@@ -90,8 +90,8 @@ static void pakfire_config_free_section(struct pakfire_config_section* section)
 	free(section);
 }
 
-static void pakfire_config_free(struct pakfire_config* config) {
-	struct pakfire_config_section* section = NULL;
+static void pakfire_config_free(pakfire_config* config) {
+	pakfire_config_section* section = NULL;
 
 	// Free all sections
 	while (!STAILQ_EMPTY(&config->sections)) {
@@ -104,13 +104,13 @@ static void pakfire_config_free(struct pakfire_config* config) {
 	free(config);
 }
 
-struct pakfire_config* pakfire_config_ref(struct pakfire_config* config) {
+pakfire_config* pakfire_config_ref(pakfire_config* config) {
 	++config->nrefs;
 
 	return config;
 }
 
-struct pakfire_config* pakfire_config_unref(struct pakfire_config* config) {
+pakfire_config* pakfire_config_unref(pakfire_config* config) {
 	if (--config->nrefs > 0)
 		return config;
 
@@ -118,9 +118,9 @@ struct pakfire_config* pakfire_config_unref(struct pakfire_config* config) {
 	return NULL;
 }
 
-static struct pakfire_config_section* pakfire_config_create_section(
-		struct pakfire_config* config, const char* name) {
-	struct pakfire_config_section* section = NULL;
+static pakfire_config_section* pakfire_config_create_section(
+		pakfire_config* config, const char* name) {
+	pakfire_config_section* section = NULL;
 	int r;
 
 	// Allocate a new section
@@ -149,9 +149,9 @@ ERROR:
 	return NULL;
 }
 
-static struct pakfire_config_section* pakfire_config_get_section(
-		struct pakfire_config* config, const char* name) {
-	struct pakfire_config_section* section = NULL;
+static pakfire_config_section* pakfire_config_get_section(
+		pakfire_config* config, const char* name) {
+	pakfire_config_section* section = NULL;
 
 	// Find an existing section
 	STAILQ_FOREACH(section, &config->sections, nodes) {
@@ -162,7 +162,7 @@ static struct pakfire_config_section* pakfire_config_get_section(
 	return NULL;
 }
 
-static int pakfire_config_entry_is_multiline(const struct pakfire_config_entry* entry) {
+static int pakfire_config_entry_is_multiline(const pakfire_config_entry* entry) {
 	const char* p = strchr(entry->value, '\n');
 
 	if (p)
@@ -171,10 +171,10 @@ static int pakfire_config_entry_is_multiline(const struct pakfire_config_entry*
 	return 0;
 }
 
-static struct pakfire_config_entry* pakfire_config_create_entry(
-		struct pakfire_config* config, const char* name, const char* key) {
-	struct pakfire_config_section* section = NULL;
-	struct pakfire_config_entry* entry = NULL;
+static pakfire_config_entry* pakfire_config_create_entry(
+		pakfire_config* config, const char* name, const char* key) {
+	pakfire_config_section* section = NULL;
+	pakfire_config_entry* entry = NULL;
 	int r;
 
 	// Allocate a new entry
@@ -207,10 +207,10 @@ ERROR:
 	return NULL;
 }
 
-static struct pakfire_config_entry* pakfire_config_find(struct pakfire_config* config,
+static pakfire_config_entry* pakfire_config_find(pakfire_config* config,
 		const char* name, const char* key) {
-	struct pakfire_config_section* section = NULL;
-	struct pakfire_config_entry* entry = NULL;
+	pakfire_config_section* section = NULL;
+	pakfire_config_entry* entry = NULL;
 
 	// Check for valid input
 	if (!key) {
@@ -236,10 +236,10 @@ static struct pakfire_config_entry* pakfire_config_find(struct pakfire_config* c
 	return NULL;
 }
 
-int pakfire_config_set(struct pakfire_config* config,
+int pakfire_config_set(pakfire_config* config,
 		const char* section, const char* key, const char* value) {
 	// Check if this entry exists
-	struct pakfire_config_entry* entry = pakfire_config_find(config, section, key);
+	pakfire_config_entry* entry = pakfire_config_find(config, section, key);
 
 	// Create a new entry if it doesn't
 	if (!entry) {
@@ -252,7 +252,7 @@ int pakfire_config_set(struct pakfire_config* config,
 	return pakfire_string_set(entry->value, value);
 }
 
-int pakfire_config_set_format(struct pakfire_config* config,
+int pakfire_config_set_format(pakfire_config* config,
 		const char* section, const char* key, const char* format, ...) {
 	char* buffer = NULL;
 	va_list args;
@@ -276,7 +276,7 @@ int pakfire_config_set_format(struct pakfire_config* config,
 	return r;
 }
 
-static int pakfire_config_append(struct pakfire_config* config,
+static int pakfire_config_append(pakfire_config* config,
 		const char* section, const char* key, const char* value2) {
 	char* buffer = NULL;
 	int r;
@@ -302,9 +302,9 @@ static int pakfire_config_append(struct pakfire_config* config,
 	return r;
 }
 
-const char* pakfire_config_get(struct pakfire_config* config,
+const char* pakfire_config_get(pakfire_config* config,
 		const char* section, const char* key, const char* _default) {
-	struct pakfire_config_entry* entry = pakfire_config_find(config, section, key);
+	pakfire_config_entry* entry = pakfire_config_find(config, section, key);
 
 	// Return the value if set
 	if (entry && *entry->value)
@@ -314,9 +314,9 @@ const char* pakfire_config_get(struct pakfire_config* config,
 	return _default;
 }
 
-long int pakfire_config_get_int(struct pakfire_config* config,
+long int pakfire_config_get_int(pakfire_config* config,
 		const char* section, const char* key, long int _default) {
-	struct pakfire_config_entry* entry = pakfire_config_find(config, section, key);
+	pakfire_config_entry* entry = pakfire_config_find(config, section, key);
 
 	// Return the value if set
 	if (entry && *entry->value)
@@ -326,9 +326,9 @@ long int pakfire_config_get_int(struct pakfire_config* config,
 	return _default;
 }
 
-int pakfire_config_get_bool(struct pakfire_config* config,
+int pakfire_config_get_bool(pakfire_config* config,
 		const char* section, const char* key, int _default) {
-	struct pakfire_config_entry* entry = pakfire_config_find(config, section, key);
+	pakfire_config_entry* entry = pakfire_config_find(config, section, key);
 
 	// Return the value if set
 	if (entry && *entry->value) {
@@ -357,9 +357,9 @@ int pakfire_config_get_bool(struct pakfire_config* config,
 	return _default;
 }
 
-size_t pakfire_config_get_bytes(struct pakfire_config* config,
+size_t pakfire_config_get_bytes(pakfire_config* config,
 		const char* section, const char* key, const size_t _default) {
-	struct pakfire_config_entry* entry = pakfire_config_find(config, section, key);
+	pakfire_config_entry* entry = pakfire_config_find(config, section, key);
 
 	if (entry && *entry->value)
 		return pakfire_string_parse_bytes(entry->value);
@@ -368,10 +368,10 @@ size_t pakfire_config_get_bytes(struct pakfire_config* config,
 	return _default;
 }
 
-int pakfire_config_walk_sections(struct pakfire_config* config,
+int pakfire_config_walk_sections(pakfire_config* config,
 		pakfire_config_walk_callback callback, void* p) {
-	struct pakfire_config_section* default_section = NULL;
-	struct pakfire_config_section* section = NULL;
+	pakfire_config_section* default_section = NULL;
+	pakfire_config_section* section = NULL;
 	int r = 0;
 
 	// Try to fetch the default section
@@ -399,8 +399,8 @@ ERROR:
 	return r;
 }
 
-int pakfire_config_has_section(struct pakfire_config* config, const char* name) {
-	struct pakfire_config_section* section = NULL;
+int pakfire_config_has_section(pakfire_config* config, const char* name) {
+	pakfire_config_section* section = NULL;
 
 	// Fetch the section
 	section = pakfire_config_get_section(config, name);
@@ -410,7 +410,7 @@ int pakfire_config_has_section(struct pakfire_config* config, const char* name)
 	return 0;
 }
 
-int pakfire_config_read(struct pakfire_config* config, FILE* f) {
+int pakfire_config_read(pakfire_config* config, FILE* f) {
 	char section[SECTION_MAX_LENGTH] = "";
 	char key[KEY_MAX_LENGTH] = "";
 	int r = -EINVAL;
@@ -506,7 +506,7 @@ ERROR:
 	return r;
 }
 
-int pakfire_config_read_path(struct pakfire_config* config, const char* path) {
+int pakfire_config_read_path(pakfire_config* config, const char* path) {
 	FILE* f = NULL;
 	int r;
 
@@ -524,7 +524,7 @@ int pakfire_config_read_path(struct pakfire_config* config, const char* path) {
 	return r;
 }
 
-int pakfire_config_parse(struct pakfire_config* config, const char* s, ssize_t length) {
+int pakfire_config_parse(pakfire_config* config, const char* s, ssize_t length) {
 	FILE* f = NULL;
 	int r;
 
@@ -554,7 +554,7 @@ int pakfire_config_parse(struct pakfire_config* config, const char* s, ssize_t l
 	return r;
 }
 
-static int pakfire_config_dump_multiline_entry(struct pakfire_config_entry* entry, FILE* f) {
+static int pakfire_config_dump_multiline_entry(pakfire_config_entry* entry, FILE* f) {
 	char* value = NULL;
 	char* p = NULL;
 	int r;
@@ -591,7 +591,7 @@ ERROR:
 	return r;
 }
 
-static int pakfire_config_dump_entry(struct pakfire_config_entry* entry, FILE* f) {
+static int pakfire_config_dump_entry(pakfire_config_entry* entry, FILE* f) {
 	int r;
 
 	// Handle multiline entries separately
@@ -606,10 +606,10 @@ static int pakfire_config_dump_entry(struct pakfire_config_entry* entry, FILE* f
 	return 0;
 }
 
-static int pakfire_config_dump_section(struct pakfire_config* config,
+static int pakfire_config_dump_section(pakfire_config* config,
 		const char* name, void* p) {
-	struct pakfire_config_section* section = NULL;
-	struct pakfire_config_entry* entry = NULL;
+	pakfire_config_section* section = NULL;
+	pakfire_config_entry* entry = NULL;
 	int r = 0;
 
 	FILE* f = (FILE*)p;
@@ -640,6 +640,6 @@ ERROR:
 	return r;
 }
 
-int pakfire_config_dump(struct pakfire_config* config, FILE* f) {
+int pakfire_config_dump(pakfire_config* config, FILE* f) {
 	return pakfire_config_walk_sections(config, pakfire_config_dump_section, f);
 }
diff --git a/src/pakfire/config.h b/src/pakfire/config.h
index f77c7b3e..e02ddb17 100644
--- a/src/pakfire/config.h
+++ b/src/pakfire/config.h
@@ -23,39 +23,39 @@
 
 #include <stdio.h>
 
-struct pakfire_config;
+typedef struct pakfire_config pakfire_config;
 
-int pakfire_config_create(struct pakfire_config** config);
-struct pakfire_config* pakfire_config_ref(struct pakfire_config* config);
-struct pakfire_config* pakfire_config_unref(struct pakfire_config* config);
+int pakfire_config_create(pakfire_config** config);
+pakfire_config* pakfire_config_ref(pakfire_config* config);
+pakfire_config* pakfire_config_unref(pakfire_config* config);
 
-int pakfire_config_set(struct pakfire_config* config,
+int pakfire_config_set(pakfire_config* config,
 	const char* section, const char* key, const char* value);
-int pakfire_config_set_format(struct pakfire_config* config,
+int pakfire_config_set_format(pakfire_config* config,
 	const char* section, const char* key, const char* format, ...)
 	__attribute__((format(printf, 4, 5)));
 
-const char* pakfire_config_get(struct pakfire_config* config,
+const char* pakfire_config_get(pakfire_config* config,
 	const char* section, const char* key, const char* _default);
-long int pakfire_config_get_int(struct pakfire_config* config,
+long int pakfire_config_get_int(pakfire_config* config,
 	const char* section, const char* key, long int _default);
-int pakfire_config_get_bool(struct pakfire_config* config,
+int pakfire_config_get_bool(pakfire_config* config,
 	const char* section, const char* key, int _default);
-size_t pakfire_config_get_bytes(struct pakfire_config* config,
+size_t pakfire_config_get_bytes(pakfire_config* config,
 	const char* section, const char* key, const size_t _default);
 
 // Walk
 typedef int (*pakfire_config_walk_callback)
-	(struct pakfire_config* config, const char* name, void* p);
-int pakfire_config_walk_sections(struct pakfire_config* config,
+	(pakfire_config* config, const char* name, void* p);
+int pakfire_config_walk_sections(pakfire_config* config,
 	pakfire_config_walk_callback callback, void* p);
 
-int pakfire_config_has_section(struct pakfire_config* config, const char* section);
+int pakfire_config_has_section(pakfire_config* config, const char* section);
 
-int pakfire_config_read(struct pakfire_config* config, FILE* f);
-int pakfire_config_read_path(struct pakfire_config* config, const char* path);
-int pakfire_config_parse(struct pakfire_config* config, const char* s, ssize_t length);
+int pakfire_config_read(pakfire_config* config, FILE* f);
+int pakfire_config_read_path(pakfire_config* config, const char* path);
+int pakfire_config_parse(pakfire_config* config, const char* s, ssize_t length);
 
-int pakfire_config_dump(struct pakfire_config* config, FILE* f);
+int pakfire_config_dump(pakfire_config* config, FILE* f);
 
 #endif /* PAKFIRE_CONFIG_H */
diff --git a/src/pakfire/ctx.c b/src/pakfire/ctx.c
index ceee07a2..5abf041b 100644
--- a/src/pakfire/ctx.c
+++ b/src/pakfire/ctx.c
@@ -47,7 +47,7 @@ struct pakfire_ctx {
 	int flags;
 
 	// Config
-	struct pakfire_config* config;
+	pakfire_config* config;
 
 	// Distro
 	struct pakfire_distro distro;
@@ -285,7 +285,7 @@ int pakfire_ctx_set_flag(pakfire_ctx* self, int flag) {
 
 // Config
 
-struct pakfire_config* pakfire_ctx_get_config(pakfire_ctx* self) {
+pakfire_config* pakfire_ctx_get_config(pakfire_ctx* self) {
 	if (!self->config)
 		return NULL;
 
diff --git a/src/pakfire/ctx.h b/src/pakfire/ctx.h
index 41431770..7934a4bd 100644
--- a/src/pakfire/ctx.h
+++ b/src/pakfire/ctx.h
@@ -47,7 +47,7 @@ int pakfire_ctx_set_flag(pakfire_ctx* self, int flag);
 
 // Config
 
-struct pakfire_config* pakfire_ctx_get_config(pakfire_ctx* self);
+pakfire_config* pakfire_ctx_get_config(pakfire_ctx* self);
 
 // Logging
 
diff --git a/src/pakfire/daemon.c b/src/pakfire/daemon.c
index dce90b73..f8b127bd 100644
--- a/src/pakfire/daemon.c
+++ b/src/pakfire/daemon.c
@@ -273,7 +273,7 @@ static int pakfire_daemon_setup_loop(struct pakfire_daemon* self) {
 }
 
 static int pakfire_daemon_setup_client(struct pakfire_daemon* self) {
-	struct pakfire_config* config = NULL;
+	pakfire_config* config = NULL;
 	const char* url = NULL;
 	int r;
 
diff --git a/src/pakfire/job.c b/src/pakfire/job.c
index db8ff44e..b3961aa2 100644
--- a/src/pakfire/job.c
+++ b/src/pakfire/job.c
@@ -85,7 +85,7 @@ struct pakfire_job {
 	char ccache_path[PATH_MAX];
 
 	// Configuration
-	struct pakfire_config* config;
+	pakfire_config* config;
 
 	// PID File Descriptor
 	int pidfd;
diff --git a/src/pakfire/pakfire.c b/src/pakfire/pakfire.c
index 2a8da5c9..ea5d3260 100644
--- a/src/pakfire/pakfire.c
+++ b/src/pakfire/pakfire.c
@@ -106,7 +106,7 @@ struct pakfire {
 	// Pool
 	Pool* pool;
 
-	struct pakfire_config* config;
+	pakfire_config* config;
 
 	// Distro
 	struct pakfire_distro distro;
@@ -973,7 +973,7 @@ ERROR:
 }
 
 int pakfire_create(struct pakfire** pakfire, pakfire_ctx* ctx,
-		struct pakfire_config* config, const char* path, const char* arch, int flags) {
+		pakfire_config* config, const char* path, const char* arch, int flags) {
 	struct pakfire* p = NULL;
 	int r;
 
@@ -1193,7 +1193,7 @@ int pakfire_has_flag(struct pakfire* pakfire, const int flag) {
 	return pakfire->flags & flag;
 }
 
-struct pakfire_config* pakfire_get_config(struct pakfire* pakfire) {
+pakfire_config* pakfire_get_config(struct pakfire* pakfire) {
 	if (!pakfire->config)
 		return NULL;
 
diff --git a/src/pakfire/pakfire.h b/src/pakfire/pakfire.h
index 3e2c062e..e9ec9e9f 100644
--- a/src/pakfire/pakfire.h
+++ b/src/pakfire/pakfire.h
@@ -58,7 +58,7 @@ typedef void (*pakfire_status_callback)(struct pakfire* pakfire, void* data,
 	int progress, const char* status);
 
 int pakfire_create(struct pakfire** pakfire, pakfire_ctx* ctx,
-	struct pakfire_config* config, const char* path, const char* arch, int flags);
+	pakfire_config* config, const char* path, const char* arch, int flags);
 
 struct pakfire* pakfire_ref(struct pakfire* pakfire);
 struct pakfire* pakfire_unref(struct pakfire* pakfire);
@@ -109,7 +109,7 @@ gid_t pakfire_gid(struct pakfire* pakfire);
 const struct pakfire_subid* pakfire_subuid(struct pakfire* pakfire);
 const struct pakfire_subid* pakfire_subgid(struct pakfire* pakfire);
 
-struct pakfire_config* pakfire_get_config(struct pakfire* pakfire);
+pakfire_config* pakfire_get_config(struct pakfire* pakfire);
 
 int pakfire_confirm(struct pakfire* pakfire, const char* message, const char* question);
 int pakfire_pick_solution(struct pakfire* pakfire, struct pakfire_transaction* transaction);
diff --git a/src/pakfire/repo.c b/src/pakfire/repo.c
index 076e4f4c..e35f79c0 100644
--- a/src/pakfire/repo.c
+++ b/src/pakfire/repo.c
@@ -341,7 +341,7 @@ ERROR:
 	return r;
 }
 
-static int __pakfire_repo_import(struct pakfire_config* config, const char* section, void* data) {
+static int __pakfire_repo_import(pakfire_config* config, const char* section, void* data) {
 	struct pakfire_repo* self = NULL;
 	struct pakfire* pakfire = data;
 	int r;
@@ -430,7 +430,7 @@ ERROR:
 	return r;
 }
 
-int pakfire_repo_import(struct pakfire* pakfire, struct pakfire_config* config) {
+int pakfire_repo_import(struct pakfire* pakfire, pakfire_config* config) {
 	int r;
 
 	// Import all repositories from the configuration
@@ -1730,7 +1730,7 @@ int pakfire_repo_set_mirrorlist_url(struct pakfire_repo* repo, const char* url)
 }
 
 int pakfire_repo_write_config(struct pakfire_repo* repo, FILE* f) {
-	struct pakfire_config* config = NULL;
+	pakfire_config* config = NULL;
 	struct pakfire_key* key = NULL;
 	char* section = NULL;
 	char* buffer = NULL;
diff --git a/src/pakfire/repo.h b/src/pakfire/repo.h
index bc617ab9..22d2426c 100644
--- a/src/pakfire/repo.h
+++ b/src/pakfire/repo.h
@@ -120,7 +120,7 @@ int pakfire_repo_is_local(struct pakfire_repo* repo);
 
 char* pakfire_repo_url_replace(struct pakfire_repo* repo, const char* url);
 
-int pakfire_repo_import(struct pakfire* pakfire, struct pakfire_config* config);
+int pakfire_repo_import(struct pakfire* pakfire, pakfire_config* config);
 const char* pakfire_repo_get_path(struct pakfire_repo* repo);
 
 void pakfire_repo_has_changed(struct pakfire_repo* repo);
diff --git a/src/pakfire/snapshot.c b/src/pakfire/snapshot.c
index 60939933..0db0311b 100644
--- a/src/pakfire/snapshot.c
+++ b/src/pakfire/snapshot.c
@@ -508,7 +508,7 @@ ERROR:
 	Creates a new snapshot
 */
 int pakfire_snapshot_make(struct pakfire_snapshot** snapshot, struct pakfire* pakfire) {
-	struct pakfire_config* config = NULL;
+	pakfire_config* config = NULL;
 	struct pakfire* p = NULL;
 	char snapshot_path[PATH_MAX];
 	char tmp[PATH_MAX];
diff --git a/src/pakfire/xfer.c b/src/pakfire/xfer.c
index 31ee3904..3c582396 100644
--- a/src/pakfire/xfer.c
+++ b/src/pakfire/xfer.c
@@ -256,7 +256,7 @@ static size_t pakfire_xfer_write(
 }
 
 static int pakfire_xfer_setup(struct pakfire_xfer* xfer) {
-	struct pakfire_config* config = NULL;
+	pakfire_config* config = NULL;
 	const char* proxy = NULL;
 	int r;
 
diff --git a/src/python/pakfire.c b/src/python/pakfire.c
index 8bbaff56..00837c61 100644
--- a/src/python/pakfire.c
+++ b/src/python/pakfire.c
@@ -60,7 +60,7 @@ static PyObject* Pakfire_new(PyTypeObject* type, PyObject* args, PyObject* kwds)
 
 static int Pakfire_init(PakfireObject* self, PyObject* args, PyObject* kwds) {
 	const char* kwlist[] = { "ctx", "path", "arch", "config", "stub", NULL };
-	struct pakfire_config* c = NULL;
+	pakfire_config* c = NULL;
 	const char* config = NULL;
 	const char* path = NULL;
 	const char* arch = NULL;
diff --git a/tests/libpakfire/config.c b/tests/libpakfire/config.c
index 37258073..4c08eb0e 100644
--- a/tests/libpakfire/config.c
+++ b/tests/libpakfire/config.c
@@ -23,7 +23,7 @@
 #include "../testsuite.h"
 
 static int test_get_and_set(const struct test* t) {
-	struct pakfire_config* config = NULL;
+	pakfire_config* config = NULL;
 	int r = EXIT_FAILURE;
 
 	ASSERT_SUCCESS(pakfire_config_create(&config));
@@ -77,7 +77,7 @@ FAIL:
 }
 
 static int test_parse(const struct test* t) {
-	struct pakfire_config* config = NULL;
+	pakfire_config* config = NULL;
 	int r = EXIT_FAILURE;
 
 	const char* TEST_INPUT =
@@ -149,7 +149,7 @@ FAIL:
 }
 
 static int test_parse_multiline(const struct test* t) {
-	struct pakfire_config* config = NULL;
+	pakfire_config* config = NULL;
 	int r = EXIT_FAILURE;
 
 	const char* TEST_INPUT =
diff --git a/tests/libpakfire/main.c b/tests/libpakfire/main.c
index dbdccb41..9624e76b 100644
--- a/tests/libpakfire/main.c
+++ b/tests/libpakfire/main.c
@@ -54,7 +54,7 @@ FAIL:
 }
 
 static int test_fail(const struct test* t) {
-	struct pakfire_config* config = NULL;
+	pakfire_config* config = NULL;
 	struct pakfire* pakfire = NULL;
 	int r = EXIT_FAILURE;
 
diff --git a/tests/parser/test.c b/tests/parser/test.c
index e21621f6..9848dfdf 100644
--- a/tests/parser/test.c
+++ b/tests/parser/test.c
@@ -26,7 +26,7 @@
 #include <pakfire/util.h>
 
 int main(int argc, const char* argv[]) {
-	struct pakfire_config* config = NULL;
+	pakfire_config* config = NULL;
 	pakfire_ctx* ctx = NULL;
 	struct pakfire* pakfire = NULL;
 	struct pakfire_parser* parser = NULL;
diff --git a/tests/testsuite.h b/tests/testsuite.h
index 940e72bc..38a497c5 100644
--- a/tests/testsuite.h
+++ b/tests/testsuite.h
@@ -46,7 +46,7 @@ struct test {
 	int flags;
 
 	// Config
-	struct pakfire_config* config;
+	pakfire_config* config;
 
 	// Pakfire Context
 	pakfire_ctx* ctx;