WL#5498: Remove dead and unused source code

Remove code that has been disabled for a long time.

2 files changed, 0 insertions, 128 deletions

diff --git a/strings/ctype-simple.c b/strings/ctype-simple.c
index 8a3d3d7425c..2e5f78a30bf 100644
--- a/strings/ctype-simple.c
+++ b/strings/ctype-simple.c
@@ -335,10 +335,6 @@ long my_strntol_8bit(CHARSET_INFO *cs,
   int overflow;
 
   *err= 0;				/* Initialize error indicator */
-#ifdef NOT_USED
-  if (base < 0 || base == 1 || base > 36)
-    base = 10;
-#endif
 
   s = nptr;
   e = nptr+l;
@@ -364,29 +360,6 @@ long my_strntol_8bit(CHARSET_INFO *cs,
   else
     negative = 0;
 
-#ifdef NOT_USED
-  if (base == 16 && s[0] == '0' && (s[1]=='X' || s[1]=='x'))
-    s += 2;
-#endif
-
-#ifdef NOT_USED
-  if (base == 0)
-  {
-    if (*s == '0')
-    {
-      if (s[1]=='X' || s[1]=='x')
-      {
-	s += 2;
-	base = 16;
-      }
-      else
-	base = 8;
-    }
-    else
-      base = 10;
-  }
-#endif
-
   save = s;
   cutoff = ((uint32)~0L) / (uint32) base;
   cutlim = (uint) (((uint32)~0L) % (uint32) base);
@@ -458,10 +431,6 @@ ulong my_strntoul_8bit(CHARSET_INFO *cs,
   int overflow;
 
   *err= 0;				/* Initialize error indicator */
-#ifdef NOT_USED
-  if (base < 0 || base == 1 || base > 36)
-    base = 10;
-#endif
 
   s = nptr;
   e = nptr+l;
@@ -486,29 +455,6 @@ ulong my_strntoul_8bit(CHARSET_INFO *cs,
   else
     negative = 0;
 
-#ifdef NOT_USED
-  if (base == 16 && s[0] == '0' && (s[1]=='X' || s[1]=='x'))
-    s += 2;
-#endif
-
-#ifdef NOT_USED
-  if (base == 0)
-  {
-    if (*s == '0')
-    {
-      if (s[1]=='X' || s[1]=='x')
-      {
-	s += 2;
-	base = 16;
-      }
-      else
-	base = 8;
-    }
-    else
-      base = 10;
-  }
-#endif
-
   save = s;
   cutoff = ((uint32)~0L) / (uint32) base;
   cutlim = (uint) (((uint32)~0L) % (uint32) base);
@@ -571,10 +517,6 @@ longlong my_strntoll_8bit(CHARSET_INFO *cs __attribute__((unused)),
   int overflow;
 
   *err= 0;				/* Initialize error indicator */
-#ifdef NOT_USED
-  if (base < 0 || base == 1 || base > 36)
-    base = 10;
-#endif
 
   s = nptr;
   e = nptr+l;
@@ -599,29 +541,6 @@ longlong my_strntoll_8bit(CHARSET_INFO *cs __attribute__((unused)),
   else
     negative = 0;
 
-#ifdef NOT_USED
-  if (base == 16 && s[0] == '0' && (s[1]=='X'|| s[1]=='x'))
-    s += 2;
-#endif
-
-#ifdef NOT_USED
-  if (base == 0)
-  {
-    if (*s == '0')
-    {
-      if (s[1]=='X' || s[1]=='x')
-      {
-	s += 2;
-	base = 16;
-      }
-      else
-	base = 8;
-    }
-    else
-      base = 10;
-  }
-#endif
-
   save = s;
 
   cutoff = (~(ulonglong) 0) / (unsigned long int) base;
@@ -694,10 +613,6 @@ ulonglong my_strntoull_8bit(CHARSET_INFO *cs,
   int overflow;
 
   *err= 0;				/* Initialize error indicator */
-#ifdef NOT_USED
-  if (base < 0 || base == 1 || base > 36)
-    base = 10;
-#endif
 
   s = nptr;
   e = nptr+l;
@@ -722,29 +637,6 @@ ulonglong my_strntoull_8bit(CHARSET_INFO *cs,
   else
     negative = 0;
 
-#ifdef NOT_USED
-  if (base == 16 && s[0] == '0' && (s[1]=='X' || s[1]=='x'))
-    s += 2;
-#endif
-
-#ifdef NOT_USED
-  if (base == 0)
-  {
-    if (*s == '0')
-    {
-      if (s[1]=='X' || s[1]=='x')
-      {
-	s += 2;
-	base = 16;
-      }
-      else
-	base = 8;
-    }
-    else
-      base = 10;
-  }
-#endif
-
   save = s;
 
   cutoff = (~(ulonglong) 0) / (unsigned long int) base;
diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c
index 3946f6a83b4..d3b0b93a939 100644
--- a/strings/ctype-ucs2.c
+++ b/strings/ctype-ucs2.c
@@ -134,11 +134,6 @@ my_strntol_mb2_or_mb4(CHARSET_INFO *cs,
   
 bs:
 
-#ifdef NOT_USED  
-  if (base <= 0 || base == 1 || base > 36)
-    base = 10;
-#endif
-  
   overflow= 0;
   res= 0;
   save= s;
@@ -250,11 +245,6 @@ my_strntoul_mb2_or_mb4(CHARSET_INFO *cs,
   
 bs:
 
-#ifdef NOT_USED
-  if (base <= 0 || base == 1 || base > 36)
-    base = 10;
-#endif
-
   overflow= 0;
   res= 0;
   save= s;
@@ -359,11 +349,6 @@ my_strntoll_mb2_or_mb4(CHARSET_INFO *cs,
   
 bs:
 
-#ifdef NOT_USED  
-  if (base <= 0 || base == 1 || base > 36)
-    base = 10;
-#endif
-
   overflow = 0;
   res = 0;
   save = s;
@@ -474,11 +459,6 @@ my_strntoull_mb2_or_mb4(CHARSET_INFO *cs,
   } while (1);
   
 bs:
-  
-#ifdef NOT_USED
-  if (base <= 0 || base == 1 || base > 36)
-    base = 10;
-#endif
 
   overflow = 0;
   res = 0;