[svn] GnuPG - r4273 - branches/STABLE-BRANCH-1-4/keyserver

[svn author dshaw]

Author: dshaw
Date: 2006-09-28 21:30:03 +0200 (Thu, 28 Sep 2006)
New Revision: 4273

Modified:
   branches/STABLE-BRANCH-1-4/keyserver/ChangeLog
   branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_ldap.c
   branches/STABLE-BRANCH-1-4/keyserver/ksutil.c
   branches/STABLE-BRANCH-1-4/keyserver/ksutil.h
Log:
* gpgkeys_ldap.c (build_attrs), ksutil.c (ks_toupper, ks_strcasecmp),
ksutil.h: Remove the need for strcasecmp as the field tags are always
lowercase.


Modified: branches/STABLE-BRANCH-1-4/keyserver/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/keyserver/ChangeLog	2006-09-27 14:56:26 UTC (rev 4272)
+++ branches/STABLE-BRANCH-1-4/keyserver/ChangeLog	2006-09-28 19:30:03 UTC (rev 4273)
@@ -1,3 +1,9 @@
+2006-09-28  David Shaw  <dshaw at jabberwocky.com>
+
+	* gpgkeys_ldap.c (build_attrs), ksutil.c (ks_toupper,
+	ks_strcasecmp), ksutil.h: Remove the need for strcasecmp as the
+	field tags are always lowercase.
+
 2006-09-26  Werner Koch  <wk at g10code.com>
 
 	* gpgkeys_finger.c (get_key): Cast away signed/unsigned char ptr

Modified: branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_ldap.c
===================================================================
--- branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_ldap.c	2006-09-27 14:56:26 UTC (rev 4272)
+++ branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_ldap.c	2006-09-28 19:30:03 UTC (rev 4273)
@@ -367,7 +367,7 @@
   if((record=strsep(&line,":"))==NULL)
     return;
 
-  if (ks_strcasecmp("pub",record)==0)
+  if (strcmp("pub",record)==0)
     {
       char *tok;
       int disabled=0,revoked=0;
@@ -473,7 +473,7 @@
       make_one_attr(modlist,"pgpDisabled",disabled?"1":"0");
       make_one_attr(modlist,"pgpRevoked",revoked?"1":"0");
     }
-  else if (ks_strcasecmp("sub",record)==0)
+  else if (strcmp("sub",record)==0)
     {
       char *tok;
 
@@ -511,7 +511,7 @@
       /* Ignore the rest of the items for subkeys since the LDAP
 	 schema doesn't store them. */
     }
-  else if (ks_strcasecmp("uid",record)==0)
+  else if (strcmp("uid",record)==0)
     {
       char *userid,*tok;
 
@@ -548,7 +548,7 @@
 
       make_one_attr(modlist,"pgpUserID",userid);
     }
-  else if(ks_strcasecmp("sig",record)==0)
+  else if(strcmp("sig",record)==0)
     {
       char *tok;
 

Modified: branches/STABLE-BRANCH-1-4/keyserver/ksutil.c
===================================================================
--- branches/STABLE-BRANCH-1-4/keyserver/ksutil.c	2006-09-27 14:56:26 UTC (rev 4272)
+++ branches/STABLE-BRANCH-1-4/keyserver/ksutil.c	2006-09-28 19:30:03 UTC (rev 4273)
@@ -574,29 +574,3 @@
     return -1;
   return c;
 }
-
-
-/* Non localized version of toupper.  */
-int 
-ks_toupper (int c)
-{
-  if (c >= 'a' && c <= 'z')
-    c &= ~0x20;
-  return c;
-}
-
-
-/* Non localized version of strcasecmp.  */
-int
-ks_strcasecmp (const char *a, const char *b)
-{
-  if (a == b)
-    return 0;
-
-  for (; *a && *b; a++, b++)
-    {
-      if (*a != *b && ks_toupper (*a) != ks_toupper (*b))
-        break;
-    }
-  return *a == *b? 0 : (ks_toupper (*a) - ks_toupper (*b));
-}

Modified: branches/STABLE-BRANCH-1-4/keyserver/ksutil.h
===================================================================
--- branches/STABLE-BRANCH-1-4/keyserver/ksutil.h	2006-09-27 14:56:26 UTC (rev 4272)
+++ branches/STABLE-BRANCH-1-4/keyserver/ksutil.h	2006-09-28 19:30:03 UTC (rev 4273)
@@ -139,8 +139,5 @@
 void curl_writer_finalize(struct curl_writer_ctx *ctx);
 
 int ks_hextobyte (const char *s);
-int ks_toupper (int c);
-int ks_strcasecmp (const char *a, const char *b);
 
-
 #endif /* !_KSUTIL_H_ */