Make privilegeset_privs more const

diff --git a/include/privilege.h b/include/privilege.h
index 5f26a22f1ddc12d57dc8dbcfb8c64f48e48db64d..54143c6069ce3b49765c2f8d347aff9590d8bdf5 100644 (file)
--- a/include/privilege.h
+++ b/include/privilege.h
@@ -68,7 +68,7 @@ struct privset_diff {
 };
 
 bool privilegeset_in_set(const struct PrivilegeSet *set, const char *priv);
-const char **privilegeset_privs(const struct PrivilegeSet *set);
+const char *const *privilegeset_privs(const struct PrivilegeSet *set);
 struct PrivilegeSet *privilegeset_set_new(const char *name, const char *privs, PrivilegeFlags flags);
 struct PrivilegeSet *privilegeset_extend(const struct PrivilegeSet *parent, const char *name, const char *privs, PrivilegeFlags flags);
 struct PrivilegeSet *privilegeset_get(const char *name);

diff --git a/ircd/privilege.c b/ircd/privilege.c
index 7da649b1c39fa445855f3b65edd96a08001b6aef..2f2c1cdef7b3fb1ac56a4af7c33998321133ca28 100644 (file)
--- a/ircd/privilege.c
+++ b/ircd/privilege.c
@@ -233,7 +233,7 @@ privilegeset_in_set(const struct PrivilegeSet *set, const char *priv)
        return found != NULL;
 }
 
-const char **
+const char *const *
 privilegeset_privs(const struct PrivilegeSet *set)
 {
        static const char *no_privs[] = { NULL };
@@ -451,7 +451,7 @@ privilegeset_report(struct Client *source_p)
                                set->name);
                send_multiline_remote_pad(source_p, &me);
                send_multiline_remote_pad(source_p, source_p);
-               for (const char **s = privilegeset_privs(set); *s != NULL; s++)
+               for (const char *const *s = privilegeset_privs(set); *s != NULL; s++)
                        send_multiline_item(source_p, "%s", *s);
                send_multiline_fini(source_p, NULL);
        }

diff --git a/ircd/s_user.c b/ircd/s_user.c
index e39ed93e91d2c6835b4937afbfb89e7e1ecae4b3..afd37d99d0dbdcca659eaccb3a850117a42b43b0 100644 (file)
--- a/ircd/s_user.c
+++ b/ircd/s_user.c
@@ -1492,7 +1492,7 @@ oper_up(struct Client *source_p, struct oper_conf *oper_p)
        sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
        sendto_one_notice(source_p, ":*** Oper privilege set is %s", oper_p->privset->name);
        send_multiline_init(source_p, " ", ":%s NOTICE %s :*** Oper privs are ", me.name, source_p->name);
-       for (const char **s = privilegeset_privs(oper_p->privset); *s != NULL; s++)
+       for (const char *const *s = privilegeset_privs(oper_p->privset); *s != NULL; s++)
                send_multiline_item(source_p, "%s", *s);
        send_multiline_fini(source_p, NULL);
        send_oper_motd(source_p);

diff --git a/modules/m_privs.c b/modules/m_privs.c
index 443530bbca122d45b4d257276ce6ee917b34bf7e..5e637576bd69f0b5aaa03dbe84f630c97fff0ef3 100644 (file)
--- a/modules/m_privs.c
+++ b/modules/m_privs.c
@@ -95,7 +95,7 @@ static void show_privs(struct Client *source_p, struct Client *target_p)
        send_multiline_remote_pad(source_p, source_p);
 
        if (target_p->user->privset)
-               for (const char **s = privilegeset_privs(target_p->user->privset); *s != NULL; s++)
+               for (const char *const *s = privilegeset_privs(target_p->user->privset); *s != NULL; s++)
                        send_multiline_item(source_p, "%s", *s);
 
        if (IsOper(target_p))