Re: lynx-dev lynx2.8.3dev.4

[pg]

In a recent note, T.E.Dickey said:

> Date: Fri, 16 Jul 1999 22:38:11 -0400 (EDT)
> > >  
> > I'm still experimenting.  I restored the dev.3 interface to LYLowerCase and 
> > LYUpperCase and did the cast internally (which probably costs a couple 
> > instructions per call -- so shoot me :-).  The patch gets 60% smaller -- 
> > 2/3 of the casts go away. 
> 
> better.  (I assume you mean you're assigning to a unsigned-char-pointer

Precisely.

> inside the function -- some compilers don't bother adding instructions for
> that).
> 
How clever of them!  I guess I'm ready to attach the patch.

-- gil 
-- 
StorageTek
INFORMATION made POWERFUL
=====================================================================
%%% Created Fri Jul 16 19:51:55 MDT 1999 by target lynx.patch. %%%
diff -bru orig/lynx2-8-3/WWW/Library/Implementation/SGML.c 
lynx2-8-3/WWW/Library/Implementation/SGML.c
--- orig/lynx2-8-3/WWW/Library/Implementation/SGML.c    Wed Jul 14 10:25:26 1999
+++ lynx2-8-3/WWW/Library/Implementation/SGML.c Thu Jul 15 18:00:32 1999
@@ -4628,7 +4628,7 @@
 {
     unsigned char *euc;
 
-    euc = malloc(strlen(any) + 1);
+    euc = malloc(strlen((CONST char *) any) + 1);
 #ifdef CJK_EX
     if (!euc)
        outofmem(__FILE__, "TO_SJIS");
@@ -4637,7 +4637,7 @@
     if (is_EUC_JP(euc))
        EUC_TO_SJIS(euc, sjis);
     else
-       strcpy(sjis, any);
+       strcpy((char *) sjis, (CONST char *) any);
     free(euc);
 }
 
@@ -4651,7 +4651,7 @@
        jis[0] = 0;
        return;
     }
-    euc = malloc(strlen(any) + 1);
+    euc = malloc(strlen((CONST char *) any) + 1);
 #ifdef CJK_EX
     if (!euc)
        outofmem(__FILE__, "TO_JIS");
diff -bru orig/lynx2-8-3/src/HTML.c lynx2-8-3/src/HTML.c
--- orig/lynx2-8-3/src/HTML.c   Wed Jul 14 10:25:26 1999
+++ lynx2-8-3/src/HTML.c        Fri Jul 16 18:58:27 1999
@@ -2300,7 +2300,7 @@
                       value[HTML_NOTE_ROLE] &&
                       (!strcasecomp(value[HTML_NOTE_ROLE], "CAUTION") ||
                        !strcasecomp(value[HTML_NOTE_ROLE], "WARNING"))) {
-               StrAllocCopy(note, value[HTML_NOTE_ROLE]);
+               StrAllocCopy(note,(CONST char *) value[HTML_NOTE_ROLE]);
                LYUpperCase(note);
                StrAllocCat(note, ":");
            } else {
diff -bru orig/lynx2-8-3/src/LYBookmark.c lynx2-8-3/src/LYBookmark.c
--- orig/lynx2-8-3/src/LYBookmark.c     Wed Jul 14 10:25:26 1999
+++ lynx2-8-3/src/LYBookmark.c  Fri Jul 16 12:35:28 1999
@@ -281,10 +281,10 @@
        if (HTCJK == JAPANESE) {
            switch(kanji_code) {
            case EUC:
-               TO_EUC(title, tmp_buffer);
+               TO_EUC((CONST unsigned char *) title, (unsigned char *) 
tmp_buffer);
                break;
            case SJIS:
-               TO_SJIS(title, tmp_buffer);
+               TO_SJIS((CONST unsigned char *) title, (unsigned char *) 
tmp_buffer);
                break;
            default:
                break;
@@ -316,13 +316,13 @@
     if (HTCJK == JAPANESE) {
        switch(kanji_code) {    /* 1997/11/22 (Sat) 09:28:00 */
        case EUC:
-           TO_EUC(string_buffer, tmp_buffer);
+           TO_EUC((CONST unsigned char *) string_buffer, (unsigned char *) 
tmp_buffer);
            break;
        case SJIS:
-           TO_SJIS(string_buffer, tmp_buffer);
+           TO_SJIS((CONST unsigned char *) string_buffer, (unsigned char *) 
tmp_buffer);
            break;
        default:
-           TO_JIS(string_buffer, tmp_buffer);
+           TO_JIS((CONST unsigned char *) string_buffer, (unsigned char *) 
tmp_buffer);
            break;
        }
        StrAllocCopy(Title, tmp_buffer);
diff -bru orig/lynx2-8-3/src/LYStrings.c lynx2-8-3/src/LYStrings.c
--- orig/lynx2-8-3/src/LYStrings.c      Wed Jul 14 10:25:26 1999
+++ lynx2-8-3/src/LYStrings.c   Fri Jul 16 19:09:38 1999
@@ -2090,8 +2090,9 @@
  * Convert a null-terminated string to lowercase
  */
 PUBLIC void LYLowerCase ARGS1(
-    unsigned char *,   buffer)
+         char *,       arg_buffer)
 {
+    register unsigned char *buffer = (unsigned char *) arg_buffer;
     size_t i;
     for (i = 0; buffer[i]; i++)
 #ifdef SUPPORT_MULTIBYTE_EDIT  /* 1998/11/23 (Mon) 17:04:55 */
@@ -2114,8 +2115,9 @@
  * Convert a null-terminated string to uppercase
  */
 PUBLIC void LYUpperCase ARGS1(
-unsigned char *,       buffer)
+         char *,       arg_buffer)
 {
+    register unsigned char *buffer = (unsigned char *) arg_buffer;
     size_t i;
     for (i = 0; buffer[i]; i++)
 #ifdef SUPPORT_MULTIBYTE_EDIT  /* 1998/11/23 (Mon) 17:05:10 */
diff -bru orig/lynx2-8-3/src/LYStrings.h lynx2-8-3/src/LYStrings.h
--- orig/lynx2-8-3/src/LYStrings.h      Wed Jul 14 10:25:26 1999
+++ lynx2-8-3/src/LYStrings.h   Fri Jul 16 17:04:50 1999
@@ -247,9 +247,9 @@
 #endif
 
 extern void LYLowerCase PARAMS((
-       unsigned char * buffer));
+       char *          buffer));
 extern void LYUpperCase PARAMS((
-       unsigned char * buffer));
+       char *          buffer));
 extern void LYRemoveBlanks PARAMS((
        char *          buffer));
 extern char * LYSkipBlanks PARAMS((
diff -bru orig/lynx2-8-3/src/LYUtils.c lynx2-8-3/src/LYUtils.c
--- orig/lynx2-8-3/src/LYUtils.c        Wed Jul 14 10:25:26 1999
+++ lynx2-8-3/src/LYUtils.c     Fri Jul 16 13:12:04 1999
@@ -1914,7 +1914,7 @@
            else
                TO_SJIS((CONST unsigned char *)text_buff, temp);
 #else
-           strcpy(temp, text_buff);
+           strcpy((char *) temp, text_buff);
 #endif
        } else {
            for (i = 0, j = 0; text_buff[i]; i++) {