From: Michael Tremer Date: Tue, 1 Jul 2025 08:18:01 +0000 (+0000) Subject: os: Convert all structs to types X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eea904f30ada07cd4dc1412fcbfe263dae2a4ab2;p=pakfire.git os: Convert all structs to types Signed-off-by: Michael Tremer --- diff --git a/src/pakfire/builder.c b/src/pakfire/builder.c index bbb98e74..5aab246e 100644 --- a/src/pakfire/builder.c +++ b/src/pakfire/builder.c @@ -191,9 +191,9 @@ static int pakfire_builder_schedule_stats(pakfire_builder* self, uint64_t usec) static int pakfire_builder_submit_stats(sd_event_source* event, uint64_t usec, void* data) { pakfire_builder* self = data; - struct pakfire_cpustat cpustat = {}; - struct pakfire_loadavg loadavg = {}; - struct pakfire_meminfo meminfo = {}; + pakfire_cpustat cpustat = {}; + pakfire_loadavg loadavg = {}; + pakfire_meminfo meminfo = {}; json_object* stats = NULL; json_object* p = NULL; int r; @@ -207,21 +207,21 @@ static int pakfire_builder_submit_stats(sd_event_source* event, uint64_t usec, v goto ERROR; // Fetch CPU stats - r = pakfire_cpustat(&cpustat); + r = pakfire_get_cpustat(&cpustat); if (r < 0) { ERROR(self->ctx, "Failed to fetch CPU stats: %s\n", strerror(-r)); goto ERROR; } // Fetch load average - r = pakfire_loadavg(&loadavg); + r = pakfire_get_loadavg(&loadavg); if (r < 0) { ERROR(self->ctx, "Failed to fetch load average: %s\n", strerror(-r)); goto ERROR; } // Fetch meminfo - r = pakfire_meminfo(&meminfo); + r = pakfire_get_meminfo(&meminfo); if (r < 0) { ERROR(self->ctx, "Failed to fetch meminfo: %s\n", strerror(-r)); goto ERROR; diff --git a/src/pakfire/ctx.c b/src/pakfire/ctx.c index ab039fc1..12338e3c 100644 --- a/src/pakfire/ctx.c +++ b/src/pakfire/ctx.c @@ -50,7 +50,7 @@ struct pakfire_ctx { pakfire_config* config; // Distro - struct pakfire_distro distro; + pakfire_distro distro; // Event Loop sd_event* loop; @@ -239,7 +239,7 @@ int pakfire_ctx_create(pakfire_ctx** ctx, const char* path) { goto ERROR; // Load the distribution information - r = pakfire_distro(&self->distro, NULL); + r = pakfire_get_distro(&self->distro, NULL); if (r < 0) goto ERROR; diff --git a/src/pakfire/os.c b/src/pakfire/os.c index 2a342ba3..1930e772 100644 --- a/src/pakfire/os.c +++ b/src/pakfire/os.c @@ -79,7 +79,7 @@ ERROR: return r; } -int pakfire_sysinfo(struct pakfire_sysinfo* sysinfo) { +int pakfire_get_sysinfo(pakfire_sysinfo* sysinfo) { int r; // Check input @@ -106,7 +106,7 @@ int pakfire_sysinfo(struct pakfire_sysinfo* sysinfo) { * On aarch64, /proc/cpuinfo is very stripped down and does not give us a lot * of information about the CPU. This function tries to add some extra stuff. */ -static int pakfire_cpuinfo_aarch64(struct pakfire_cpuinfo* cpuinfo) { +static int pakfire_cpuinfo_aarch64(pakfire_cpuinfo* cpuinfo) { const char* vendor = NULL; const char* model = NULL; uint64_t midr = 0; @@ -184,7 +184,7 @@ static int pakfire_cpuinfo_aarch64(struct pakfire_cpuinfo* cpuinfo) { #endif /* __aarch64__ */ static int pakfire_parse_cpuinfo(char* line, size_t length, void* data) { - struct pakfire_cpuinfo* cpuinfo = data; + pakfire_cpuinfo* cpuinfo = data; int r; // Key & Value @@ -216,7 +216,7 @@ static int pakfire_parse_cpuinfo(char* line, size_t length, void* data) { return 0; } -int pakfire_cpuinfo(struct pakfire_cpuinfo* cpuinfo) { +int pakfire_get_cpuinfo(pakfire_cpuinfo* cpuinfo) { int r; // Parse /proc/cpuinfo @@ -240,7 +240,7 @@ int pakfire_cpuinfo(struct pakfire_cpuinfo* cpuinfo) { // CPU Stats static int pakfire_parse_cpustat(char* line, size_t length, void* data) { - struct pakfire_cpustat* cpustat = data; + pakfire_cpustat* cpustat = data; struct cpustat { unsigned long int user; unsigned long int nice; @@ -283,14 +283,14 @@ static int pakfire_parse_cpustat(char* line, size_t length, void* data) { return 0; } -int pakfire_cpustat(struct pakfire_cpustat* cpustat) { +int pakfire_get_cpustat(pakfire_cpustat* cpustat) { return pakfire_parse_file("/proc/stat", pakfire_parse_cpustat, cpustat); } // Load Average static int pakfire_parse_loadavg(char* line, size_t length, void* data) { - struct pakfire_loadavg* loadavg = data; + pakfire_loadavg* loadavg = data; int r; // Parse the first three values @@ -301,7 +301,7 @@ static int pakfire_parse_loadavg(char* line, size_t length, void* data) { return 0; } -int pakfire_loadavg(struct pakfire_loadavg* loadavg) { +int pakfire_get_loadavg(pakfire_loadavg* loadavg) { return pakfire_parse_file("/proc/loadavg", pakfire_parse_loadavg, loadavg); } @@ -335,7 +335,7 @@ static int pakfire_parse_meminfo_value(uint64_t* mem, const char* s) { } static int pakfire_parse_meminfo(char* line, size_t length, void* data) { - struct pakfire_meminfo* meminfo = data; + pakfire_meminfo* meminfo = data; int r; // Key & Value @@ -394,7 +394,7 @@ static int pakfire_parse_meminfo(char* line, size_t length, void* data) { return 0; } -int pakfire_meminfo(struct pakfire_meminfo* meminfo) { +int pakfire_get_meminfo(pakfire_meminfo* meminfo) { int r; // Parse /proc/meminfo @@ -414,7 +414,7 @@ int pakfire_meminfo(struct pakfire_meminfo* meminfo) { // Distro static int pakfire_parse_distro(char* line, size_t length, void* data) { - struct pakfire_distro* distro = data; + pakfire_distro* distro = data; int r; // Key & Value @@ -460,7 +460,7 @@ static int pakfire_parse_distro(char* line, size_t length, void* data) { return 0; } -int pakfire_distro(struct pakfire_distro* distro, const char* path) { +int pakfire_get_distro(pakfire_distro* distro, const char* path) { if (!path) path = "/etc/os-release"; diff --git a/src/pakfire/os.h b/src/pakfire/os.h index 1836ebdf..ebed0738 100644 --- a/src/pakfire/os.h +++ b/src/pakfire/os.h @@ -29,26 +29,26 @@ // System Info -struct pakfire_sysinfo { +typedef struct pakfire_sysinfo { char vendor[OS_VENDOR_MAX]; char name[OS_NAME_MAX]; -}; +} pakfire_sysinfo; -int pakfire_sysinfo(struct pakfire_sysinfo* sysinfo); +int pakfire_get_sysinfo(pakfire_sysinfo* sysinfo); // CPU info -struct pakfire_cpuinfo { +typedef struct pakfire_cpuinfo { char vendor[OS_VENDOR_MAX]; char model[OS_NAME_MAX]; unsigned int count; -}; +} pakfire_cpuinfo; -int pakfire_cpuinfo(struct pakfire_cpuinfo* cpuinfo); +int pakfire_get_cpuinfo(pakfire_cpuinfo* cpuinfo); // CPU stat -struct pakfire_cpustat { +typedef struct pakfire_cpustat { double user; double nice; double system; @@ -59,23 +59,23 @@ struct pakfire_cpustat { double steal; double guest; double guest_nice; -}; +} pakfire_cpustat; -int pakfire_cpustat(struct pakfire_cpustat* cpustat); +int pakfire_get_cpustat(pakfire_cpustat* cpustat); // Load Average -struct pakfire_loadavg { +typedef struct pakfire_loadavg { double load1; double load5; double load15; -}; +} pakfire_loadavg; -int pakfire_loadavg(struct pakfire_loadavg* loadavg); +int pakfire_get_loadavg(pakfire_loadavg* loadavg); // Meminfo -struct pakfire_meminfo { +typedef struct pakfire_meminfo { uint64_t total; uint64_t used; uint64_t free; @@ -90,13 +90,13 @@ struct pakfire_meminfo { uint64_t swap_total; uint64_t swap_used; uint64_t swap_free; -}; +} pakfire_meminfo; -int pakfire_meminfo(struct pakfire_meminfo* meminfo); +int pakfire_get_meminfo(pakfire_meminfo* meminfo); // Distro -struct pakfire_distro { +typedef struct pakfire_distro { char pretty_name[256]; char name[256]; char id[256]; @@ -106,8 +106,8 @@ struct pakfire_distro { char version_codename[256]; char version_id[256]; char tag[256]; -}; +} pakfire_distro; -int pakfire_distro(struct pakfire_distro* distro, const char* path); +int pakfire_get_distro(pakfire_distro* distro, const char* path); #endif /* PAKFIRE_OS_H */ diff --git a/src/pakfire/root.c b/src/pakfire/root.c index 5ffac3cb..3a8bf416 100644 --- a/src/pakfire/root.c +++ b/src/pakfire/root.c @@ -109,7 +109,7 @@ struct pakfire_root { pakfire_config* config; // Distro - struct pakfire_distro distro; + pakfire_distro distro; // Snapshot pakfire_snapshot* snapshot; @@ -860,7 +860,7 @@ static int pakfire_root_read_os_release(pakfire_root* self, const char* path) { return r; // Read the distro - r = pakfire_distro(&self->distro, file); + r = pakfire_get_distro(&self->distro, file); if (r < 0) { switch (-r) { case ENOENT: diff --git a/tests/libpakfire/os.c b/tests/libpakfire/os.c index 25cd6544..e96acc22 100644 --- a/tests/libpakfire/os.c +++ b/tests/libpakfire/os.c @@ -24,9 +24,9 @@ // This test parses /proc/cpuinfo static int test_cpuinfo(const struct test* t) { - struct pakfire_cpuinfo cpuinfo = {}; + pakfire_cpuinfo cpuinfo = {}; - ASSERT_SUCCESS(pakfire_cpuinfo(&cpuinfo)); + ASSERT_SUCCESS(pakfire_get_cpuinfo(&cpuinfo)); // We can only check is something has been read ASSERT(*cpuinfo.vendor); @@ -40,9 +40,9 @@ FAIL: // This test parses /proc/stat static int test_cpustat(const struct test* t) { - struct pakfire_cpustat cpustat = {}; + pakfire_cpustat cpustat = {}; - ASSERT_SUCCESS(pakfire_cpustat(&cpustat)); + ASSERT_SUCCESS(pakfire_get_cpustat(&cpustat)); ASSERT(cpustat.user >= 0); ASSERT(cpustat.nice >= 0); @@ -63,9 +63,9 @@ FAIL: // This test parses /proc/loadavg static int test_loadavg(const struct test* t) { - struct pakfire_loadavg loadavg = {}; + pakfire_loadavg loadavg = {}; - ASSERT_SUCCESS(pakfire_loadavg(&loadavg)); + ASSERT_SUCCESS(pakfire_get_loadavg(&loadavg)); ASSERT(loadavg.load1 >= 0); ASSERT(loadavg.load5 >= 0); @@ -79,9 +79,9 @@ FAIL: // This test parses /proc/meminfo static int test_meminfo(const struct test* t) { - struct pakfire_meminfo meminfo = {}; + pakfire_meminfo meminfo = {}; - ASSERT_SUCCESS(pakfire_meminfo(&meminfo)); + ASSERT_SUCCESS(pakfire_get_meminfo(&meminfo)); // We can only check is something has been read ASSERT(meminfo.total > 0); @@ -101,9 +101,9 @@ FAIL: // This test parses /etc/os-release static int test_distro(const struct test* t) { - struct pakfire_distro distro = {}; + pakfire_distro distro = {}; - ASSERT_SUCCESS(pakfire_distro(&distro, NULL)); + ASSERT_SUCCESS(pakfire_get_distro(&distro, NULL)); ASSERT(*distro.name); ASSERT(*distro.version || *distro.version_id);