[PATCH/RFC V2 02/26] auth: Hack around const warnings

Kevin Cernekee cernekee at gmail.com
Sun Aug 11 21:49:03 EDT 2013


Seen on an NDK build:

    ../../../auth.c: In function 'prepare_stoken':
    ../../../auth.c:901:15: warning: assignment discards 'const' qualifier from pointer target type [enabled by default]
    ../../../auth.c:909:14: warning: assignment discards 'const' qualifier from pointer target type [enabled by default]
    ../../../auth.c:916:14: warning: assignment discards 'const' qualifier from pointer target type [enabled by default]
    ../../../auth.c:923:14: warning: assignment discards 'const' qualifier from pointer target type [enabled by default]

Signed-off-by: Kevin Cernekee <cernekee at gmail.com>
---
 auth.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/auth.c b/auth.c
index 5acd04b..b1e6094 100644
--- a/auth.c
+++ b/auth.c
@@ -898,7 +898,7 @@ int prepare_stoken(struct openconnect_info *vpninfo)
 	memset(&opts, 0, sizeof(opts));
 
 	form.opts = opts;
-	form.message = _("Enter credentials to unlock software token.");
+	form.message = (char *)_("Enter credentials to unlock software token.");
 
 	vpninfo->token_tries = 0;
 	vpninfo->token_bypassed = 0;
@@ -906,21 +906,21 @@ int prepare_stoken(struct openconnect_info *vpninfo)
 	if (stoken_devid_required(vpninfo->stoken_ctx)) {
 		opt->type = OC_FORM_OPT_TEXT;
 		opt->name = (char *)"devid";
-		opt->label = _("Device ID:");
+		opt->label = (char *)_("Device ID:");
 		devid = &opt->value;
 		opt++;
 	}
 	if (stoken_pass_required(vpninfo->stoken_ctx)) {
 		opt->type = OC_FORM_OPT_PASSWORD;
 		opt->name = (char *)"password";
-		opt->label = _("Password:");
+		opt->label = (char *)_("Password:");
 		pass = &opt->value;
 		opt++;
 	}
 	if (stoken_pin_required(vpninfo->stoken_ctx)) {
 		opt->type = OC_FORM_OPT_PASSWORD;
 		opt->name = (char *)"password";
-		opt->label = _("PIN:");
+		opt->label = (char *)_("PIN:");
 		pin = &opt->value;
 		opt++;
 	}
-- 
1.7.9.5




More information about the openconnect-devel mailing list