Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove pointless function indirection through panic_func(). It was 

initialized to one thing, and then set to another right at the top of
main and never changed again.
This commit is contained in:
dholland 2014-07-12 19:44:00 +00:00
parent 63bc5e6959
commit 6df0042d98
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sbin/fsck_lfs/lfs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lfs.c,v 1.41 2013/10/19 01:09:58 christos Exp $ */
/* $NetBSD: lfs.c,v 1.42 2014/07/12 19:44:00 dholland Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
* All rights reserved.
@ -85,6 +85,7 @@
#include <unistd.h>
#include <util.h>
#include "fsutil.h"
#include "bufcache.h"
#include "vnode.h"
#include "lfs_user.h"
@ -107,7 +108,6 @@ static int
lfs_fragextend(struct uvnode *, int, int, daddr_t, struct ubuf **);
int fsdirty = 0;
void (*panic_func)(int, const char *, va_list) = my_vpanic;
/*
* LFS buffer and uvnode operations
@ -834,20 +834,13 @@ check_summary(struct lfs *fs, SEGSUM *sp, ulfs_daddr_t pseg_addr, int debug,
}
/* print message and exit */
void
my_vpanic(int fatal, const char *fmt, va_list ap)
{
(void) vprintf(fmt, ap);
exit(8);
}
void
call_panic(const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
panic_func(1, fmt, ap);
vmsg(1, fmt, ap);
va_end(ap);
}

4
sbin/fsck_lfs/main.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: main.c,v 1.46 2014/07/12 16:11:27 dholland Exp $ */
/* $NetBSD: main.c,v 1.47 2014/07/12 19:44:00 dholland Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@ -57,7 +57,6 @@ static int argtoi(int, const char *, const char *, int);
static int checkfilesys(const char *, char *, long, int);
static void usage(void);
static void efun(int, const char *, ...);
extern void (*panic_func)(int, const char *, va_list);
static void
efun(int eval, const char *fmt, ...)
@ -81,7 +80,6 @@ main(int argc, char **argv)
skipclean = 1;
exitonfail = 0;
idaddr = 0x0;
panic_func = vmsg;
esetfunc(efun);
while ((ch = getopt(argc, argv, optstring)) != -1) {
switch (ch) {