From: Chris Pressey Date: Fri, 19 Mar 2004 17:30:59 +0000 (+0000) Subject: Clean up the code in bin/ to reduce warnings from GCC3. X-Git-Tag: v2.0.1~11735 X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/1c755102bd9435dcf9a431affecb49d10d524f79 Clean up the code in bin/ to reduce warnings from GCC3. Stage 3 of 5 or so: cleanups to cp, cpdup, and date. - Add ``const'' to appropriate variable declarations and casts. - Convert ``quad'' types to ``long long''. - Convert appropriate ``int'' types to ``size_t'' and ``dev_t''. - Rename functions/variables to not conflict with globals. - Add/remove function prototypes and #includes as appropriate. - Split a long string constant. - Convert K&R style declarations to ANSI style. Submitted-by: Simon 'corecode' Schubert --- diff --git a/bin/cp/cp.c b/bin/cp/cp.c index 5708069c73..05e90b097c 100644 --- a/bin/cp/cp.c +++ b/bin/cp/cp.c @@ -36,7 +36,7 @@ * @(#) Copyright (c) 1988, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)cp.c 8.2 (Berkeley) 4/1/94 * $FreeBSD: src/bin/cp/cp.c,v 1.24.2.7 2002/09/24 12:41:04 mckay Exp $ - * $DragonFly: src/bin/cp/cp.c,v 1.3 2003/09/21 04:18:34 drhodus Exp $ + * $DragonFly: src/bin/cp/cp.c,v 1.4 2004/03/19 17:30:59 cpressey Exp $ */ /* @@ -73,7 +73,7 @@ *--(p).p_end = 0; \ } -PATH_T to = { to.p_path, "", "" }; +PATH_T to = { to.p_path, to.p_path, "" }; int Rflag, fflag, iflag, nflag, pflag, rflag, vflag; @@ -83,9 +83,7 @@ int copy (char *[], enum op, int); int mastercmp (const FTSENT **, const FTSENT **); int -main(argc, argv) - int argc; - char *argv[]; +main(int argc, char *argv[]) { struct stat to_stat, tmp_stat; enum op type; @@ -456,8 +454,7 @@ copy(argv, type, fts_options) * files first reduces seeking. */ int -mastercmp(a, b) - const FTSENT **a, **b; +mastercmp(const FTSENT **a, const FTSENT **b) { int a_info, b_info; diff --git a/bin/cp/utils.c b/bin/cp/utils.c index 736c71586c..f0e9bc6828 100644 --- a/bin/cp/utils.c +++ b/bin/cp/utils.c @@ -32,7 +32,7 @@ * * @(#)utils.c 8.3 (Berkeley) 4/1/94 * $FreeBSD: src/bin/cp/utils.c,v 1.27.2.6 2002/08/10 13:20:19 johan Exp $ - * $DragonFly: src/bin/cp/utils.c,v 1.2 2003/06/17 04:22:49 dillon Exp $ + * $DragonFly: src/bin/cp/utils.c,v 1.3 2004/03/19 17:30:59 cpressey Exp $ */ #include @@ -55,9 +55,7 @@ #include "extern.h" int -copy_file(entp, dne) - FTSENT *entp; - int dne; +copy_file(FTSENT *entp, int dne) { static char buf[MAXBSIZE]; struct stat *fs; @@ -190,33 +188,29 @@ copy_file(entp, dne) } int -copy_link(p, exists) - FTSENT *p; - int exists; +copy_link(FTSENT *p, int exists) { int len; - char link[PATH_MAX]; + char linkname[PATH_MAX]; - if ((len = readlink(p->fts_path, link, sizeof(link) - 1)) == -1) { + if ((len = readlink(p->fts_path, linkname, sizeof(linkname) - 1)) == -1) { warn("readlink: %s", p->fts_path); return (1); } - link[len] = '\0'; + linkname[len] = '\0'; if (exists && unlink(to.p_path)) { warn("unlink: %s", to.p_path); return (1); } - if (symlink(link, to.p_path)) { - warn("symlink: %s", link); + if (symlink(linkname, to.p_path)) { + warn("symlink: %s", linkname); return (1); } return (0); } int -copy_fifo(from_stat, exists) - struct stat *from_stat; - int exists; +copy_fifo(struct stat *from_stat, int exists) { if (exists && unlink(to.p_path)) { warn("unlink: %s", to.p_path); @@ -230,9 +224,7 @@ copy_fifo(from_stat, exists) } int -copy_special(from_stat, exists) - struct stat *from_stat; - int exists; +copy_special(struct stat *from_stat, int exists) { if (exists && unlink(to.p_path)) { warn("unlink: %s", to.p_path); @@ -249,9 +241,7 @@ copy_special(from_stat, exists) (S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO) int -setfile(fs, fd) - register struct stat *fs; - int fd; +setfile(struct stat *fs, int fd) { static struct timeval tv[2]; struct stat ts; @@ -308,7 +298,7 @@ setfile(fs, fd) } void -usage() +usage(void) { (void)fprintf(stderr, "%s\n%s\n", diff --git a/bin/cpdup/cpdup.c b/bin/cpdup/cpdup.c index b8cd5d32ce..51d048ea62 100644 --- a/bin/cpdup/cpdup.c +++ b/bin/cpdup/cpdup.c @@ -42,7 +42,7 @@ * * - Can do MD5 consistancy checks * - * $DragonFly: src/bin/cpdup/cpdup.c,v 1.2 2003/12/01 06:07:16 dillon Exp $ + * $DragonFly: src/bin/cpdup/cpdup.c,v 1.3 2004/03/19 17:30:59 cpressey Exp $ */ /*- @@ -57,7 +57,7 @@ #define HSIZE 16384 #define HMASK (HSIZE-1) -char *MD5CacheFile; +const char *MD5CacheFile; typedef struct Node { struct Node *no_Next; @@ -80,7 +80,15 @@ struct hlink { int nlinked; }; -void RemoveRecur(const char *dpath, int devNo); +typedef struct MD5Node { + struct MD5Node *md_Next; + char *md_Name; + char *md_Code; + int md_Accessed; +} MD5Node; + + +void RemoveRecur(const char *dpath, dev_t devNo); void InitList(List *list); void ResetList(List *list); int AddList(List *list, const char *name, int n); @@ -92,11 +100,12 @@ int YesNo(const char *path); int xrename(const char *src, const char *dst, u_long flags); int xlink(const char *src, const char *dst, u_long flags); int WildCmp(const char *s1, const char *s2); +MD5Node *md5_lookup(const char *sfile); int md5_check(const char *spath, const char *dpath); void md5_flush(void); void md5_cache(const char *spath, int sdirlen); char *fextract(FILE *fi, int n, int *pc, int skip); -int DoCopy(const char *spath, const char *dpath, int sdevNo, int ddevNo); +int DoCopy(const char *spath, const char *dpath, dev_t sdevNo, dev_t ddevNo); char *doMD5File(const char *filename, char *buf); int AskConfirmation = 1; @@ -108,7 +117,7 @@ int NoRemoveOpt = 0; int SaveFs = 0; int UseMD5Opt = 0; int SummaryOpt = 0; -char *UseCpFile; +const char *UseCpFile; int64_t CountSourceBytes = 0; int64_t CountSourceItems = 0; @@ -118,6 +127,11 @@ int64_t CountReadBytes = 0; int64_t CountWriteBytes = 0; int64_t CountRemovedItems = 0; +char *MD5SCache; /* cache source directory name */ +MD5Node *MD5Base; +int MD5SCacheDirLen; +int MD5SCacheDirty; + int main(int ac, char **av) @@ -207,9 +221,9 @@ main(int ac, char **av) /* not reached */ } if (dst) { - i = DoCopy(src, dst, -1, -1); + i = DoCopy(src, dst, (dev_t)-1, (dev_t)-1); } else { - i = DoCopy(src, NULL, -1, -1); + i = DoCopy(src, NULL, (dev_t)-1, (dev_t)-1); } md5_flush(); @@ -308,7 +322,7 @@ hltdelete(struct hlink *hl) } int -DoCopy(const char *spath, const char *dpath, int sdevNo, int ddevNo) +DoCopy(const char *spath, const char *dpath, dev_t sdevNo, dev_t ddevNo) { struct stat st1; struct stat st2; @@ -490,13 +504,13 @@ DoCopy(const char *spath, const char *dpath, int sdevNo, int ddevNo) } } - if (sdevNo >= 0 && st1.st_dev != sdevNo) { + if ((int)sdevNo >= 0 && st1.st_dev != sdevNo) { noLoop = 1; } else { sdevNo = st1.st_dev; } - if (ddevNo >= 0 && st2.st_dev != ddevNo) { + if ((int)ddevNo >= 0 && st2.st_dev != ddevNo) { noLoop = 1; } else { ddevNo = st2.st_dev; @@ -662,7 +676,7 @@ DoCopy(const char *spath, const char *dpath, int sdevNo, int ddevNo) * Matt: I think 64k would be faster here */ char buf[32768]; - char *op; + const char *op; int n; /* @@ -829,12 +843,12 @@ DoCopy(const char *spath, const char *dpath, int sdevNo, int ddevNo) */ void -RemoveRecur(const char *dpath, int devNo) +RemoveRecur(const char *dpath, dev_t devNo) { struct stat st; if (lstat(dpath, &st) == 0) { - if (devNo < 0) + if ((int)devNo < 0) devNo = st.st_dev; if (st.st_dev == devNo) { if (S_ISDIR(st.st_mode)) { @@ -1049,18 +1063,6 @@ YesNo(const char *path) return ((first == 'y' || first == 'Y')); } -typedef struct MD5Node { - struct MD5Node *md_Next; - char *md_Name; - char *md_Code; - int md_Accessed; -} MD5Node; - -char *MD5SCache; /* cache source directory name */ -MD5Node *MD5Base; -int MD5SCacheDirLen; -int MD5SCacheDirty; - void md5_flush(void) { diff --git a/bin/cpdup/misc.c b/bin/cpdup/misc.c index 8b0c1b2873..8bcdcb03a0 100644 --- a/bin/cpdup/misc.c +++ b/bin/cpdup/misc.c @@ -1,7 +1,7 @@ /* * MISC.C * - * $DragonFly: src/bin/cpdup/misc.c,v 1.2 2003/12/01 06:07:16 dillon Exp $ + * $DragonFly: src/bin/cpdup/misc.c,v 1.3 2004/03/19 17:30:59 cpressey Exp $ */ #include "cpdup.h" @@ -54,7 +54,8 @@ fatal(const char *ctl, ...) " -s0 disable safeties - allow files to overwrite directories\n" " -q quiet operation\n" " -o do not remove any files, just overwrite/add\n" - " -m maintain/generate MD5 checkfile on source,\n" + ); + puts(" -m maintain/generate MD5 checkfile on source,\n" " and compare with (optional) destination,\n" " copying if the compare fails\n" " -M file -m+specify MD5 checkfile, else .MD5_CHECKSUMS\n" diff --git a/bin/date/date.c b/bin/date/date.c index 08e7c11ac9..b956184b04 100644 --- a/bin/date/date.c +++ b/bin/date/date.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1985, 1987, 1988, 1993 The Regents of the University of California. All rights reserved. * @(#)date.c 8.2 (Berkeley) 4/28/95 * $FreeBSD: src/bin/date/date.c,v 1.32.2.6 2001/10/31 17:31:51 dillon Exp $ - * $DragonFly: src/bin/date/date.c,v 1.4 2003/09/28 14:39:13 hmp Exp $ + * $DragonFly: src/bin/date/date.c,v 1.5 2004/03/19 17:30:59 cpressey Exp $ */ #include @@ -47,6 +47,7 @@ #include #include #include +#include #include "extern.h" #include "vary.h" @@ -62,15 +63,14 @@ static void setthetime (const char *, const char *, int, int); static void badformat (void); static void usage (void); -int logwtmp (char *, char *, char *); - int main(int argc, char **argv) { struct timezone tz; int ch, rflag; int jflag, nflag; - char *format, buf[1024]; + const char *format; + char buf[1024]; char *endptr, *fmt; char *tmp; int set_timezone; @@ -104,7 +104,7 @@ main(int argc, char **argv) break; case 'r': /* user specified seconds */ rflag = 1; - tval = strtoq(optarg, &tmp, 0); + tval = strtoll(optarg, &tmp, 0); if (*tmp != 0) usage(); break; diff --git a/bin/date/netdate.c b/bin/date/netdate.c index 088a3c0f05..72716b51c8 100644 --- a/bin/date/netdate.c +++ b/bin/date/netdate.c @@ -32,7 +32,7 @@ * * @(#)netdate.c 8.1 (Berkeley) 5/31/93 * $FreeBSD: src/bin/date/netdate.c,v 1.11.2.1 2001/05/12 17:14:22 fenner Exp $ - * $DragonFly: src/bin/date/netdate.c,v 1.3 2003/09/28 14:39:13 hmp Exp $ + * $DragonFly: src/bin/date/netdate.c,v 1.4 2004/03/19 17:30:59 cpressey Exp $ */ #include @@ -72,7 +72,8 @@ netsettime(time_t tval) struct sockaddr_in sin, dest, from; fd_set ready; long waittime; - int s, length, port, timed_ack, found, err; + int s, port, timed_ack, found, errn; + size_t length; char hostname[MAXHOSTNAMELEN]; if ((sp = getservbyname("timed", "udp")) == NULL) { @@ -138,11 +139,11 @@ loop: FD_SET(s, &ready); found = select(FD_SETSIZE, &ready, (fd_set *)0, (fd_set *)0, &tout); - length = sizeof(err); + length = sizeof(errn); if (!getsockopt(s, - SOL_SOCKET, SO_ERROR, (char *)&err, &length) && err) { - if (err != ECONNREFUSED) - warnc(err, "send (delayed error)"); + SOL_SOCKET, SO_ERROR, (char *)&errn, &length) && errn) { + if (errn != ECONNREFUSED) + warnc(errn, "send (delayed error)"); goto bad; } diff --git a/bin/date/vary.c b/bin/date/vary.c index de8b6bc4fc..f8669a5a61 100644 --- a/bin/date/vary.c +++ b/bin/date/vary.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/bin/date/vary.c,v 1.8.2.2 2000/12/08 11:42:53 brian Exp $ - * $DragonFly: src/bin/date/vary.c,v 1.2 2003/06/17 04:22:49 dillon Exp $ + * $DragonFly: src/bin/date/vary.c,v 1.3 2004/03/19 17:30:59 cpressey Exp $ */ #include @@ -35,7 +35,7 @@ struct trans { int val; - char *str; + const char *str; }; static struct trans trans_mon[] = { @@ -201,14 +201,14 @@ adjmon(struct tm *t, char type, int val, int istext, int mk) static int adjday(struct tm *t, char type, int val, int mk) { - int mdays; + int daycount; switch (type) { case '+': while (val) { - mdays = daysinmonth(t); - if (val > mdays - t->tm_mday) { - val -= mdays - t->tm_mday + 1; + daycount = daysinmonth(t); + if (val > daycount - t->tm_mday) { + val -= daycount - t->tm_mday + 1; t->tm_mday = 1; if (!adjmon(t, '+', 1, 0, 0)) return 0; @@ -411,7 +411,7 @@ vary_apply(const struct vary *v, struct tm *t) char type; char which; char *arg; - int len; + size_t len; int val; for (; v; v = v->next) {