security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

dirmngr: Simplify strtok macro.

Browse Source 
* dirmngr/ldap-url.c (ldap_utf8_strtok): Remove unused r3d arg.
(ldap_str2charray): Remove lasts.
--

I have no clue why an utf8 version was planned to be used.  Do the
LDAP folks really assume that eventually non-ascii delimiters might be
used?  Simplified it to silence the warning about an used helper var.
This commit is contained in:
Werner Koch 2014-03-07 09:46:44 +01:00
parent 72133b54de
commit 35266076e3
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dirmngr/ldap-url.c
View File

@ -91,7 +91,7 @@ software is provided `'as is'' without express or implied warranty. */
#define LDAP_MALLOC malloc
#define LDAP_REALLOC realloc
#define ldap_utf8_strchr strchr
#define ldap_utf8_strtok(n,d,s) strtok (n,d)
#define ldap_utf8_strtok(n,d) strtok (n,d)
#define Debug(a,b,c,d,e)
void ldap_pvt_hex_unescape( char *s );
@ -267,7 +267,6 @@ ldap_str2charray( const char *str_in, const char *brkstr )
{
char **res;
char *str, *s;
char *lasts;
int i;
/* protect the input string from strtok */
@ -292,9 +291,9 @@ ldap_str2charray( const char *str_in, const char *brkstr )
i = 0;
for ( s = ldap_utf8_strtok( str, brkstr, &lasts );
for ( s = ldap_utf8_strtok( str, brkstr);
s != NULL;
s = ldap_utf8_strtok( NULL, brkstr, &lasts ) )
s = ldap_utf8_strtok( NULL, brkstr) )
{
res[i] = LDAP_STRDUP( s );