[network-manager-openvpn: 12/14] service: make static ValidProperty table const

[Thomas Haller <thaller src gnome org>]

commit c448e29376b3126e38e7dda3e2bde6b39dd075d9
Author: Thomas Haller <thaller redhat com>
Date:   Sun Feb 12 13:44:49 2017 +0100

    service: make static ValidProperty table const

 src/nm-openvpn-service.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/src/nm-openvpn-service.c b/src/nm-openvpn-service.c
index d7bd29f..7ad2ce1 100644
--- a/src/nm-openvpn-service.c
+++ b/src/nm-openvpn-service.c
@@ -106,7 +106,7 @@ typedef struct {
        NMOpenvpnPlugin *plugin;
 } PidsPendingData;
 
-static ValidProperty valid_properties[] = {
+static const ValidProperty valid_properties[] = {
        { NM_OPENVPN_KEY_AUTH,                 G_TYPE_STRING, 0, 0, FALSE },
        { NM_OPENVPN_KEY_CA,                   G_TYPE_STRING, 0, 0, FALSE },
        { NM_OPENVPN_KEY_CERT,                 G_TYPE_STRING, 0, 0, FALSE },
@@ -156,7 +156,7 @@ static ValidProperty valid_properties[] = {
        { NULL,                                G_TYPE_NONE, FALSE }
 };
 
-static ValidProperty valid_secrets[] = {
+static const ValidProperty valid_secrets[] = {
        { NM_OPENVPN_KEY_PASSWORD,             G_TYPE_STRING, 0, 0, FALSE },
        { NM_OPENVPN_KEY_CERTPASS,             G_TYPE_STRING, 0, 0, FALSE },
        { NM_OPENVPN_KEY_NOSECRET,             G_TYPE_STRING, 0, 0, FALSE },
@@ -328,7 +328,7 @@ validate_address (const char *address)
 }
 
 typedef struct ValidateInfo {
-       ValidProperty *table;
+       const ValidProperty *table;
        GError **error;
        gboolean have_items;
 } ValidateInfo;
@@ -349,15 +349,15 @@ validate_one_property (const char *key, const char *value, gpointer user_data)
                return;
 
        for (i = 0; info->table[i].name; i++) {
-               ValidProperty prop = info->table[i];
+               const ValidProperty *prop = &info->table[i];
                long int tmp;
 
-               if (strcmp (prop.name, key))
+               if (strcmp (prop->name, key))
                        continue;
 
-               switch (prop.type) {
+               switch (prop->type) {
                case G_TYPE_STRING:
-                       if (!prop.address || validate_address (value))
+                       if (!prop->address || validate_address (value))
                                return; /* valid */
 
                        g_set_error (info->error,
@@ -369,14 +369,14 @@ validate_one_property (const char *key, const char *value, gpointer user_data)
                case G_TYPE_INT:
                        errno = 0;
                        tmp = strtol (value, NULL, 10);
-                       if (errno == 0 && tmp >= prop.int_min && tmp <= prop.int_max)
+                       if (errno == 0 && tmp >= prop->int_min && tmp <= prop->int_max)
                                return; /* valid */
 
                        g_set_error (info->error,
                                     NM_VPN_PLUGIN_ERROR,
                                     NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
                                     _("invalid integer property “%s” or out of range [%d -> %d]"),
-                                    key, prop.int_min, prop.int_max);
+                                    key, prop->int_min, prop->int_max);
                        break;
                case G_TYPE_BOOLEAN:
                        if (!strcmp (value, "yes") || !strcmp (value, "no"))
@@ -394,7 +394,7 @@ validate_one_property (const char *key, const char *value, gpointer user_data)
                                     NM_VPN_PLUGIN_ERROR,
                                     NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
                                     _("unhandled property “%s” type %s"),
-                                    key, g_type_name (prop.type));
+                                    key, g_type_name (prop->type));
                        break;
                }
        }