From: Sascha Wildner <saw@online.de>
Date: Sun, 26 Aug 2012 11:15:35 +0000 (+0200)
Subject: growfs(8)/ffsinfo(8): Use __func__
X-Git-Tag: v3.2.0~251
X-Git-Url: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/4582459539b44b1a20d0e6935eff21eff642b42d

growfs(8)/ffsinfo(8): Use __func__
---

diff --git a/sbin/ffsinfo/ffsinfo.c b/sbin/ffsinfo/ffsinfo.c
index b336897..88050d0 100644
--- a/sbin/ffsinfo/ffsinfo.c
+++ b/sbin/ffsinfo/ffsinfo.c
@@ -96,7 +96,6 @@ static void	dump_whole_inode(ino_t, int, int);
 void
 rdfs(daddr_t bno, size_t size, void *bf, int fsi)
 {
-	DBG_FUNC("rdfs")
 	ssize_t	n;
 
 	DBG_ENTER;
@@ -129,7 +128,6 @@ rdfs(daddr_t bno, size_t size, void *bf, int fsi)
 int
 main(int argc, char **argv)
 {
-	DBG_FUNC("main")
 	char	*device, *special, *cp;
 	char	ch;
 	size_t	len;
@@ -405,7 +403,6 @@ main(int argc, char **argv)
 void
 dump_whole_inode(ino_t inode, int fsi, int level)
 {
-	DBG_FUNC("dump_whole_inode")
 	struct ufs1_dinode	*ino;
 	int	rb;
 	unsigned int	ind2ctr, ind3ctr;
@@ -544,8 +541,6 @@ dump_whole_inode(ino_t inode, int fsi, int level)
 void
 usage(void)
 {
-	DBG_FUNC("usage")	
-
 	DBG_ENTER;
 
 	fprintf(stderr,
@@ -568,7 +563,6 @@ usage(void)
 struct ufs1_dinode *
 ginode(ino_t inumber, int fsi)
 {
-	DBG_FUNC("ginode")
 	ufs_daddr_t	iblk;
 	static ino_t	startinum=0;	/* first inode in cached block */
 	struct ufs1_dinode	*pi;
diff --git a/sbin/growfs/debug.h b/sbin/growfs/debug.h
index d39be3e..7021846 100644
--- a/sbin/growfs/debug.h
+++ b/sbin/growfs/debug.h
@@ -37,8 +37,6 @@
  *
  * $TSHeader: src/sbin/growfs/debug.h,v 1.2 2000/11/16 18:43:50 tom Exp $
  * $FreeBSD: src/sbin/growfs/debug.h,v 1.1.2.1 2001/07/16 15:02:13 tomsoft Exp $
- * $DragonFly: src/sbin/growfs/debug.h,v 1.4 2006/04/03 01:58:49 dillon Exp $
- *
  */
 
 #ifdef FS_DEBUG
@@ -81,15 +79,14 @@ void dbg_dump_sptbl(struct fs *, const char *, struct cg *);
 #define DL_INFO	0x02
 extern int _dbg_lvl_;
 
-#define DBG_FUNC(N) char __FKT__[] = (N);
 #define DBG_ENTER if(_dbg_lvl_ & DL_TRC) {                                    \
-	fprintf(stderr, "~>%s: %s\n", __FILE__, __FKT__ );                    \
+	fprintf(stderr, "~>%s: %s\n", __FILE__, __func__ );                   \
 	}
 #define DBG_LEAVE if(_dbg_lvl_ & DL_TRC) {                                    \
-	fprintf(stderr, "~<%s[%d]: %s\n", __FILE__, __LINE__, __FKT__ );      \
+	fprintf(stderr, "~<%s[%d]: %s\n", __FILE__, __LINE__, __func__ );     \
 	}
 #define DBG_TRC if(_dbg_lvl_ & DL_TRC) {                                      \
-	fprintf(stderr, "~=%s[%d]: %s\n", __FILE__, __LINE__, __FKT__ );      \
+	fprintf(stderr, "~=%s[%d]: %s\n", __FILE__, __LINE__, __func__ );     \
 	}
 #define DBG_PRINT0(A) if(_dbg_lvl_ & DL_INFO) {                               \
 	fprintf(stderr, "~ %s", (A));                                         \
@@ -125,7 +122,6 @@ extern int _dbg_lvl_;
 #define DBG_DUMP_CLMAP(F,C,M)
 #define DBG_DUMP_CLSUM(F,C,M)
 #define DBG_DUMP_SPTBL(F,C,M)
-#define DBG_FUNC(N)
 #define DBG_ENTER
 #define DBG_TRC
 #define DBG_LEAVE
diff --git a/sbin/growfs/growfs.c b/sbin/growfs/growfs.c
index 98a2cc7..7f1180e 100644
--- a/sbin/growfs/growfs.c
+++ b/sbin/growfs/growfs.c
@@ -148,7 +148,6 @@ static void	updrefs(int, ino_t, struct gfs_bpp *, int, int, unsigned int);
 static void
 growfs(int fsi, int fso, unsigned int Nflag)
 {
-	DBG_FUNC("growfs")
 	int	i;
 	int	cylno, j;
 	time_t	utime;
@@ -346,7 +345,6 @@ growfs(int fsi, int fso, unsigned int Nflag)
 static void
 initcg(int cylno, time_t utime, int fso, unsigned int Nflag)
 {
-	DBG_FUNC("initcg")
 	daddr_t cbase, d, dlower, dupper, dmax, blkno;
 	int i;
 	struct csum *cs;
@@ -520,7 +518,6 @@ initcg(int cylno, time_t utime, int fso, unsigned int Nflag)
 static void
 frag_adjust(daddr_t frag, int sign)
 {
-	DBG_FUNC("frag_adjust")
 	int fragsize;
 	int f;
 
@@ -582,7 +579,6 @@ static void
 cond_bl_upd(ufs_daddr_t *block, struct gfs_bpp *field,
     enum pointer_source source, int fso, unsigned int Nflag)
 {
-	DBG_FUNC("cond_bl_upd")
 	struct gfs_bpp	*f;
 	char *src;
 	daddr_t dst=0;
@@ -661,7 +657,6 @@ cond_bl_upd(ufs_daddr_t *block, struct gfs_bpp *field,
 static void
 updjcg(int cylno, time_t utime, int fsi, int fso, unsigned int Nflag)
 {
-	DBG_FUNC("updjcg")
 	daddr_t	cbase, dmax, dupper;
 	struct csum	*cs;
 	int	i,k;
@@ -914,7 +909,6 @@ updjcg(int cylno, time_t utime, int fsi, int fso, unsigned int Nflag)
 static void
 updcsloc(time_t utime, int fsi, int fso, unsigned int Nflag)
 {
-	DBG_FUNC("updcsloc")
 	struct csum	*cs;
 	int	ocscg, ncscg;
 	int	blocks;
@@ -1549,7 +1543,6 @@ updcsloc(time_t utime, int fsi, int fso, unsigned int Nflag)
 static void
 rdfs(daddr_t bno, size_t size, void *bf, int fsi)
 {
-	DBG_FUNC("rdfs")
 	ssize_t	n;
 
 	DBG_ENTER;
@@ -1573,7 +1566,6 @@ rdfs(daddr_t bno, size_t size, void *bf, int fsi)
 static void
 wtfs(daddr_t bno, size_t size, void *bf, int fso, unsigned int Nflag)
 {
-	DBG_FUNC("wtfs")
 	ssize_t	n;
 
 	DBG_ENTER;
@@ -1603,7 +1595,6 @@ wtfs(daddr_t bno, size_t size, void *bf, int fso, unsigned int Nflag)
 static daddr_t
 alloc(void)
 {
-	DBG_FUNC("alloc")
 	daddr_t	d, blkno;
 	int	lcs1, lcs2;
 	int	l;
@@ -1739,7 +1730,6 @@ alloc(void)
 static int
 isblock(struct fs *fs, unsigned char *cp, int h)
 {
-	DBG_FUNC("isblock")
 	unsigned char	mask;
 
 	DBG_ENTER;
@@ -1776,8 +1766,6 @@ isblock(struct fs *fs, unsigned char *cp, int h)
 static void
 clrblock(struct fs *fs, unsigned char *cp, int h)
 {
-	DBG_FUNC("clrblock")
-
 	DBG_ENTER;
 
 	switch ((fs)->fs_frag) {
@@ -1811,8 +1799,6 @@ clrblock(struct fs *fs, unsigned char *cp, int h)
 static void
 setblock(struct fs *fs, unsigned char *cp, int h)
 {
-	DBG_FUNC("setblock")
-
 	DBG_ENTER;
 
 	switch (fs->fs_frag) {
@@ -1848,7 +1834,6 @@ setblock(struct fs *fs, unsigned char *cp, int h)
 static struct ufs1_dinode *
 ginode(ino_t inumber, int fsi, int cg)
 {
-	DBG_FUNC("ginode")
 	ufs_daddr_t	iblk;
 	static ino_t	startinum=0;	/* first inode in cached block */
 	struct ufs1_dinode	*pi;
@@ -1882,7 +1867,6 @@ ginode(ino_t inumber, int fsi, int cg)
 static int
 charsperline(void)
 {
-	DBG_FUNC("charsperline")
 	int	columns;
 	char	*cp;
 	struct winsize	ws;
@@ -1930,7 +1914,6 @@ charsperline(void)
 int
 main(int argc, char **argv)
 {
-	DBG_FUNC("main")
 	struct partinfo pinfo;
 	char	*device, *special, *cp;
 	char	ch;
@@ -2208,8 +2191,6 @@ main(int argc, char **argv)
 static void
 usage(void)
 {	
-	DBG_FUNC("usage")
-
 	DBG_ENTER;
 
 	fprintf(stderr, "usage: growfs [-Ny] [-s size] special\n");
@@ -2226,7 +2207,6 @@ usage(void)
 static void
 updclst(int block)
 {	
-	DBG_FUNC("updclst")
 	static int	lcs=0;
 
 	DBG_ENTER;
@@ -2274,7 +2254,6 @@ static void
 updrefs(int cg, ino_t in, struct gfs_bpp *bp, int fsi, int fso, unsigned int
     Nflag)
 {	
-	DBG_FUNC("updrefs")
 	unsigned int	ictr, ind2ctr, ind3ctr;
 	ufs_daddr_t	*iptr, *ind2ptr, *ind3ptr;
 	struct ufs1_dinode	*ino;