Constify ConfigTableItem tables

diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c
index 01a5bf18ef7342187535e418db1a485c893dfda7..8e849da59c8a8fc666052b5fd42b5a89eaf11638 100644 (file)
--- a/src/bootchart/bootchart.c
+++ b/src/bootchart/bootchart.c
@@ -132,7 +132,7 @@ static void parse_conf(void) {
                 return;
 
         r = config_parse(NULL, BOOTCHART_CONF, f,
-                         NULL, config_item_table_lookup, (void*) items, true, false, NULL);
+                         NULL, config_item_table_lookup, items, true, false, NULL);
         if (r < 0)
                 log_warning("Failed to parse configuration file: %s", strerror(-r));
 

diff --git a/src/core/load-dropin.c b/src/core/load-dropin.c
index 6ff592be8b1cf944e9177ceae96a62b7c6ab1b52..66547cf4bcd8dfd97633d587a889cfc281f7b656 100644 (file)
--- a/src/core/load-dropin.c
+++ b/src/core/load-dropin.c
@@ -187,7 +187,7 @@ int unit_load_dropin(Unit *u) {
         STRV_FOREACH(f, u->dropin_paths) {
                 config_parse(u->id, *f, NULL,
                              UNIT_VTABLE(u)->sections, config_item_perf_lookup,
-                             (void*) load_fragment_gperf_lookup, false, false, u);
+                             load_fragment_gperf_lookup, false, false, u);
         }
 
         u->dropin_mtime = now(CLOCK_REALTIME);

diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index b6894d22ae9f7e60675ad1094ce02c17b3abd609..54010b804ef211bafb01ddf3d38040600690d6ea 100644 (file)
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -3370,7 +3370,7 @@ static int load_from_path(Unit *u, const char *path) {
                 /* Now, parse the file contents */
                 r = config_parse(u->id, filename, f, UNIT_VTABLE(u)->sections,
                                  config_item_perf_lookup,
-                                 (void*) load_fragment_gperf_lookup, false, true, u);
+                                 load_fragment_gperf_lookup, false, true, u);
                 if (r < 0)
                         return r;
         }

diff --git a/src/core/main.c b/src/core/main.c
index a21a959be974e3e9b78e5711293bb1fed78c025d..d1fb265df1371a159bb8ed914ed5c56b715371cc 100644 (file)
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -696,7 +696,7 @@ static int parse_config_file(void) {
                 return 0;
         }
 
-        r = config_parse(NULL, fn, f, "Manager\0", config_item_table_lookup, (void*) items, false, false, NULL);
+        r = config_parse(NULL, fn, f, "Manager\0", config_item_table_lookup, items, false, false, NULL);
         if (r < 0)
                 log_warning("Failed to parse configuration file: %s", strerror(-r));
 

