From 52ee93f160f87f015b3615eaeee506c2adcde604 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 12 Jan 2021 04:29:08 +0100 Subject: [PATCH 1/2] libgluonutil: add missing gluonutil_get_primary_domain() prototype Fixes respondd on 64bit archs, as gluonutil_get_primary_domain() was assumed to return int without the prototype. Fixes: bcf57467dd45 ("libgluonutil: implement gluonutil_get_primary_domain()") --- package/libgluonutil/src/libgluonutil.h | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libgluonutil/src/libgluonutil.h b/package/libgluonutil/src/libgluonutil.h index b33b93e7..34765f6f 100644 --- a/package/libgluonutil/src/libgluonutil.h +++ b/package/libgluonutil/src/libgluonutil.h @@ -54,6 +54,7 @@ struct json_object * gluonutil_wrap_and_free_string(char *str); bool gluonutil_has_domains(void); char * gluonutil_get_domain(void); +char * gluonutil_get_primary_domain(void); struct json_object * gluonutil_load_site_config(void); #endif /* _LIBGLUON_LIBGLUON_H_ */ From 17123aa4200cbca1eeea95dc32d0d3f64ba2898b Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 12 Jan 2021 04:32:23 +0100 Subject: [PATCH 2/2] gluon-respondd: fix count_stations() arguments Fixes warnings about implicit pointer-to-int and int-to-pointer casts. Fixes: 59a4cd63b810 ("gluon-respondd: expose OWE clients in nodeinfo") --- package/gluon-respondd/src/respondd-statistics.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gluon-respondd/src/respondd-statistics.c b/package/gluon-respondd/src/respondd-statistics.c index baf49c64..5f9e15bf 100644 --- a/package/gluon-respondd/src/respondd-statistics.c +++ b/package/gluon-respondd/src/respondd-statistics.c @@ -239,7 +239,7 @@ static void count_iface_stations(size_t *wifi24, size_t *wifi5, const char *ifna } } -static void count_stations(size_t *wifi24, size_t *wifi5, size_t *owe24, size_t owe5) { +static void count_stations(size_t *wifi24, size_t *wifi5, size_t *owe24, size_t *owe5) { struct uci_context *ctx = uci_alloc_context(); if (!ctx) return;