From 3c59aebbaa2ca3914295b622c50e9fa2b7a7abb3 Mon Sep 17 00:00:00 2001 From: Joerg Sonnenberger Date: Wed, 13 Apr 2005 15:21:36 +0000 Subject: [PATCH] Remove argument names from prototypes. Adjust prototypes to deal with void * vs. char * and const vs. non-const behaviour. --- sbin/dump/dump.h | 60 ++++++++++++++++++++++---------------------- sbin/dump/dumprmt.c | 13 ++++------ sbin/dump/main.c | 10 ++++---- sbin/dump/optr.c | 6 ++--- sbin/dump/tape.c | 8 ++---- sbin/dump/traverse.c | 8 +++--- sbin/dump/unctime.c | 4 +-- 7 files changed, 51 insertions(+), 58 deletions(-) diff --git a/sbin/dump/dump.h b/sbin/dump/dump.h index 9d9dfb0c03..19be8f4c41 100644 --- a/sbin/dump/dump.h +++ b/sbin/dump/dump.h @@ -33,7 +33,7 @@ * @(#)dump.h 8.2 (Berkeley) 4/28/95 * * $FreeBSD: src/sbin/dump/dump.h,v 1.7.6.4 2003/01/25 18:54:59 dillon Exp $ - * $DragonFly: src/sbin/dump/dump.h,v 1.7 2005/04/13 14:05:35 joerg Exp $ + * $DragonFly: src/sbin/dump/dump.h,v 1.8 2005/04/13 15:21:36 joerg Exp $ */ #include @@ -95,54 +95,54 @@ int dev_bshift; /* log2(dev_bsize) */ int tp_bshift; /* log2(TP_BSIZE) */ /* operator interface functions */ -void broadcast(const char *message); +void broadcast(const char *); void infosch(int); -void lastdump(int arg); /* int should be char */ -void msg(const char *fmt, ...) __printflike(1, 2); -void msgtail(const char *fmt, ...) __printflike(1, 2); -int query(char *question); -void quit(const char *fmt, ...) __printflike(1, 2); +void lastdump(int); /* int should be char */ +void msg(const char *, ...) __printflike(1, 2); +void msgtail(const char *, ...) __printflike(1, 2); +int query(const char *); +void quit(const char *, ...) __printflike(1, 2); void timeest(void); -time_t unctime(char *str); +time_t unctime(const char *); /* mapping rouintes */ struct dinode; -long blockest(struct dinode *dp); -int mapfiles(ino_t maxino, long *tapesize); -int mapdirs(ino_t maxino, long *tapesize); +long blockest(struct dinode *); +int mapfiles(ino_t maxino, long *); +int mapdirs(ino_t maxino, long *); /* file dumping routines */ -void blksout(daddr_t *blkp, int frags, ino_t ino); -void bread(daddr_t blkno, char *buf, int size); -ssize_t cread(int fd, void *buf, size_t nbytes, off_t offset); -void dumpino(struct dinode *dp, ino_t ino); -void dumpmap(char *map, int type, ino_t ino); -void writeheader(ino_t ino); +void blksout(daddr_t *, int, ino_t); +void bread(daddr_t, char *, int); +ssize_t cread(int, void *, size_t, off_t); +void dumpino(struct dinode *, ino_t); +void dumpmap(const char *, int, ino_t); +void writeheader(ino_t); /* tape writing routines */ int alloctape(void); void close_rewind(void); -void dumpblock(daddr_t blkno, int size); -void startnewtape(int top); +void dumpblock(daddr_t, int); +void startnewtape(int); void trewind(void); -void writerec(char *dp, int isspcl); +void writerec(const void *, int); -void Exit(int status) __dead2; -void dumpabort(int signo); +void Exit(int) __dead2; +void dumpabort(int); void getfstab(void); -char *rawname(char *cp); -struct dinode *getino(ino_t inum); +char *rawname(char *); +struct dinode *getino(ino_t); /* rdump routines */ #ifdef RDUMP void rmtclose(void); -int rmthost(char *host); -int rmtopen(const char *tape, int mode); -int rmtwrite(char *buf, int count); +int rmthost(const char *); +int rmtopen(const char *, int); +int rmtwrite(const void *, int); #endif /* RDUMP */ -void interrupt(int signo); /* in case operator bangs on console */ +void interrupt(int); /* in case operator bangs on console */ /* * Exit status codes @@ -154,7 +154,7 @@ void interrupt(int signo); /* in case operator bangs on console */ #define OPGRENT "operator" /* group entry to notify */ -struct fstab *fstabsearch(char *key); /* search fs_file and fs_spec */ +struct fstab *fstabsearch(const char *); /* search fs_file and fs_spec */ #ifndef NAME_MAX #define NAME_MAX 255 @@ -178,7 +178,7 @@ void putdumptime(void); if (ddatev != NULL) \ for (ddp = ddatev[i = 0]; i < nddates; ddp = ddatev[++i]) -void sig(int signo); +void sig(int); /* * Compatibility with old systems. diff --git a/sbin/dump/dumprmt.c b/sbin/dump/dumprmt.c index 0a831434ae..1b2afe7447 100644 --- a/sbin/dump/dumprmt.c +++ b/sbin/dump/dumprmt.c @@ -32,7 +32,7 @@ * * @(#)dumprmt.c 8.3 (Berkeley) 4/28/95 * $FreeBSD: src/sbin/dump/dumprmt.c,v 1.14.2.1 2000/07/01 06:31:52 ps Exp $ - * $DragonFly: src/sbin/dump/dumprmt.c,v 1.10 2005/04/13 14:12:35 joerg Exp $ + * $DragonFly: src/sbin/dump/dumprmt.c,v 1.11 2005/04/13 15:21:36 joerg Exp $ */ #include @@ -91,14 +91,11 @@ extern int dokerberos; extern int ntrec; /* blocking factor on tape */ int -rmthost(char *host) +rmthost(const char *host) { - rmtpeer = malloc(strlen(host) + 1); - if (rmtpeer) - strcpy(rmtpeer, host); - else - rmtpeer = host; + if (rmtpeer = strdup(host)) + err(1, "strdup failed"); signal(SIGPIPE, rmtconnaborted); rmtgetconn(); if (rmtape < 0) @@ -237,7 +234,7 @@ rmtclose(void) } int -rmtwrite(char *buf, int count) +rmtwrite(const void *buf, int count) { char line[30]; diff --git a/sbin/dump/main.c b/sbin/dump/main.c index fcb1cb9a47..259264dd7c 100644 --- a/sbin/dump/main.c +++ b/sbin/dump/main.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1980, 1991, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)main.c 8.6 (Berkeley) 5/1/95 * $FreeBSD: src/sbin/dump/main.c,v 1.20.2.9 2003/01/25 18:54:59 dillon Exp $ - * $DragonFly: src/sbin/dump/main.c,v 1.9 2004/12/27 22:36:37 liamfoy Exp $ + * $DragonFly: src/sbin/dump/main.c,v 1.10 2005/04/13 15:21:36 joerg Exp $ */ #include @@ -80,9 +80,9 @@ long dev_bsize = 1; /* recalculated below */ long blocksperfile; /* output blocks per file */ char *host = NULL; /* remote host (if any) */ -static long numarg(char *, long, long); -static void obsolete(int *, char **[]); -static void usage(void); +static long numarg(const char *, long, long); +static void obsolete(int *, char **[]); +static void usage(void); int main(int argc, char **argv) @@ -518,7 +518,7 @@ usage(void) * range (except that a vmax of 0 means unlimited). */ static long -numarg(char *meaning, long vmin, long vmax) +numarg(const char *meaning, long vmin, long vmax) { char *p; long val; diff --git a/sbin/dump/optr.c b/sbin/dump/optr.c index 527664383b..90d29d4770 100644 --- a/sbin/dump/optr.c +++ b/sbin/dump/optr.c @@ -32,7 +32,7 @@ * * @(#)optr.c 8.2 (Berkeley) 1/6/94 * $FreeBSD: src/sbin/dump/optr.c,v 1.9.2.5 2002/02/23 22:32:51 iedowse Exp $ - * $DragonFly: src/sbin/dump/optr.c,v 1.7 2005/04/13 14:05:35 joerg Exp $ + * $DragonFly: src/sbin/dump/optr.c,v 1.8 2005/04/13 15:21:36 joerg Exp $ */ #include @@ -72,7 +72,7 @@ static int timeout; static const char *attnmessage; /* attention message */ int -query(char *question) +query(const char *question) { char replybuffer[64]; int back, errcount; @@ -318,7 +318,7 @@ getfstab(void) * The file name can omit the leading '/'. */ struct fstab * -fstabsearch(char *key) +fstabsearch(const char *key) { struct pfstab *pf; struct fstab *fs; diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c index 5ff7e5a72e..e1b065b043 100644 --- a/sbin/dump/tape.c +++ b/sbin/dump/tape.c @@ -32,7 +32,7 @@ * * @(#)tape.c 8.4 (Berkeley) 5/1/95 * $FreeBSD: src/sbin/dump/tape.c,v 1.12.2.3 2002/02/23 22:32:51 iedowse Exp $ - * $DragonFly: src/sbin/dump/tape.c,v 1.11 2005/04/13 14:32:01 joerg Exp $ + * $DragonFly: src/sbin/dump/tape.c,v 1.12 2005/04/13 15:21:36 joerg Exp $ */ #include @@ -169,16 +169,12 @@ alloctape(void) } void -writerec(char *dp, int isspcl) +writerec(const void *dp, int isspcl) { slp->req[trecno].dblk = (daddr_t)0; slp->req[trecno].count = 1; -#ifndef __alpha__ - *(union u_spcl *)(*(nextblock)++) = *(union u_spcl *)dp; -#else bcopy(dp, *(nextblock)++, sizeof (union u_spcl)); -#endif if (isspcl) lastspclrec = spcl.c_tapea; trecno++; diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c index 4f4e259e3f..f9ae3ace10 100644 --- a/sbin/dump/traverse.c +++ b/sbin/dump/traverse.c @@ -32,7 +32,7 @@ * * @(#)traverse.c 8.7 (Berkeley) 6/15/95 * $FreeBSD: src/sbin/dump/traverse.c,v 1.10.2.6 2003/04/14 20:10:35 johan Exp $ - * $DragonFly: src/sbin/dump/traverse.c,v 1.10 2005/04/13 14:05:35 joerg Exp $ + * $DragonFly: src/sbin/dump/traverse.c,v 1.11 2005/04/13 15:21:36 joerg Exp $ */ #include @@ -502,10 +502,10 @@ blksout(daddr_t *blkp, int frags, ino_t ino) * Dump a map to the tape. */ void -dumpmap(char *map, int type, ino_t ino) +dumpmap(const char *map, int type, ino_t ino) { int i; - char *cp; + const char *cp; spcl.c_type = type; spcl.c_count = howmany(mapsize * sizeof(char), TP_BSIZE); @@ -535,7 +535,7 @@ writeheader(ino_t ino) sum += *lp++; } spcl.c_checksum = CHECKSUM - sum; - writerec((char *)&spcl, 1); + writerec(&spcl, 1); } struct dinode * diff --git a/sbin/dump/unctime.c b/sbin/dump/unctime.c index 41f31e51b2..c50d38ff5b 100644 --- a/sbin/dump/unctime.c +++ b/sbin/dump/unctime.c @@ -32,7 +32,7 @@ * * @(#)unctime.c 8.2 (Berkeley) 6/14/94 * $FreeBSD: src/sbin/dump/unctime.c,v 1.3.2.1 2001/09/19 09:29:39 ru Exp $ - * $DragonFly: src/sbin/dump/unctime.c,v 1.4 2005/04/13 14:05:35 joerg Exp $ + * $DragonFly: src/sbin/dump/unctime.c,v 1.5 2005/04/13 15:21:36 joerg Exp $ */ #include @@ -48,7 +48,7 @@ time_t -unctime(char *str) +unctime(const char *str) { struct tm then; -- 2.41.0