diff options
| author | christos <christos@NetBSD.org> | 2006-12-17 20:04:09 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2006-12-17 20:04:09 +0000 |
| commit | aca88735586347c81ae7d2ef6ce27deff793a2e4 (patch) | |
| tree | 8759ae0e00d41658877f696e78ba009ab7736619 /libexec | |
| parent | bae1302b2449fa0f8e8e3a685426cfaa40f6c4cb (diff) | |
fix volatile and initialization issues, from Anon Ymous
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/ftpd/conf.c | 6 | ||||
| -rw-r--r-- | libexec/ftpd/ftpd.c | 44 |
2 files changed, 24 insertions, 26 deletions
diff --git a/libexec/ftpd/conf.c b/libexec/ftpd/conf.c index 35953074d8f..a62c3815b43 100644 --- a/libexec/ftpd/conf.c +++ b/libexec/ftpd/conf.c @@ -1,4 +1,4 @@ -/* $NetBSD: conf.c,v 1.57 2006/02/01 14:20:12 christos Exp $ */ +/* $NetBSD: conf.c,v 1.58 2006/12/17 20:04:09 christos Exp $ */ /*- * Copyright (c) 1997-2005 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: conf.c,v 1.57 2006/02/01 14:20:12 christos Exp $"); +__RCSID("$NetBSD: conf.c,v 1.58 2006/12/17 20:04:09 christos Exp $"); #endif /* not lint */ #include <sys/types.h> @@ -910,7 +910,7 @@ count_users(void) if ((pids = malloc(sb.st_size + sizeof(pid_t))) == NULL) goto cleanup_count; count = read(fd, pids, sb.st_size); - if (count < 0 || count != sb.st_size) + if ((ssize_t)count == -1 || count != sb.st_size) goto cleanup_count; count /= sizeof(pid_t); mypid = getpid(); diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index 7f7f3a5a2d2..9cab79dc906 100644 --- a/libexec/ftpd/ftpd.c +++ b/libexec/ftpd/ftpd.c @@ -1,4 +1,4 @@ -/* $NetBSD: ftpd.c,v 1.177 2006/09/26 06:47:20 lukem Exp $ */ +/* $NetBSD: ftpd.c,v 1.178 2006/12/17 20:04:09 christos Exp $ */ /* * Copyright (c) 1997-2004 The NetBSD Foundation, Inc. @@ -105,7 +105,7 @@ __COPYRIGHT( #if 0 static char sccsid[] = "@(#)ftpd.c 8.5 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: ftpd.c,v 1.177 2006/09/26 06:47:20 lukem Exp $"); +__RCSID("$NetBSD: ftpd.c,v 1.178 2006/12/17 20:04:09 christos Exp $"); #endif #endif /* not lint */ @@ -178,8 +178,8 @@ __RCSID("$NetBSD: ftpd.c,v 1.177 2006/09/26 06:47:20 lukem Exp $"); #include "pathnames.h" #include "version.h" -volatile sig_atomic_t transflag; -volatile sig_atomic_t urgflag; +static sig_atomic_t transflag; +static sig_atomic_t urgflag; int data; int Dflag; @@ -751,7 +751,7 @@ main(int argc, char *argv[]) } static void -lostconn(int signo) +lostconn(int signo __unused) { if (ftpd_debug) @@ -760,7 +760,7 @@ lostconn(int signo) } static void -toolong(int signo) +toolong(int signo __unused) { /* XXXSIGRACE */ @@ -783,7 +783,7 @@ sigquit(int signo) } static void -sigurg(int signo) +sigurg(int signo __unused) { urgflag = 1; @@ -2286,15 +2286,13 @@ send_data(FILE *instr, FILE *outstr, const struct stat *st, int isdata) static int receive_data(FILE *instr, FILE *outstr) { - int c, bare_lfs, netfd, filefd, rval; + int c, netfd, filefd, rval; + int volatile bare_lfs; off_t byteswritten; char *buf; size_t readsize; struct sigaction sa, sa_saved; struct stat st; -#ifdef __GNUC__ - (void) &bare_lfs; -#endif memset(&sa, 0, sizeof(sa)); sigfillset(&sa.sa_mask); @@ -3305,21 +3303,21 @@ void send_file_list(const char *whichf) { struct stat st; - DIR *dirp = NULL; + DIR *dirp; struct dirent *dir; - FILE *dout = NULL; - char **dirlist, *dirname, *p; - char *notglob = NULL; - int simple = 0; - int freeglob = 0; + FILE *volatile dout; + char **volatile dirlist; + char *dirname, *p; + char *notglob; + int volatile simple; + int volatile freeglob; glob_t gl; -#ifdef __GNUC__ - (void) &dout; - (void) &dirlist; - (void) &simple; - (void) &freeglob; -#endif + dirp = NULL; + dout = NULL; + notglob = NULL; + simple = 0; + freeglob = 0; urgflag = 0; p = NULL; |
