d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the reproto.sh script that was broken after my KNFification.

Browse Source 
Pointed out by: bde
This commit is contained in:
Joerg Wunsch 1996-04-07 01:15:03 +00:00
parent 906c1e27fc
commit cbe4630780
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=15083
5 changed files with 100 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sys/miscfs/devfs/devfs_proto.h
View File

@ -1,20 +1,24 @@
/* THIS FILE PRODUCED AUTOMATICALLY */ /* THIS FILE HAS BEEN PRODUCED AUTOMATICALLY */
void devfs_sinit(void *junk) /*proto*/; void devfs_sinit(void *junk);
devnm_p dev_findname(dn_p dir,char *name) /*proto*/; devnm_p dev_findname(dn_p dir,char *name);
int dev_finddir(char *orig_path, dn_p dirnode, int create, dn_p *dn_pp) /*proto*/; int dev_finddir(char *orig_path, dn_p dirnode, int create, dn_p *dn_pp);
int dev_add_name(char *name, dn_p dirnode, devnm_p back, dn_p dnp, devnm_p *devnm_pp) /*proto*/; int dev_add_name(char *name, dn_p dirnode, devnm_p back, dn_p dnp,
int dev_add_node(int entrytype, union typeinfo *by, dn_p proto, dn_p *dn_pp) /*proto*/; devnm_p *devnm_pp);
int dev_touch(devnm_p key) /* update the node for this dev */ /*proto*/; int dev_add_node(int entrytype, union typeinfo *by, dn_p proto, dn_p *dn_pp);
void devfs_dn_free(dn_p dnp) /*proto*/; int dev_touch(devnm_p key) /* update the node for this dev */;
int devfs_add_fronts(devnm_p parent,devnm_p child) /*proto*/; void devfs_dn_free(dn_p dnp);
int dev_dup_plane(struct devfsmount *devfs_mp_p) /*proto*/; int devfs_add_fronts(devnm_p parent,devnm_p child);
void devfs_free_plane(struct devfsmount *devfs_mp_p) /*proto*/; int dev_dup_plane(struct devfsmount *devfs_mp_p);
int dev_dup_entry(dn_p parent, devnm_p back, devnm_p *dnm_pp, struct devfsmount *dvm) /*proto*/; void devfs_free_plane(struct devfsmount *devfs_mp_p);
void dev_free_name(devnm_p devnmp) /*proto*/; int dev_dup_entry(dn_p parent, devnm_p back, devnm_p *dnm_pp,
int devfs_vntodn(struct vnode *vn_p, dn_p *dn_pp) /*proto*/; struct devfsmount *dvm);
int devfs_dntovn(dn_p dnp, struct vnode **vn_pp) /*proto*/; void dev_free_name(devnm_p devnmp);
int dev_add_entry(char *name, dn_p parent, int type, union typeinfo *by, devnm_p *nm_pp) /*proto*/ ; int devfs_vntodn(struct vnode *vn_p, dn_p *dn_pp);
int devfs_mount( struct mount *mp, char *path, caddr_t data, struct nameidata *ndp, struct proc *p) /*proto*/; int devfs_dntovn(dn_p dnp, struct vnode **vn_pp);
void devfs_dropvnode(dn_p dnp) /*proto*/; int dev_add_entry(char *name, dn_p parent, int type, union typeinfo *by,
devnm_p *nm_pp);
int devfs_mount(struct mount *mp, char *path, caddr_t data,
struct nameidata *ndp, struct proc *p);
void devfs_dropvnode(dn_p dnp);
/* THIS FILE PRODUCED AUTOMATICALLY */ /* THIS FILE PRODUCED AUTOMATICALLY */
/* DO NOT EDIT (see reproto.sh) */ /* DO NOT EDIT (see reproto.sh) */

48
sys/miscfs/devfs/devfs_tree.c
View File