diff --git a/src/dbus1-generator/dbus1-generator.c b/src/dbus1-generator/dbus1-generator.c
index 95962c73c1f8d8cd3af8a0abb23a6d4a93283713..ba2953014d73aa790ee687ff6ebd65e46e44eaa8 100644 (file)
--- a/src/dbus1-generator/dbus1-generator.c
+++ b/src/dbus1-generator/dbus1-generator.c
@@ -156,7 +156,7 @@ static int create_dbus_files(
 static int add_dbus(const char *path, const char *fname, const char *type) {
         _cleanup_free_ char *name = NULL, *exec = NULL, *user = NULL, *service = NULL;
 
-        ConfigTableItem table[] = {
+        const ConfigTableItem table[] = {
                 { "D-BUS Service", "Name", config_parse_string, 0, &name },
                 { "D-BUS Service", "Exec", config_parse_string, 0, &exec },
                 { "D-BUS Service", "User", config_parse_string, 0, &user },

diff --git a/src/journal/coredump.c b/src/journal/coredump.c
index 1b8c2e8bc0eeff2714caca579051d4dda0125e66..cd612b7ebca80087189d19ae902859f83d91bed2 100644 (file)
--- a/src/journal/coredump.c
+++ b/src/journal/coredump.c
@@ -120,7 +120,7 @@ static int parse_config(void) {
                         NULL,
                         "Coredump\0",
                         config_item_table_lookup,
-                        (void*) items,
+                        items,
                         false,
                         false,
                         NULL);

diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index f8da4daa41efecdf11780773cf7ad269c01a18e2..097af24c5bff458ee58254278ae72168878698ae 100644 (file)
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -1347,7 +1347,7 @@ static int server_parse_config_file(Server *s) {
         }
 
         r = config_parse(NULL, fn, f, "Journal\0", config_item_perf_lookup,
-                         (void*) journald_gperf_lookup, false, false, s);
+                         journald_gperf_lookup, false, false, s);
         if (r < 0)
                 log_warning("Failed to parse configuration file: %s", strerror(-r));
 

diff --git a/src/login/logind.c b/src/login/logind.c
index 7a7bd97150864739fd66e3f07980907f7e0b3791..a1881840e10329ab06942dcef3537772c9f62bff 100644 (file)
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -1113,7 +1113,7 @@ static int manager_parse_config_file(Manager *m) {
         }
 
         r = config_parse(NULL, fn, f, "Login\0", config_item_perf_lookup,
-                         (void*) logind_gperf_lookup, false, false, m);
+                         logind_gperf_lookup, false, false, m);
         if (r < 0)
                 log_warning("Failed to parse configuration file: %s", strerror(-r));
 

diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c
index a97831760e44d3eca1bcf4e73a1ae6e57a483b2f..7d12af3938e2552bd7699c9ba4254782aa07ba93 100644 (file)
--- a/src/network/networkd-netdev.c
+++ b/src/network/networkd-netdev.c
@@ -525,7 +525,7 @@ static int netdev_load_one(Manager *manager, const char *filename) {
 
         r = config_parse(NULL, filename, file,
                          "Match\0NetDev\0VLAN\0MACVLAN\0VXLAN\0Tunnel\0Peer\0Tun\0Tap\0Bond\0",
-                         config_item_perf_lookup, (void*) network_netdev_gperf_lookup,
+                         config_item_perf_lookup, network_netdev_gperf_lookup,
                          false, false, netdev);
         if (r < 0) {
                 log_warning("Could not parse config file %s: %s", filename, strerror(-r));

diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 0375194e46b822cfbf41ab9bfb9409b3eaeb06db..252c9a0ab0bd0db9d7fbb0bc504a82d82ba154fb 100644 (file)
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -93,8 +93,10 @@ static int network_load_one(Manager *manager, const char *filename) {
         network->dhcp_routes = true;
         network->dhcp_sendhost = true;
 
-        r = config_parse(NULL, filename, file, "Match\0Network\0Address\0Route\0DHCP\0DHCPv4\0", config_item_perf_lookup,
-                        (void*) network_network_gperf_lookup, false, false, network);
+        r = config_parse(NULL, filename, file,
+                         "Match\0Network\0Address\0Route\0DHCP\0DHCPv4\0",
+                         config_item_perf_lookup, network_network_gperf_lookup,
+                         false, false, network);
         if (r < 0) {
                 log_warning("Could not parse config file %s: %s", filename, strerror(-r));
                 return r;

diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
index dc6deeb7e54ee704499366bc650abb869f08d841..8718ea40b298c1d1cbcac7d7c93340e119c3e1ef 100644 (file)
--- a/src/resolve/resolved-manager.c
+++ b/src/resolve/resolved-manager.c
@@ -377,10 +377,9 @@ int manager_parse_config_file(Manager *m) {
 
         assert(m);
 
-        r = config_parse(NULL,
-                         "/etc/systemd/resolved.conf", NULL,
+        r = config_parse(NULL, "/etc/systemd/resolved.conf", NULL,
                          "Resolve\0",
-                         config_item_perf_lookup, (void*) resolved_gperf_lookup,
+                         config_item_perf_lookup, resolved_gperf_lookup,
                          false, false, m);
         if (r < 0)
                 log_warning("Failed to parse configuration file: %s", strerror(-r));

diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index 158e9efd4cecb260bb15426379fa468e9c8dfe7b..1f40986649bad25722694cebd49984469df1c840 100644 (file)
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -76,7 +76,7 @@ int log_syntax_internal(const char *unit, int level,
 }
 
 int config_item_table_lookup(
-                void *table,
+                const void *table,
                 const char *section,
                 const char *lvalue,
                 ConfigParserCallback *func,
@@ -84,7 +84,7 @@ int config_item_table_lookup(
                 void **data,
                 void *userdata) {
 
-        ConfigTableItem *t;
+        const ConfigTableItem *t;
 
         assert(table);
         assert(lvalue);
@@ -110,7 +110,7 @@ int config_item_table_lookup(
 }
 
 int config_item_perf_lookup(
-                void *table,
+                const void *table,
                 const char *section,
                 const char *lvalue,
                 ConfigParserCallback *func,
@@ -154,7 +154,7 @@ static int next_assignment(const char *unit,
                            const char *filename,
                            unsigned line,
                            ConfigItemLookup lookup,
-                           void *table,
+                           const void *table,
                            const char *section,
                            unsigned section_line,
                            const char *lvalue,
@@ -199,7 +199,7 @@ static int parse_line(const char* unit,
                       unsigned line,
                       const char *sections,
                       ConfigItemLookup lookup,
-                      void *table,
+                      const void *table,
                       bool relaxed,
                       bool allow_include,
                       char **section,
@@ -323,7 +323,7 @@ int config_parse(const char *unit,
                  FILE *f,
                  const char *sections,
                  ConfigItemLookup lookup,
-                 void *table,
+                 const void *table,
                  bool relaxed,
                  bool allow_include,
                  void *userdata) {

diff --git a/src/shared/conf-parser.h b/src/shared/conf-parser.h
index 9d166de9c75ee521589a086495270b3920d13406..3e2c78480574059b838a41cb80f966d0179fadf8 100644 (file)
--- a/src/shared/conf-parser.h
+++ b/src/shared/conf-parser.h
@@ -65,7 +65,7 @@ typedef const ConfigPerfItem* (*ConfigPerfItemLookup)(const char *section_and_lv
 
 /* Prototype for a generic high-level lookup function */
 typedef int (*ConfigItemLookup)(
-                void *table,
+                const void *table,
                 const char *section,
                 const char *lvalue,
                 ConfigParserCallback *func,
@@ -75,18 +75,18 @@ typedef int (*ConfigItemLookup)(
 
 /* Linear table search implementation of ConfigItemLookup, based on
  * ConfigTableItem arrays */
-int config_item_table_lookup(void *table, const char *section, const char *lvalue, ConfigParserCallback *func, int *ltype, void **data, void *userdata);
+int config_item_table_lookup(const void *table, const char *section, const char *lvalue, ConfigParserCallback *func, int *ltype, void **data, void *userdata);
 
 /* gperf implementation of ConfigItemLookup, based on gperf
  * ConfigPerfItem tables */
-int config_item_perf_lookup(void *table, const char *section, const char *lvalue, ConfigParserCallback *func, int *ltype, void **data, void *userdata);
+int config_item_perf_lookup(const void *table, const char *section, const char *lvalue, ConfigParserCallback *func, int *ltype, void **data, void *userdata);
 
 int config_parse(const char *unit,
                  const char *filename,
                  FILE *f,
                  const char *sections,  /* nulstr */
                  ConfigItemLookup lookup,
-                 void *table,
+                 const void *table,
                  bool relaxed,
                  bool allow_include,
                  void *userdata);

diff --git a/src/shared/install.c b/src/shared/install.c
index 190c554347ac200f3d9462e82d94552e002fb5e5..a080d8f328af9ae4acbd3041362f6f5d5b2985c2 100644 (file)
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -1076,7 +1076,7 @@ static int unit_file_load(
                 return -ENOMEM;
         }
 
-        r = config_parse(NULL, path, f, NULL, config_item_table_lookup, (void*) items, true, true, info);
+        r = config_parse(NULL, path, f, NULL, config_item_table_lookup, items, true, true, info);
         if (r < 0)
                 return r;
 

diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
index 867e4edaa2e79978b963594e30feee6deff594e5..4b2b0fe1003c154dfd1c5a0d16bc254934e7b50b 100644 (file)
--- a/src/shared/sleep-config.c
+++ b/src/shared/sleep-config.c
@@ -57,7 +57,7 @@ int parse_sleep_config(const char *verb, char ***_modes, char ***_states) {
                          "Failed to open configuration file " PKGSYSCONFDIR "/sleep.conf: %m");
         else {
                 r = config_parse(NULL, PKGSYSCONFDIR "/sleep.conf", f, "Sleep\0",
-                                 config_item_table_lookup, (void*) items, false, false, NULL);
+                                 config_item_table_lookup, items, false, false, NULL);
                 if (r < 0)
                         log_warning("Failed to parse configuration file: %s", strerror(-r));
         }

diff --git a/src/timesync/timesyncd.c b/src/timesync/timesyncd.c
index 78ef5f72a1910f22f563f54a459b3a4ad9935281..67a434adeec3e210dd8e840a6e54eb2bc0a29c8b 100644 (file)
--- a/src/timesync/timesyncd.c
+++ b/src/timesync/timesyncd.c
@@ -1111,7 +1111,7 @@ static int manager_parse_config_file(Manager *m) {
         }
 
         r = config_parse(NULL, fn, f, "Time\0", config_item_perf_lookup,
-                         (void*) timesyncd_gperf_lookup, false, false, m);
+                         timesyncd_gperf_lookup, false, false, m);
         if (r < 0)
                 log_warning("Failed to parse configuration file: %s", strerror(-r));
 

diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c
index 55a2215d0a2517253a86265e62f50e551f92fa4a..0398a9d814ecae58d961f1cdc851ec4a8fe64b94 100644 (file)
--- a/src/tty-ask-password-agent/tty-ask-password-agent.c
+++ b/src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -272,7 +272,7 @@ static int parse_password(const char *filename, char **wall) {
                 return -errno;
         }
 
-        r = config_parse(NULL, filename, f, NULL, config_item_table_lookup, (void*) items, true, false, NULL);
+        r = config_parse(NULL, filename, f, NULL, config_item_table_lookup, items, true, false, NULL);
         if (r < 0) {
                 log_error("Failed to parse password file %s: %s", filename, strerror(-r));
                 goto finish;

diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
index 5a45c53cc639c631e899c45014de9f517d3216d4..fe916a4326755e7fc0be49d2c89d77db6e831533 100644 (file)
--- a/src/udev/net/link-config.c
+++ b/src/udev/net/link-config.c
@@ -174,8 +174,10 @@ static int load_link(link_config_ctx *ctx, const char *filename) {
         link->wol = _WOL_INVALID;
         link->duplex = _DUP_INVALID;
 
-        r = config_parse(NULL, filename, file, "Match\0Link\0Ethernet\0", config_item_perf_lookup,
-                         (void*) link_config_gperf_lookup, false, false, link);
+        r = config_parse(NULL, filename, file,
+                         "Match\0Link\0Ethernet\0",
+                         config_item_perf_lookup, link_config_gperf_lookup,
+                         false, false, link);
         if (r < 0) {
                 log_warning("Could not parse config file %s: %s", filename, strerror(-r));
                 return r;