diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2009-11-28 14:57:04 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2009-11-28 14:57:04 +0000 |
| commit | 575510045a37ef82ca33e68d3775d5aba88c10b3 (patch) | |
| tree | 1cd2d7641704c145303dfce1d3c8476f155c94be | |
| parent | 4c7b3a59063fe6e8e9b7990a27d294b7fdd721d1 (diff) | |
| download | rtmux-575510045a37ef82ca33e68d3775d5aba88c10b3.tar.gz rtmux-575510045a37ef82ca33e68d3775d5aba88c10b3.tar.bz2 rtmux-575510045a37ef82ca33e68d3775d5aba88c10b3.zip | |
Sync OpenBSD patchset 572:
Make types clearer and lint happier.
| -rw-r--r-- | key-string.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/key-string.c b/key-string.c index f368315f..b94f3a39 100644 --- a/key-string.c +++ b/key-string.c @@ -1,4 +1,4 @@ -/* $Id: key-string.c,v 1.26 2009-11-10 23:30:26 tcunha Exp $ */ +/* $Id: key-string.c,v 1.27 2009-11-28 14:57:04 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -105,12 +105,12 @@ int key_string_lookup_string(const char *string) { int key; - const u_char *ptr; + const char *ptr; if (string[0] == '\0') return (KEYC_NONE); if (string[1] == '\0') - return (string[0]); + return ((u_char) string[0]); ptr = NULL; if ((string[0] == 'C' || string[0] == 'c') && string[1] == '-') @@ -133,7 +133,7 @@ key_string_lookup_string(const char *string) } else { if (ptr[1] != '\0') return (KEYC_NONE); - key = ptr[0]; + key = (u_char) ptr[0]; } /* @@ -162,7 +162,7 @@ key_string_lookup_string(const char *string) } else { if (ptr[1] == '\0') return (KEYC_NONE); - key = ptr[0]; + key = (u_char) ptr[0]; } if (key >= 32 && key <= 127) @@ -209,7 +209,7 @@ key_string_lookup_key(int key) } if (key >= 32 && key <= 255) { - tmp[0] = key; + tmp[0] = (char) key; tmp[1] = '\0'; return (tmp); } |