Translatability fix for 'Discard bad split xxclude' message
authorDavid Woodhouse <David.Woodhouse@intel.com>
Tue, 27 Sep 2011 14:22:21 +0000 (15:22 +0100)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Tue, 27 Sep 2011 14:22:21 +0000 (15:22 +0100)
Thanks to Jussi Kukkonen for pointing it out.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
tun.c

diff --git a/tun.c b/tun.c
index 0c97a62..38627bc 100644 (file)
--- a/tun.c
+++ b/tun.c
@@ -143,19 +143,25 @@ static int netmasklen(struct in_addr addr)
 }
 
 static int process_split_xxclude(struct openconnect_info *vpninfo,
-                                const char *in_ex, const char *route, int *v4_incs,
+                                int include, const char *route, int *v4_incs,
                                 int *v6_incs)
 {
        struct in_addr addr;
+       const char *in_ex = include?"IN":"EX";
        char envname[80];
        char *slash;
 
        slash = strchr(route, '/');
        if (!slash) {
        badinc:
-               vpn_progress(vpninfo, PRG_ERR,
-                            _("Discard bad split %sclude: \"%s\"\n"),
-                            in_ex, route);
+               if (include)
+                       vpn_progress(vpninfo, PRG_ERR,
+                                    _("Discard bad split include: \"%s\"\n"),
+                                    route);
+               else
+                       vpn_progress(vpninfo, PRG_ERR,
+                                    _("Discard bad split exclude: \"%s\"\n"),
+                                    route);
                return -EINVAL;
        }
 
@@ -332,7 +338,7 @@ static void set_script_env(struct openconnect_info *vpninfo)
                int nr_v6_split_includes = 0;
 
                while (this) {
-                       process_split_xxclude(vpninfo, "IN", this->route,
+                       process_split_xxclude(vpninfo, 1, this->route,
                                              &nr_split_includes,
                                              &nr_v6_split_includes);
                        this = this->next;
@@ -348,7 +354,7 @@ static void set_script_env(struct openconnect_info *vpninfo)
                int nr_v6_split_excludes = 0;
 
                while (this) {
-                       process_split_xxclude(vpninfo, "EX", this->route,
+                       process_split_xxclude(vpninfo, 0, this->route,
                                              &nr_split_excludes,
                                              &nr_v6_split_excludes);
                        this = this->next;