|
Description
|
When building ON with gcc (on x86) there are a few warnings in cmd/fs.d.
One bug for the top-level files from me, you can unwind the dependencies
and file more if you like.
Mostly implicit int cleanup and fallout from the cleanup. Some cases where
functions can't be marked __NORETURN so a return has to be added after the
NOTREACHED lint directive (because, say, errmsg doesn't return because we pass
it the FATAL flag but it might other times). And a couple useless statics removed.
The suggested fix compiles but I haven't tested it.
xxxxx@xxxxx.com 2005-05-16 21:06:25 GMT
SUGGESTED FIX
=============
{root:77} diff df.c usr/src/cmd/fs.d
14c14
< #pragma ident "%Z%%M% %I% %E% SMI"
---
> #pragma ident "@(#)df.c 1.57 04/09/28 SMI"
216c216
< static void do_df(int, char **) __NORETURN;
---
> static void do_df(int, char **);
221c221
< int
---
> void
337d336
< return (NULL);
353d351
< return (NULL);
{root:78} diff ff.c usr/src/cmd/fs.d
13c13
< #pragma ident "@(#)ff.c 1.14 05/04/27 SMI"
---
> #pragma ident "@(#)ff.c 1.13 03/01/03 SMI"
54,59c54,56
< static void usage(char *cmd, char *usg);
< static void exec_specific(void);
< static void lookup(void);
<
< int
< main(int argc, char *argv[])
---
> main(argc, argv)
> int argc;
> char *argv[];
225c222
< return (0);
---
> exit(0);
229d225
< int
243,244c239,240
< static void
< usage(char *cmd, char *usg)
---
> usage(cmd, usg)
> char *cmd, *usg;
260,261c256
< static void
< lookup(void)
---
> lookup()
306,308c301
<
< static void
< exec_specific(void)
---
> exec_specific()
{root:79} diff fsck.c usr/src/cmd/fs.d
13c13
< #pragma ident "@(#)fsck.c 1.27 05/04/27 SMI"
---
> #pragma ident "@(#)fsck.c 1.26 05/03/23 SMI"
91,99d90
< static void usage(void);
< static void fsck_dopreen(struct devlist **devp, int ndevs);
< static void waiter(struct devlist **blp, struct devlist **badlist);
< static void print_badlist(struct devlist *lp);
< static void startdisk(struct devlist *dp);
< static void do_exec(char *fstype, char *nargv[]);
< static void prnt_cmd(FILE *fd, char *fstype);
< static void vfserror(int flag);
<
197,198c188,190
< int
< main(int argc, char *argv[])
---
> main(argc, argv)
> int argc;
> char *argv[];
528c520
< return (exitstat);
---
> exit(exitstat);
531,532c523,526
< static void
< fsck_dopreen(struct devlist **devp, int ndevs)
---
> static
> fsck_dopreen(devp, ndevs)
> struct devlist **devp;
> int ndevs;
579,580c573,575
< static void
< startdisk(struct devlist *dp)
---
> static
> startdisk(dp)
> struct devlist *dp;
596,597c591,594
< static void
< waiter(struct devlist **blp, struct devlist **badlist)
---
> static
> waiter(blp, badlist)
> struct devlist **blp;
> struct devlist **badlist;
639,640c636,638
< static void
< print_badlist(struct devlist *lp)
---
> static
> print_badlist(lp)
> struct devlist *lp;
713d710
< int
726d722
< int
796,797c792,793
< static void
< do_exec(char *fstype, char *nargv[])
---
> do_exec(fstype, nargv)
> char *fstype, *nargv[];
851,852c847,849
< static void
< prnt_cmd(FILE *fd, char *fstype)
---
> prnt_cmd(fd, fstype)
> FILE *fd;
> char *fstype;
862,863c859,860
< static void
< vfserror(int flag)
---
> vfserror(flag)
> int flag;
951d947
< int
970,971c966
< static void
< usage(void)
---
> usage()
{root:81} diff mount.c usr/src/cmd/fs.d
13c13
< #pragma ident "@(#)mount.c 1.49 05/04/27 SMI" /* SVr4.0 1.82 */
---
> #pragma ident "@(#)mount.c 1.48 04/01/22 SMI" /* SVr4.0 1.82 */
202,203c202,205
< int
< main(int argc, char *argv[])
---
> void
> main(argc, argv)
> int argc;
> char *argv[];
521c523
< return (0);
---
> exit(0);
1536d1537
< int
{root:82} diff preenlib.c usr/src/cmd/fs.d
1c1
< #pragma ident "@(#)preenlib.c 1.6 05/04/27 SMI"
---
> #pragma ident "@(#)preenlib.c 1.5 96/04/18 SMI"
22c22
< struct driver {
---
> static struct driver {
30c30
< struct onedev {
---
> static struct onedev {
37c37
< struct rawdev {
---
> static struct rawdev {
83d82
< int
122d120
< int
151d148
< int
175d171
< int
373c369
< static int
---
> static
{root:83} diff switchout.c usr/src/cmd/fs.d
13c13
< #pragma ident "@(#)switchout.c 1.21 05/04/27 SMI"
---
> #pragma ident "@(#)switchout.c 1.20 03/01/03 SMI"
93,97c93,95
< static void usage(char *cmd, char **usg);
< static void lookup(void);
<
< int
< main(int argc, char *argv[])
---
> main(argc, argv)
> int argc;
> char *argv[];
280c278
< return (2);
---
> exit(2);
283,284c281,283
< static void
< usage(char *cmd, char **usg)
---
> usage(cmd, usg)
> char *cmd;
> char **usg;
302,303c301
< static void
< lookup(void)
---
> lookup()
{root:84} diff umount.c usr/src/cmd/fs.d
13c13
< #pragma ident "@(#)umount.c 1.44 05/04/27 SMI"
---
> #pragma ident "@(#)umount.c 1.43 04/11/19 SMI"
136,137c136,138
< int
< main(int argc, char **argv)
---
> main(argc, argv)
> int argc;
> char **argv;
318c319
< return (0);
---
> exit(0);
{root:85} diff volcopy.c usr/src/cmd/fs.d
13c13
< #pragma ident "@(#)volcopy.c 1.12 05/04/27 SMI"
---
> #pragma ident "@(#)volcopy.c 1.11 04/09/28 SMI"
42,45c42,44
< static void doexec(char *fstype, char *nargv[]);
<
< int
< main(int argc, char **argv)
---
> main(argc, argv)
> int argc;
> char **argv;
199d197
< return (0);
202,203c200,201
< static void
< doexec(char *fstype, char *nargv[])
---
> doexec(fstype, nargv)
> char *fstype, *nargv[];
xxxxx@xxxxx.com 2005-05-16 21:06:25 GMT
oss-bite-size
xxxxx@xxxxx.com 2005-06-06 04:01:05 GMT
xxxxx@xxxxx.com 2005-06-06 04:13:54 GMT
|