From 9ae99f1d1fd62ac580036a82d78b8f3187e6809d Mon Sep 17 00:00:00 2001 From: jh Date: Fri, 29 Jan 2010 10:00:42 +0000 Subject: - Cast time_t, int64_t and some int32_t values to intmax_t and use "%jd" in format strings. - Use (void) instead of (void *) when discarding strcat(3) return value. - Format string fixes to match variable types. - Change canon() len parameter and getcmd() size parameter type from int to size_t. - Style Makefile and increase WARNS to 2. PR: bin/140061 Submitted by: uqs Approved by: trasz (mentor) --- sbin/restore/interactive.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sbin/restore/interactive.c') diff --git a/sbin/restore/interactive.c b/sbin/restore/interactive.c index c977df1..3cd311d 100644 --- a/sbin/restore/interactive.c +++ b/sbin/restore/interactive.c @@ -83,7 +83,7 @@ struct arglist { static char *copynext(char *, char *); static int fcmp(const void *, const void *); static void formatf(struct afile *, int); -static void getcmd(char *, char *, char *, int, struct arglist *); +static void getcmd(char *, char *, char *, size_t, struct arglist *); struct dirent *glob_readdir(void *); static int glob_stat(const char *, struct stat *); static void mkentry(char *, struct direct *, struct afile *); @@ -301,7 +301,7 @@ loop: * eliminate any embedded ".." components. */ static void -getcmd(char *curdir, char *cmd, char *name, int size, struct arglist *ap) +getcmd(char *curdir, char *cmd, char *name, size_t size, struct arglist *ap) { char *cp; static char input[BUFSIZ]; @@ -441,7 +441,7 @@ copynext(char *input, char *output) * remove any embedded "." and ".." components. */ void -canon(char *rawname, char *canonname, int len) +canon(char *rawname, char *canonname, size_t len) { char *cp, *np; -- cgit v1.1