diff options
| author | des <des@FreeBSD.org> | 2007-12-18 10:41:12 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2007-12-18 10:41:12 +0000 |
| commit | ddf13e4c294f0883bedec65186a9b10371ae7a87 (patch) | |
| tree | 13ed2dfaacf453128e0dc265913fc55fd814ec7f /lib/libfetch/ftp.c | |
| parent | 75ddc3d2357e981940f6ad3decedf198a76d1e2f (diff) | |
| download | FreeBSD-src-ddf13e4c294f0883bedec65186a9b10371ae7a87.zip FreeBSD-src-ddf13e4c294f0883bedec65186a9b10371ae7a87.tar.gz | |
Old patch I had lying around: correctly cast the argument to is*().
IWBNI gcc could warn about this the way it warns about printf() abuse.
MFC after: 1 week
Diffstat (limited to 'lib/libfetch/ftp.c')
| -rw-r--r-- | lib/libfetch/ftp.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/libfetch/ftp.c b/lib/libfetch/ftp.c index 5e4f7c3..bac5c72 100644 --- a/lib/libfetch/ftp.c +++ b/lib/libfetch/ftp.c @@ -102,11 +102,11 @@ __FBSDID("$FreeBSD$"); static struct url cached_host; static conn_t *cached_connection; -#define isftpreply(foo) (isdigit(foo[0]) && isdigit(foo[1]) \ - && isdigit(foo[2]) \ +#define isftpreply(foo) (isdigit((int)foo[0]) && isdigit((int)foo[1]) \ + && isdigit((int)foo[2]) \ && (foo[3] == ' ' || foo[3] == '\0')) -#define isftpinfo(foo) (isdigit(foo[0]) && isdigit(foo[1]) \ - && isdigit(foo[2]) && foo[3] == '-') +#define isftpinfo(foo) (isdigit((int)foo[0]) && isdigit((int)foo[1]) \ + && isdigit((int)foo[2]) && foo[3] == '-') /* * Translate IPv4 mapped IPv6 address to IPv4 address @@ -150,7 +150,7 @@ ftp_chkerr(conn_t *conn) } } - while (conn->buflen && isspace(conn->buf[conn->buflen - 1])) + while (conn->buflen && isspace((int)conn->buf[conn->buflen - 1])) conn->buflen--; conn->buf[conn->buflen] = '\0'; @@ -414,11 +414,11 @@ ftp_stat(conn_t *conn, const char *file, struct url_stat *us) ftp_seterr(e); return (-1); } - for (ln = conn->buf + 4; *ln && isspace(*ln); ln++) + for (ln = conn->buf + 4; *ln && isspace((int)*ln); ln++) /* nothing */ ; - for (us->size = 0; *ln && isdigit(*ln); ln++) + for (us->size = 0; *ln && isdigit((int)*ln); ln++) us->size = us->size * 10 + *ln - '0'; - if (*ln && !isspace(*ln)) { + if (*ln && !isspace((int)*ln)) { ftp_seterr(FTP_PROTOCOL_ERROR); us->size = -1; return (-1); @@ -432,7 +432,7 @@ ftp_stat(conn_t *conn, const char *file, struct url_stat *us) ftp_seterr(e); return (-1); } - for (ln = conn->buf + 4; *ln && isspace(*ln); ln++) + for (ln = conn->buf + 4; *ln && isspace((int)*ln); ln++) /* nothing */ ; switch (strspn(ln, "0123456789")) { case 14: @@ -691,7 +691,7 @@ ftp_transfer(conn_t *conn, const char *oper, const char *file, switch (e) { case FTP_PASSIVE_MODE: case FTP_LPASSIVE_MODE: - for (p = ln + 3; *p && !isdigit(*p); p++) + for (p = ln + 3; *p && !isdigit((int)*p); p++) /* nothing */ ; if (!*p) { e = FTP_PROTOCOL_ERROR; |
