'unsigned char'-related warning fixups

(cherry picked from commit 176a94c671b4d4841ca707745ed993ab7f8b8071)

diff --git a/src/bsd.c b/src/bsd.c
index 36be4a32cbee483bb99be8150062c71045dfdc3a..096e34061c3ea7515ddcaccc83790e11f710ece0 100644 (file)
--- a/src/bsd.c
+++ b/src/bsd.c
@@ -2253,8 +2253,9 @@ handle_telnet(DESC *d, unsigned char **q, unsigned char *qend)
     if (*q >= qend)
       return -1;
     else {
-      static char ayt_reply[] = "\r\n*** AYT received, I'm here ***\r\n";
-      queue_newwrite(d, (unsigned char *) ayt_reply, strlen(ayt_reply));
+      static unsigned char ayt_reply[] =
+       "\r\n*** AYT received, I'm here ***\r\n";
+      queue_newwrite(d, ayt_reply, u_strlen(ayt_reply));
       process_output(d);
     }
     break;

diff --git a/src/comp_w8.c b/src/comp_w8.c
index bc0604d5c5e2ae6d33b52aa0838e18501142d05c..e81821e1d3fcd67b78db4085bc953f2e2b1cddb4 100644 (file)
--- a/src/comp_w8.c
+++ b/src/comp_w8.c
@@ -244,10 +244,10 @@ unsigned char *
 compress(char const *s)
 {
   const unsigned char *p;
-  static unsigned char buf[BUFFER_LEN];
+  static char buf[BUFFER_LEN];
 
   p = (unsigned char *) s;
-  b = buf;
+  b = (unsigned char *) buf;
 
   wordpos = 0;
 

diff --git a/src/console.c b/src/console.c
index 5e06c3d2c79b43f821a5b248e1b13d0d3e50a666..f521202af2339b6e2b2c545601323b563d13fa62 100644 (file)
--- a/src/console.c
+++ b/src/console.c
@@ -1602,8 +1602,9 @@ handle_telnet(DESC *d, unsigned char **q, unsigned char *qend)
     if (*q >= qend)
       return -1;
     else {
-      static char ayt_reply[] = "\r\n*** AYT received, I'm here ***\r\n";
-      queue_newwrite(d, (unsigned char *) ayt_reply, strlen(ayt_reply));
+      static unsigned char ayt_reply[] =
+       "\r\n*** AYT received, I'm here ***\r\n";
+      queue_newwrite(d, (unsigned char *) ayt_reply, u_strlen(ayt_reply));
       process_output(d);
     }
     break;

diff --git a/src/extmail.c b/src/extmail.c
index f91396d42827b423eb11c8bdff3029fce7015d14..202b0556c14e809593aad753e8dc9a1f7a7a9b2e 100644 (file)
--- a/src/extmail.c
+++ b/src/extmail.c
@@ -127,7 +127,7 @@ static char *status_chars(MAIL *mp);
 static char *status_string(MAIL *mp);
 static int sign(int x);
 static char *get_message(MAIL *mp);
-static char *get_compressed_message(MAIL *mp);
+static unsigned char *get_compressed_message(MAIL *mp);
 static char *get_subject(MAIL *mp);
 static char *get_sender(MAIL *mp, int full);
 static int was_sender(dbref player, MAIL *mp);
@@ -177,16 +177,16 @@ get_message(MAIL *mp)
 }
 
 /* Return the compressed text of a @mail in a static buffer */
-static char *
+static unsigned char *
 get_compressed_message(MAIL *mp)
 {
-  unsigned static char text[BUFFER_LEN * 2];
+  static unsigned char text[BUFFER_LEN * 2];
 
   if (!mp)
     return NULL;
 
-  chunk_fetch(mp->msgid, text, sizeof text);
-  return (char *) text;
+  chunk_fetch(mp->msgid, (unsigned char *) text, sizeof text);
+  return text;
 }
 
 /* Return the subject of a mail message, or (no subject) */
@@ -772,11 +772,12 @@ do_mail_fwd(dbref player, char *msglist, char *tolist)
            if (!temp) {
              notify(player, T("MAIL: You can't reply to nonexistant mail."));
            } else {
-             char tbuf1[BUFFER_LEN], tbuf2[BUFFER_LEN];
+             char tbuf1[BUFFER_LEN];
+             unsigned char tbuf2[BUFFER_LEN];
              strcpy(tbuf1, uncompress(mp->subject));
-             strcpy(tbuf2, get_compressed_message(mp));
-             send_mail(player, temp->from, tbuf1, tbuf2, M_FORWARD | M_REPLY,
-                       1, 0);
+             u_strcpy(tbuf2, get_compressed_message(mp));
+             send_mail(player, temp->from, tbuf1, (char *) tbuf2,
+                       M_FORWARD | M_REPLY, 1, 0);
              num_recpts++;
            }
          } else {
@@ -791,10 +792,11 @@ do_mail_fwd(dbref player, char *msglist, char *tolist)
            if (!GoodObject(target) || !IsPlayer(target)) {
              notify_format(player, T("No such unique player: %s."), current);
            } else {
-             char tbuf1[BUFFER_LEN], tbuf2[BUFFER_LEN];
+             char tbuf1[BUFFER_LEN];
+             unsigned char tbuf2[BUFFER_LEN];
              strcpy(tbuf1, uncompress(mp->subject));
-             strcpy(tbuf2, get_compressed_message(mp));
-             send_mail(player, target, tbuf1, tbuf2, M_FORWARD, 1, 0);
+             u_strcpy(tbuf2, get_compressed_message(mp));
+             send_mail(player, target, tbuf1, (char *) tbuf2, M_FORWARD, 1, 0);
              num_recpts++;
            }
          }
@@ -1088,7 +1090,7 @@ real_send_mail(dbref player, dbref target, char *subject, char *message,
     }
     *nm = '\0';
     text = compress(newmsg);
-    len = strlen((char *) text) + 1;
+    len = u_strlen(text) + 1;
     newp->msgid = chunk_create(text, len, 1);
     free(text);
     mush_free((Malloc_t) newmsg, "string");
@@ -2064,7 +2066,7 @@ load_mail(FILE * fp)
     tbuf = compress(getstring_noalloc(fp));
   }
   text = compress(getstring_noalloc(fp));
-  len = strlen((char *) text) + 1;
+  len = u_strlen(text) + 1;
   mp->msgid = chunk_create(text, len, 1);
   free(text);
   if (mail_flags & MDBF_SUBJECT)
@@ -2098,7 +2100,7 @@ load_mail(FILE * fp)
     else
       tbuf = NULL;
     text = compress(getstring_noalloc(fp));
-    len = strlen((char *) text) + 1;
+    len = u_strlen(text) + 1;
     mp->msgid = chunk_create(text, len, 1);
     free(text);
     if (tbuf)