Use toupper(c) rather than homegrown code.

diff --git a/edit.c b/edit.c
index 5106e5eb385197bb55f6e49d8b6835d8cf030637..1778efe209ffe84fe112960af15a494e2da86533 100644 (file)
--- a/edit.c
+++ b/edit.c
@@ -134,8 +134,7 @@ e_cursor(loc_t *edit_cursor)
                e = getch ();
        }
        (void) nocrmode (); /* reset terminal */
-       if (islower (e)) e = upper (e);
-       return e;
+       return toupper(e);
 }
 
 /*
@@ -498,7 +497,7 @@ e_piece_info(loc_t edit_cursor, char ab)
        int type;
        char *p;
 
-       ab = upper (ab);
+       ab = toupper (ab);
        p = strchr (type_chars, ab);
        type = p - type_chars;
 

diff --git a/term.c b/term.c
index 86a177506b55d86ec7e0eb80930ec7a8f7f000b4..bdf314233b8070862d1af3c60754302fd316eb83 100644 (file)
--- a/term.c
+++ b/term.c
@@ -278,7 +278,7 @@ get_chx(void)
        c = get_cq ();
 
        if (islower(c))
-               return (upper(c));
+               return (toupper(c));
        else
                return (c);
 }

diff --git a/util.c b/util.c
index 589a73d229fc191ad74609602d2e23b1ea36b60b..81164234059200924bf7158c711cb1a739e74f75 100644 (file)
--- a/util.c
+++ b/util.c
@@ -17,37 +17,10 @@ util.c -- various utility routines.
 #include "empire.h"
 #include "extern.h"
 
-
-/*
-Convert a string to uppercase.
-Shirley this is defined elsewhere?
-*/
-
 #include <sys/types.h>
 #include <unistd.h>
 #include <ctype.h>
 
-void
-tupper(char *str)
-{
-       while (*str) {
-               if (islower (*str)) *str = upper (*str);
-               str++;
-       }
-}
-
-/*
-Convert a character to uppercase (if it is lowercase)
-*/
-
-char
-upper(char c)
-{
-       if (islower (c))
-               return toupper (c);
-       else return c;
-}
-
 /*
 Report a bug.
 */