From 974bf614280783a3b0bf392ca80f22dfcf1817f2 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 27 Oct 2021 20:44:25 +0200 Subject: [PATCH] glib-aux: make GBytes parameter const for read-only helper functions --- src/libnm-glib-aux/nm-shared-utils.c | 4 ++-- src/libnm-glib-aux/nm-shared-utils.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libnm-glib-aux/nm-shared-utils.c b/src/libnm-glib-aux/nm-shared-utils.c index d5ad4e0f48..31fec2a54d 100644 --- a/src/libnm-glib-aux/nm-shared-utils.c +++ b/src/libnm-glib-aux/nm-shared-utils.c @@ -538,7 +538,7 @@ nm_utils_gbytes_equal_mem(GBytes *bytes, gconstpointer mem_data, gsize mem_len) } GVariant * -nm_utils_gbytes_to_variant_ay(GBytes *bytes) +nm_utils_gbytes_to_variant_ay(const GBytes *bytes) { const guint8 *p = NULL; gsize l = 0; @@ -546,7 +546,7 @@ nm_utils_gbytes_to_variant_ay(GBytes *bytes) if (!bytes) { /* for convenience, accept NULL to return an empty variant */ } else - p = g_bytes_get_data(bytes, &l); + p = g_bytes_get_data((GBytes *) bytes, &l); return nm_g_variant_new_ay(p, l); } diff --git a/src/libnm-glib-aux/nm-shared-utils.h b/src/libnm-glib-aux/nm-shared-utils.h index dd50973fe1..53c168a6b9 100644 --- a/src/libnm-glib-aux/nm-shared-utils.h +++ b/src/libnm-glib-aux/nm-shared-utils.h @@ -604,14 +604,14 @@ GBytes *nm_gbytes_get_empty(void); GBytes *nm_g_bytes_new_from_str(const char *str); static inline gboolean -nm_gbytes_equal0(GBytes *a, GBytes *b) +nm_gbytes_equal0(const GBytes *a, const GBytes *b) { return a == b || (a && b && g_bytes_equal(a, b)); } gboolean nm_utils_gbytes_equal_mem(GBytes *bytes, gconstpointer mem_data, gsize mem_len); -GVariant *nm_utils_gbytes_to_variant_ay(GBytes *bytes); +GVariant *nm_utils_gbytes_to_variant_ay(const GBytes *bytes); GHashTable *nm_strdict_clone(GHashTable *src);