@ -2,7 +2,7 @@
/* /*
* Written by Julian Elischer (julian@DIALix.oz.au) * Written by Julian Elischer (julian@DIALix.oz.au)
* *
* $Header: /home/ncvs/src/sys/miscfs/devfs/devfs_tree.c,v 1.22 1996/04/03 03:03:27 scrappy Exp $ * $Header: /home/ncvs/src/sys/miscfs/devfs/devfs_tree.c,v 1.23 1996/04/06 13:34:35 joerg Exp $
*/ */
#include "param.h" #include "param.h"
@ -32,8 +32,9 @@ int devfs_up_and_going;
* Notice that the ops are by indirection.. as they haven't * Notice that the ops are by indirection.. as they haven't
* been set up yet! * been set up yet!
*/ */
/*proto*/
void void
devfs_sinit(void *junk) /*proto*/ devfs_sinit(void *junk)
{ {
int retval; /* we will discard this */ int retval; /* we will discard this */
devnm_p new; devnm_p new;
@ -67,8 +68,9 @@ devfs_sinit(void *junk) /*proto*/
* Search down the linked list off a dir to find "name" * * Search down the linked list off a dir to find "name" *
* return the dn_p for that node. * return the dn_p for that node.
\***************************************************************/ \***************************************************************/
/*proto*/
devnm_p devnm_p
dev_findname(dn_p dir,char *name) /*proto*/ dev_findname(dn_p dir,char *name)
{ {
devnm_p newfp; devnm_p newfp;
DBPRINT((" dev_findname(%s)\n",name)); DBPRINT((" dev_findname(%s)\n",name));
@ -109,8 +111,9 @@ dev_findname(dn_p dir,char *name) /*proto*/
* int create, create path if not found * * int create, create path if not found *
* dn_p *dn_pp) where to return the node of the dir * * dn_p *dn_pp) where to return the node of the dir *
\***********************************************************************/ \***********************************************************************/
/*proto*/
int int
dev_finddir(char *orig_path, dn_p dirnode, int create, dn_p *dn_pp) /*proto*/ dev_finddir(char *orig_path, dn_p dirnode, int create, dn_p *dn_pp)
{ {
devnm_p devnmp; devnm_p devnmp;
dn_p dnp; dn_p dnp;
@ -218,9 +221,10 @@ dev_finddir(char *orig_path, dn_p dirnode, int create, dn_p *dn_pp) /*proto*/
* * * *
* Creates a name node, and links it to the supplied node * * Creates a name node, and links it to the supplied node *
\***********************************************************************/ \***********************************************************************/
/*proto*/
int int
dev_add_name(char *name, dn_p dirnode, devnm_p back, dn_p dnp, dev_add_name(char *name, dn_p dirnode, devnm_p back, dn_p dnp,
devnm_p *devnm_pp) /*proto*/ devnm_p *devnm_pp)
{ {
devnm_p devnmp; devnm_p devnmp;
devnm_p realthing; /* needed to create an alias */ devnm_p realthing; /* needed to create an alias */
@ -350,8 +354,9 @@ dev_add_name(char *name, dn_p dirnode, devnm_p back, dn_p dnp,
* but it is only cleared on a transition * * but it is only cleared on a transition *
* so this is ok till we link it to something * * so this is ok till we link it to something *
\***********************************************************************/ \***********************************************************************/
/*proto*/
int int
dev_add_node(int entrytype, union typeinfo *by, dn_p proto, dn_p *dn_pp) /*proto*/ dev_add_node(int entrytype, union typeinfo *by, dn_p proto, dn_p *dn_pp)
{ {
dn_p dnp; dn_p dnp;
int retval; int retval;
@ -442,15 +447,18 @@ dev_add_node(int entrytype, union typeinfo *by, dn_p proto, dn_p *dn_pp) /*proto
* DEV_NODE reference count manipulations.. when a ref count * * DEV_NODE reference count manipulations.. when a ref count *
* reaches 0, the node is to be deleted * * reaches 0, the node is to be deleted *
\***************************************************************/ \***************************************************************/
/*proto*/
int int
dev_touch(devnm_p key) /* update the node for this dev */ /*proto*/ dev_touch(devnm_p key) /* update the node for this dev */
{ {
DBPRINT(("dev_touch\n")); DBPRINT(("dev_touch\n"));
TIMEVAL_TO_TIMESPEC(&time,&(key->dnp->mtime)) TIMEVAL_TO_TIMESPEC(&time,&(key->dnp->mtime))
return 0; /*XXX*/ return 0; /*XXX*/
} }
void devfs_dn_free(dn_p dnp) /*proto*/ /*proto*/
void
devfs_dn_free(dn_p dnp)
{ {
if(--dnp->links <= 0 ) /* can be -1 for initial free, on error */ if(--dnp->links <= 0 ) /* can be -1 for initial free, on error */
{ {
@ -477,8 +485,9 @@ void devfs_dn_free(dn_p dnp) /*proto*/
* This allows a new node to be propogated through all mounted planes * * This allows a new node to be propogated through all mounted planes *
* * * *
\***********************************************************************/ \***********************************************************************/
/*proto*/
int int
devfs_add_fronts(devnm_p parent,devnm_p child) /*proto*/ devfs_add_fronts(devnm_p parent,devnm_p child)
{ {
int error; int error;
devnm_p newnmp; devnm_p newnmp;
@ -553,8 +562,9 @@ devfs_remove_dev(void *devnmp)
* up the tree.. * up the tree..
* If we are the first plane, just return the base root * If we are the first plane, just return the base root
**************************************************************/ **************************************************************/
/*proto*/
int int
dev_dup_plane(struct devfsmount *devfs_mp_p) /*proto*/ dev_dup_plane(struct devfsmount *devfs_mp_p)
{ {
devnm_p new; devnm_p new;
int error = 0; int error = 0;
@ -577,8 +587,9 @@ dev_dup_plane(struct devfsmount *devfs_mp_p) /*proto*/
/***************************************************************\ /***************************************************************\
* Free a whole plane * Free a whole plane
\***************************************************************/ \***************************************************************/
/*proto*/
void void
devfs_free_plane(struct devfsmount *devfs_mp_p) /*proto*/ devfs_free_plane(struct devfsmount *devfs_mp_p)
{ {
devnm_p devnmp; devnm_p devnmp;
@ -595,9 +606,10 @@ devfs_free_plane(struct devfsmount *devfs_mp_p) /*proto*/
* recursively will create subnodes corresponding to equivalent * * recursively will create subnodes corresponding to equivalent *
* child nodes in the base level * * child nodes in the base level *
\***************************************************************/ \***************************************************************/
/*proto*/
int int
dev_dup_entry(dn_p parent, devnm_p back, devnm_p *dnm_pp, dev_dup_entry(dn_p parent, devnm_p back, devnm_p *dnm_pp,
struct devfsmount *dvm) /*proto*/ struct devfsmount *dvm)
{ {
devnm_p newnmp; devnm_p newnmp;
struct devfsmount *dmt; struct devfsmount *dmt;
@ -662,8 +674,9 @@ dev_dup_entry(dn_p parent, devnm_p back, devnm_p *dnm_pp,
* dev_node then it may not get freed yet * * dev_node then it may not get freed yet *
* can handle if there is no dnp * * can handle if there is no dnp *
\***************************************************************/ \***************************************************************/
/*proto*/
void void
dev_free_name(devnm_p devnmp) /*proto*/ dev_free_name(devnm_p devnmp)
{ {
dn_p parent = devnmp->parent; dn_p parent = devnmp->parent;
dn_p dnp = devnmp->dnp; dn_p dnp = devnmp->dnp;
@ -741,8 +754,9 @@ dev_free_name(devnm_p devnmp) /*proto*/
* Theoretically this could be called for any kind of * * Theoretically this could be called for any kind of *
* vnode, however in practice it must be a DEVFS vnode * * vnode, however in practice it must be a DEVFS vnode *
\*******************************************************/ \*******************************************************/
/*proto*/
int int
devfs_vntodn(struct vnode *vn_p, dn_p *dn_pp) /*proto*/ devfs_vntodn(struct vnode *vn_p, dn_p *dn_pp)
{ {
DBPRINT((" vntodn ")); DBPRINT((" vntodn "));
@ -777,8 +791,9 @@ DBPRINT((" vntodn "));
* associated, or get a new one an associate it with the dev_node* * associated, or get a new one an associate it with the dev_node*
* need to check about vnode references.. should we increment it?* * need to check about vnode references.. should we increment it?*
\***************************************************************/ \***************************************************************/
/*proto*/
int int
devfs_dntovn(dn_p dnp, struct vnode **vn_pp) /*proto*/ devfs_dntovn(dn_p dnp, struct vnode **vn_pp)
{ {
struct vnode *vn_p, *nvp; struct vnode *vn_p, *nvp;
int error = 0; int error = 0;
@ -886,9 +901,10 @@ DBPRINT(("(New vnode)"));
/***********************************************************************\ /***********************************************************************\
* add a whole device, with no prototype.. make name element and node * * add a whole device, with no prototype.. make name element and node *
\***********************************************************************/ \***********************************************************************/
/*proto*/
int int
dev_add_entry(char *name, dn_p parent, int type, union typeinfo *by, dev_add_entry(char *name, dn_p parent, int type, union typeinfo *by,
devnm_p *nm_pp) /*proto*/ devnm_p *nm_pp)
{ {
dn_p dnp; dn_p dnp;
int error = 0; int error = 0;

5
sys/miscfs/devfs/devfs_vfsops.c
View File

@ -1,7 +1,7 @@
/* /*
* Written by Julian Elischer (julian@DIALix.oz.au) * Written by Julian Elischer (julian@DIALix.oz.au)
* *
* $Header: /home/ncvs/src/sys/miscfs/devfs/devfs_vfsops.c,v 1.9 1996/01/02 09:14:49 peter Exp $ * $Header: /home/ncvs/src/sys/miscfs/devfs/devfs_vfsops.c,v 1.10 1996/04/06 13:34:36 joerg Exp $
* *
* *
*/ */
@ -50,9 +50,10 @@ devfs_init(void)
* it must be mounted during single user.. until it is, only std{in/out/err} * it must be mounted during single user.. until it is, only std{in/out/err}
* and the root filesystem are available. * and the root filesystem are available.
*/ */
/*proto*/
int int
devfs_mount(struct mount *mp, char *path, caddr_t data, devfs_mount(struct mount *mp, char *path, caddr_t data,
struct nameidata *ndp, struct proc *p) /*proto*/ struct nameidata *ndp, struct proc *p)
{ {
struct devfsmount *devfs_mp_p; /* devfs specific mount control block */ struct devfsmount *devfs_mp_p; /* devfs specific mount control block */
int error; int error;

6
sys/miscfs/devfs/devfs_vnops.c
View File

@ -1,7 +1,7 @@
/* /*
* Written by Julian Elischer (julian@DIALix.oz.au) * Written by Julian Elischer (julian@DIALix.oz.au)
* *
* $Header: /home/ncvs/src/sys/miscfs/devfs/devfs_vnops.c,v 1.18 1995/12/14 19:04:09 bde Exp $ * $Header: /home/ncvs/src/sys/miscfs/devfs/devfs_vnops.c,v 1.19 1996/04/06 13:34:37 joerg Exp $
* *
* symlinks can wait 'til later. * symlinks can wait 'til later.
*/ */
@ -1616,9 +1616,9 @@ devfs_nullop(void *junk)
return (0); return (0);
} }
/*proto*/
void void
devfs_dropvnode(dn_p dnp) /*proto*/ devfs_dropvnode(dn_p dnp)
{ {
struct vnode *vn_p; struct vnode *vn_p;

44
sys/miscfs/devfs/reproto.sh
View File

@ -1,6 +1,42 @@
#!/bin/sh #!/bin/sh
echo "/* THIS FILE PRODUCED AUTOMATICALLY */" >devfs_proto.h #
grep -h '/\*proto\*/' *.c |awk '{print $0 ";"}' >>devfs_proto.h # This used to be a shell script, but had to become more sophisticated
echo "/* THIS FILE PRODUCED AUTOMATICALLY */" >>devfs_proto.h # to allow for KNF function definitions. So rewrote in perl, but wrapped
echo "/* DO NOT EDIT (see reproto.sh) */" >>devfs_proto.h # as a shell script.
#
exec /usr/bin/perl << *EOF*
open(PROTO, ">devfs_proto.h") || die "Cannot open devfs_proto.h\n";
print PROTO "/* THIS FILE HAS BEEN PRODUCED AUTOMATICALLY */\n";
while (\$file = <*.c>) {
if(open(F, \$file) == 0) {
warn "Cannot open \$file.\n";
next;
}
while(<F>) {
chop;
if (m|/\*proto\*/|) {
\$collecting = 1;
\$idx = 0;
} elsif (\$collecting) {
if (/^{/) {
\$text[\$idx - 1] .= ';';
for (\$i = 0; \$i < \$idx; \$i++) {
print PROTO "\$text[\$i]";
print PROTO \$i == 0? "\t": "\n";
}
\$collecting = 0;
next;
}
\$text[\$idx++] = \$_;
}
}
close F;
}
print PROTO "/* THIS FILE PRODUCED AUTOMATICALLY */\n" .
"/* DO NOT EDIT (see reproto.sh) */\n";
*EOF*