[svn] pinentry - r218 - in trunk: . pinentry

[svn author wk]

Author: wk
Date: 2010-02-19 13:18:30 +0100 (Fri, 19 Feb 2010)
New Revision: 218

Modified:
   trunk/ChangeLog
   trunk/pinentry/pinentry.c
Log:
Do not remove a gettext marker prefix.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-02-19 12:14:23 UTC (rev 217)
+++ trunk/ChangeLog	2010-02-19 12:18:30 UTC (rev 218)
@@ -6,6 +6,7 @@
 	* pinentry/pinentry.h (struct pinentry): Add default_prompt.
 	* pinentry/pinentry.c (option_handler): Support "default-prompt".
 	(cmd_getpin): Use it.
+	(noprefix_strdup): Remove; should be done by caller.
 
 2010-02-17  Werner Koch  <wk at g10code.com>
 

Modified: trunk/pinentry/pinentry.c
===================================================================
--- trunk/pinentry/pinentry.c	2010-02-19 12:14:23 UTC (rev 217)
+++ trunk/pinentry/pinentry.c	2010-02-19 12:18:30 UTC (rev 218)
@@ -581,20 +581,6 @@
 }
 
 
-static char *
-noprefix_strdup (const char *string)
-{
-  const char *s;
-
-  if (*string == '|' && (s = strchr (string+1, '|')))
-    s++;
-  else
-    s = string;
-
-  return strdup (s);
-}
-
-
 static int
 option_handler (ASSUAN_CONTEXT ctx, const char *key, const char *value)
 {
@@ -664,19 +650,19 @@
     }
   else if (!strcmp (key, "default-ok"))
     {
-      pinentry.default_ok = noprefix_strdup (value);
+      pinentry.default_ok = strdup (value);
       if (!pinentry.default_ok)
 	return ASSUAN_Out_Of_Core;
     }
   else if (!strcmp (key, "default-cancel"))
     {
-      pinentry.default_cancel = noprefix_strdup (value);
+      pinentry.default_cancel = strdup (value);
       if (!pinentry.default_cancel)
 	return ASSUAN_Out_Of_Core;
     }
   else if (!strcmp (key, "default-prompt"))
     {
-      pinentry.default_prompt = noprefix_strdup (value);
+      pinentry.default_prompt = strdup (value);
       if (!pinentry.default_prompt)
 	return ASSUAN_Out_Of_Core;
     }