chiark / gitweb /
Constify ConfigTableItem tables
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 16 Jul 2014 01:03:11 +0000 (21:03 -0400)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 16 Jul 2014 02:34:40 +0000 (22:34 -0400)
18 files changed:
src/bootchart/bootchart.c
src/core/load-dropin.c
src/core/load-fragment.c
src/core/main.c
src/dbus1-generator/dbus1-generator.c
src/journal/coredump.c
src/journal/journald-server.c
src/login/logind.c
src/network/networkd-netdev.c
src/network/networkd-network.c
src/resolve/resolved-manager.c
src/shared/conf-parser.c
src/shared/conf-parser.h
src/shared/install.c
src/shared/sleep-config.c
src/timesync/timesyncd.c
src/tty-ask-password-agent/tty-ask-password-agent.c
src/udev/net/link-config.c

index 01a5bf1..8e849da 100644 (file)
@@ -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));
 
index 6ff592b..66547cf 100644 (file)
@@ -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);
index b6894d2..54010b8 100644 (file)
@@ -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;
         }
index a21a959..d1fb265 100644 (file)
@@ -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));
 
index 95962c7..ba29530 100644 (file)
@@ -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 },
index 1b8c2e8..cd612b7 100644 (file)
@@ -120,7 +120,7 @@ static int parse_config(void) {
                         NULL,
                         "Coredump\0",
                         config_item_table_lookup,
-                        (void*) items,
+                        items,
                         false,
                         false,
                         NULL);
index f8da4da..097af24 100644 (file)
@@ -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));
 
index 7a7bd97..a188184 100644 (file)
@@ -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));
 
index a978317..7d12af3 100644 (file)
@@ -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));
index 0375194..252c9a0 100644 (file)
@@ -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;
index dc6deeb..8718ea4 100644 (file)
@@ -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));
index 158e9ef..1f40986 100644 (file)
@@ -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) {
index 9d166de..3e2c784 100644 (file)
@@ -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);
index 190c554..a080d8f 100644 (file)
@@ -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;
 
index 867e4ed..4b2b0fe 100644 (file)
@@ -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));
         }
index 78ef5f7..67a434a 100644 (file)
@@ -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));
 
index 55a2215..0398a9d 100644 (file)
@@ -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;
index 5a45c53..fe916a4 100644 (file)
@@ -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;