few optimizations

golded3/geedit.cpp

@@ -2026,12 +2026,15 @@ void IEclass::ToggleCase() {
 
   GFTRK("EditToggleCase");
 
-  if(col < currline->txt.length()) {
+  if (col < currline->txt.length())
+  {
     Undo->PushItem(EDIT_UNDO_OVR_CHAR);
-    if(g_toupper(currline->txt[col]) == currline->txt[col])
+
-      currline->txt[col] = g_tolower(currline->txt[col]);
+    char chr = currline->txt[col];
+    if (g_isupper(chr))
+      currline->txt[col] = g_tolower(chr);
     else
-      currline->txt[col] = g_toupper(currline->txt[col]);
+      currline->txt[col] = g_toupper(chr);
   }
 
   GFTRK(NULL);
@@ -2045,23 +2048,23 @@ void IEclass::ToggleCaseChar(gkey key,
                              Line *ln, int n)
 {
   int oldchar = *it;
-  int newchar = *it;
+  int newchar;
 
   switch (key)
   {
   case KK_EditToLower:
-    newchar = g_tolower(*it);
+    newchar = g_tolower(oldchar);
     break;
 
   case KK_EditToUpper:
-    newchar = g_toupper(*it);
+    newchar = g_toupper(oldchar);
     break;
 
   case KK_EditToggleCase:
-    if (g_toupper(*it) == oldchar)
+    if (g_isupper(oldchar))
-      newchar = g_tolower(*it);
+      newchar = g_tolower(oldchar);
     else
-      newchar = g_toupper(*it);
+      newchar = g_toupper(oldchar);
     break;
   }
 

golded3/geline.cpp

@@ -1696,8 +1696,8 @@ void  Latin2Local(char *str)
       byte left = i ? str[i-1] : 0;
       byte right = str[i+1];
 
-      if (((left >= 0x80) && (g_toupper(left) != g_tolower(left))) ||
+      if (((left  >= 0x80) && g_isalpha(left )) ||
-          ((right >= 0x80) && (g_toupper(right) != g_tolower(right))))
+          ((right >= 0x80) && g_isalpha(right)))
       {
         str[i] = xch;
 

goldlib/gall/gctype.h

@@ -64,47 +64,24 @@ extern char tl[256], tu[256];
  * they don't match they treated as characters
  */
 
-#if defined(__WIN32__)
-
 #ifdef __cplusplus
 extern "C" {
-__inline__ int g_islower(int c)
+#endif
-{
-  return isascii(c) ? islower(c) : (c == g_tolower(c)) && (c != g_toupper(c));
-}
-
-__inline__ int g_isupper(int c)
-{
-  return isascii(c) ? isupper(c) : (c != g_tolower(c)) && (c == g_toupper(c));
-}
-
-__inline__ int g_isalpha(int c)
-{
-  return isascii(c) ? isalpha(c) : (c != g_tolower(c)) || (c != g_toupper(c));
-}
-}
-#else
-#define g_islower(c) (isascii(c) ? islower(c) : ((c) == g_tolower(c)) && ((c) != g_toupper(c)))
-#define g_isupper(c) (isascii(c) ? isupper(c) : ((c) != g_tolower(c)) && ((c) == g_toupper(c)))
-#define g_isalpha(c) (isascii(c) ? isalpha(c) : ((c) != g_tolower(c)) || ((c) != g_toupper(c)))
-#endif  //#ifdef __cplusplus
 
+#if defined(__WIN32__)
+int g_islower(int c);
+int g_isupper(int c);
+int g_isalpha(int c);
 #else
 #define g_islower islower
 #define g_isupper isupper
 #define g_isalpha isalpha
-#endif  //#if defined(__WIN32__)
+#endif
 
+int isxalnum(int c);
 
 #ifdef __cplusplus
-extern "C" {
-__inline__ int isxalnum(int c)
-{
-  return isascii(c) ? isalnum(c) : (c != g_tolower(c)) || (c != g_toupper(c));
 }
-}
-#else
-#define isxalnum(c) (isascii(c) ? isalnum(c) : ((c) != g_tolower(c)) || ((c) != g_toupper(c)))
 #endif
 
 #ifdef __BEOS__
@@ -113,7 +90,7 @@ __inline__ int isxalnum(int c)
  * This is a real disaster for cyrillic users ...
  * It's also not possible to use setlocale() to change it's behaviour. =-(
  */
-#undef iscntrl
+# undef iscntrl
 # define iscntrl(c) ((c < 0x7f) ? __isctype((c), _IScntrl) : 0)
 #endif /* __BEOS__ */
 

goldlib/gall/gstrctyp.cpp

@@ -28,6 +28,28 @@
 #include <gutlmisc.h>
 
 
+//  ------------------------------------------------------------------
+
+int g_islower(int c)
+{
+  return isascii(c) ? islower(c) : (c == g_tolower(c)) && (c != g_toupper(c));
+}
+
+int g_isupper(int c)
+{
+  return isascii(c) ? isupper(c) : (c != g_tolower(c)) && (c == g_toupper(c));
+}
+
+int g_isalpha(int c)
+{
+  return isascii(c) ? isalpha(c) : (c != g_tolower(c)) || (c != g_toupper(c));
+}
+
+int isxalnum(int c)
+{
+  return isascii(c) ? isalnum(c) : (c != g_tolower(c)) || (c != g_toupper(c));
+}
+
 //  ------------------------------------------------------------------
 //  Converts a character to upper or lower case depending on the
 //  previous character in the string

goldlib/gall/gutlwin.cpp

@@ -50,75 +50,8 @@ int           ge_win_ext_title;
 extern "C"
 {
 #endif
-char          tu[256] = {
+char  tu[256];
-  0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+char  tl[256];
-  0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-  0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-  0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
-  0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
-  0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
-  0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
-  0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
-  0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
-  0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
-  0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
-  0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
-  0x60, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
-  0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
-  0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
-  0x58, 0x59, 0x5a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
-  0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
-  0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
-  0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
-  0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
-  0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
-  0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
-  0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
-  0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
-  0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
-  0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
-  0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
-  0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
-  0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
-  0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
-  0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
-  0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
-};
-
-char          tl[256] = {
-  0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-  0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-  0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-  0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
-  0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
-  0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
-  0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
-  0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
-  0x40, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
-  0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
-  0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
-  0x78, 0x79, 0x7a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
-  0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
-  0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
-  0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
-  0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
-  0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
-  0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
-  0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
-  0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
-  0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
-  0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
-  0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
-  0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
-  0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
-  0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
-  0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
-  0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
-  0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
-  0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
-  0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
-  0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
-};
 #if defined(_MSC_VER)
 }
 #endif

goldlib/msgidlib/fexist.c

@@ -28,7 +28,6 @@
 #endif
 
 #include <stdio.h>
-#include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
 #if defined(UNIX) || defined(__MINGW32__) || defined(__EMX__)

goldlib/msgidlib/genmsgid.c

@@ -26,7 +26,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/types.h>

goldlib/smblib/lzh.c

@@ -34,7 +34,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 
 /* FreeBSD's malloc.h is deprecated, it drops a warning and */
 /* #includes <stdlib.h>, which is already here.             */

goldlib/uulib/uuencode.c

@@ -27,7 +27,6 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <ctype.h>
 #include <stdio.h>
 #include <time.h>
 

goldlib/uulib/uuscan.c

@@ -33,7 +33,6 @@
 #endif
 
 #include <stdio.h>
-#include <ctype.h>
 
 #ifdef STDC_HEADERS
 #include <stdlib.h>
@@ -52,6 +51,8 @@
 #include <errno.h>
 #endif
 
+#include <gdefs.h>
+#include <gctype.h>
 #include <uudeview.h>
 #include <uuint.h>
 #include <fptools.h>

goldlib/uulib/uustring.c

@@ -30,7 +30,6 @@
 #endif
 
 #include <stdio.h>
-#include <ctype.h>
 
 #ifdef STDC_HEADERS
 #include <stdlib.h>

goldlib/uulib/uuutil.c

@@ -30,7 +30,6 @@
 #endif
 
 #include <stdio.h>
-#include <ctype.h>
 
 #ifdef STDC_HEADERS
 #include <stdlib.h>