diff options
Diffstat (limited to 'sys/fs')
-rw-r--r-- | sys/fs/coda/coda_psdev.c | 2 | ||||
-rw-r--r-- | sys/fs/coda/coda_vfsops.c | 2 | ||||
-rw-r--r-- | sys/fs/coda/coda_vnops.c | 2 | ||||
-rw-r--r-- | sys/fs/nwfs/nwfs_io.c | 4 | ||||
-rw-r--r-- | sys/fs/nwfs/nwfs_subr.c | 2 | ||||
-rw-r--r-- | sys/fs/pseudofs/pseudofs.c | 16 | ||||
-rw-r--r-- | sys/fs/smbfs/smbfs_smb.c | 2 | ||||
-rw-r--r-- | sys/fs/smbfs/smbfs_subr.h | 4 |
8 files changed, 17 insertions, 17 deletions
diff --git a/sys/fs/coda/coda_psdev.c b/sys/fs/coda/coda_psdev.c index 7014c89..c2653ec 100644 --- a/sys/fs/coda/coda_psdev.c +++ b/sys/fs/coda/coda_psdev.c @@ -89,7 +89,7 @@ int coda_pcatch = PCATCH; #else #endif -#define ENTRY if(coda_psdev_print_entry) myprintf(("Entered %s\n",__FUNCTION__)) +#define ENTRY if(coda_psdev_print_entry) myprintf(("Entered %s\n",__func__)) void vcodaattach(int n); diff --git a/sys/fs/coda/coda_vfsops.c b/sys/fs/coda/coda_vfsops.c index dd171df..275b036 100644 --- a/sys/fs/coda/coda_vfsops.c +++ b/sys/fs/coda/coda_vfsops.c @@ -67,7 +67,7 @@ MALLOC_DEFINE(M_CODA, "CODA storage", "Various Coda Structures"); int codadebug = 0; int coda_vfsop_print_entry = 0; -#define ENTRY if(coda_vfsop_print_entry) myprintf(("Entered %s\n",__FUNCTION__)) +#define ENTRY if(coda_vfsop_print_entry) myprintf(("Entered %s\n",__func__)) struct vnode *coda_ctlvp; struct coda_mntinfo coda_mnttbl[NVCODA]; /* indexed by minor device number */ diff --git a/sys/fs/coda/coda_vnops.c b/sys/fs/coda/coda_vnops.c index 9dea336..a9da56b 100644 --- a/sys/fs/coda/coda_vnops.c +++ b/sys/fs/coda/coda_vnops.c @@ -103,7 +103,7 @@ static int coda_lockdebug = 0; * coda_init is called at boot time. */ -#define ENTRY if(coda_vnop_print_entry) myprintf(("Entered %s\n",__FUNCTION__)) +#define ENTRY if(coda_vnop_print_entry) myprintf(("Entered %s\n",__func__)) /* Definition of the vnode operation vector */ diff --git a/sys/fs/nwfs/nwfs_io.c b/sys/fs/nwfs/nwfs_io.c index 7325ac3..e3772f0 100644 --- a/sys/fs/nwfs/nwfs_io.c +++ b/sys/fs/nwfs/nwfs_io.c @@ -163,7 +163,7 @@ nwfs_readvnode(struct vnode *vp, struct uio *uiop, struct ucred *cred) { int error, biosize; if (vp->v_type != VREG && vp->v_type != VDIR) { - printf("%s: vn types other than VREG or VDIR are unsupported !\n",__FUNCTION__); + printf("%s: vn types other than VREG or VDIR are unsupported !\n",__func__); return EIO; } if (uiop->uio_resid == 0) return 0; @@ -208,7 +208,7 @@ nwfs_writevnode(vp, uiop, cred, ioflag) int error = 0; if (vp->v_type != VREG) { - printf("%s: vn types other than VREG unsupported !\n",__FUNCTION__); + printf("%s: vn types other than VREG unsupported !\n",__func__); return EIO; } NCPVNDEBUG("ofs=%d,resid=%d\n",(int)uiop->uio_offset, uiop->uio_resid); diff --git a/sys/fs/nwfs/nwfs_subr.c b/sys/fs/nwfs/nwfs_subr.c index 4755891..3d77342 100644 --- a/sys/fs/nwfs/nwfs_subr.c +++ b/sys/fs/nwfs/nwfs_subr.c @@ -197,7 +197,7 @@ ncp_lookup(struct vnode *dvp, int len, char *name, struct nw_entry_info *fap, } return error; } else if (len == 2 && name[0] == '.' && name[1] == '.') { - printf("%s: knows NOTHING about '..'\n", __FUNCTION__); + printf("%s: knows NOTHING about '..'\n", __func__); return EIO; } else { error = ncp_obtain_info(nmp, dnp->n_fid.f_id, diff --git a/sys/fs/pseudofs/pseudofs.c b/sys/fs/pseudofs/pseudofs.c index 6bb69a7..6477bff 100644 --- a/sys/fs/pseudofs/pseudofs.c +++ b/sys/fs/pseudofs/pseudofs.c @@ -60,13 +60,13 @@ static int _pfs_add_node(struct pfs_node *parent, struct pfs_node *node) { KASSERT(parent != NULL, - (__FUNCTION__ "(): parent is NULL")); + ("%s(): parent is NULL", __func__)); KASSERT(parent->pn_info != NULL, - (__FUNCTION__ "(): parent has no pn_info")); + ("%s(): parent has no pn_info", __func__)); KASSERT(parent->pn_type == pfstype_dir || parent->pn_type == pfstype_procdir || parent->pn_type == pfstype_root, - (__FUNCTION__ "(): parent is not a directory")); + ("%s(): parent is not a directory", __func__)); /* XXX should check for duplicate names etc. */ @@ -121,7 +121,7 @@ pfs_create_dir(struct pfs_node *parent, char *name, struct pfs_node *dir; KASSERT(strlen(name) < PFS_NAMELEN, - (__FUNCTION__ "(): node name is too long")); + ("%s(): node name is too long", __func__)); MALLOC(dir, struct pfs_node *, sizeof *dir, M_PFSNODES, M_WAITOK|M_ZERO); @@ -154,7 +154,7 @@ pfs_create_file(struct pfs_node *parent, char *name, pfs_fill_t fill, struct pfs_node *node; KASSERT(strlen(name) < PFS_NAMELEN, - (__FUNCTION__ "(): node name is too long")); + ("%s(): node name is too long", __func__)); MALLOC(node, struct pfs_node *, sizeof *node, M_PFSNODES, M_WAITOK|M_ZERO); @@ -198,9 +198,9 @@ pfs_destroy(struct pfs_node *node) struct pfs_node *parent, *rover; KASSERT(node != NULL, - (__FUNCTION__ "(): node is NULL")); + ("%s(): node is NULL", __func__)); KASSERT(node->pn_info != NULL, - (__FUNCTION__ "(): node has no pn_info")); + ("%s(): node has no pn_info", __func__)); /* destroy children */ if (node->pn_type == pfstype_dir || @@ -212,7 +212,7 @@ pfs_destroy(struct pfs_node *node) /* unlink from parent */ if ((parent = node->pn_parent) != NULL) { KASSERT(parent->pn_info == node->pn_info, - (__FUNCTION__ "(): parent has different pn_info")); + ("%s(): parent has different pn_info", __func__)); mtx_lock(&node->pn_info->pi_mutex); if (parent->pn_nodes == node) { parent->pn_nodes = node->pn_next; diff --git a/sys/fs/smbfs/smbfs_smb.c b/sys/fs/smbfs/smbfs_smb.c index d7f19c8..db08f5e 100644 --- a/sys/fs/smbfs/smbfs_smb.c +++ b/sys/fs/smbfs/smbfs_smb.c @@ -1254,7 +1254,7 @@ smbfs_smb_lookup(struct smbnode *dnp, const char *name, int nmlen, return error; } else if (nmlen == 2 && name[0] == '.' && name[1] == '.') { error = smbfs_smb_lookup(dnp->n_parent, NULL, 0, fap, scred); - printf("%s: knows NOTHING about '..'\n", __FUNCTION__); + printf("%s: knows NOTHING about '..'\n", __func__); return error; } error = smbfs_findopen(dnp, name, nmlen, diff --git a/sys/fs/smbfs/smbfs_subr.h b/sys/fs/smbfs/smbfs_subr.h index d41e9a8..058ffe8 100644 --- a/sys/fs/smbfs/smbfs_subr.h +++ b/sys/fs/smbfs/smbfs_subr.h @@ -38,10 +38,10 @@ MALLOC_DECLARE(M_SMBFSDATA); #endif -#define SMBFSERR(format, args...) printf("%s: "format, __FUNCTION__ ,## args) +#define SMBFSERR(format, args...) printf("%s: "format, __func__ ,## args) #ifdef SMB_VNODE_DEBUG -#define SMBVDEBUG(format, args...) printf("%s: "format, __FUNCTION__ ,## args) +#define SMBVDEBUG(format, args...) printf("%s: "format, __func__ ,## args) #else #define SMBVDEBUG(format, args...) #endif |