aboutsummaryrefslogtreecommitdiff
path: root/cddl/contrib/opensolaris/cmd/mdb
diff options
context:
space:
mode:
authorJohn Birrell <jb@FreeBSD.org>2008-04-26 00:54:52 +0000
committerJohn Birrell <jb@FreeBSD.org>2008-04-26 00:54:52 +0000
commit20594ebf9039b47ff078f8061765a1bd7aeb91e4 (patch)
tree24d646e40917d468e03d33d5425f93b94e78d6b1 /cddl/contrib/opensolaris/cmd/mdb
parent89b5b33da21ff6dbab5e91c04d9a6d8e3b17405a (diff)
parent275928fc142e604d7d091feb5eff54c72f241964 (diff)
downloadsrc-20594ebf9039b47ff078f8061765a1bd7aeb91e4.tar.gz
src-20594ebf9039b47ff078f8061765a1bd7aeb91e4.zip
This commit was generated by cvs2svn to compensate for changes in r178528,
which included commits to RCS files with non-trunk default branches.
Notes
Notes: svn path=/head/; revision=178529
Diffstat (limited to 'cddl/contrib/opensolaris/cmd/mdb')
-rw-r--r--cddl/contrib/opensolaris/cmd/mdb/tools/common/die.c14
-rw-r--r--cddl/contrib/opensolaris/cmd/mdb/tools/common/util.h2
2 files changed, 0 insertions, 16 deletions
diff --git a/cddl/contrib/opensolaris/cmd/mdb/tools/common/die.c b/cddl/contrib/opensolaris/cmd/mdb/tools/common/die.c
index 602969e1abb3..16523ff24d57 100644
--- a/cddl/contrib/opensolaris/cmd/mdb/tools/common/die.c
+++ b/cddl/contrib/opensolaris/cmd/mdb/tools/common/die.c
@@ -40,9 +40,6 @@ die(char *format, ...)
{
va_list ap;
int err = errno;
-#if !defined(sun)
- const char *progname = getprogname();
-#endif
(void) fprintf(stderr, "%s: ", progname);
@@ -54,20 +51,13 @@ die(char *format, ...)
if (format[strlen(format) - 1] != '\n')
(void) fprintf(stderr, ": %s\n", strerror(err));
-#if defined(__FreeBSD__)
- exit(0);
-#else
exit(1);
-#endif
}
void
elfdie(char *format, ...)
{
va_list ap;
-#if !defined(sun)
- const char *progname = getprogname();
-#endif
(void) fprintf(stderr, "%s: ", progname);
@@ -79,9 +69,5 @@ elfdie(char *format, ...)
if (format[strlen(format) - 1] != '\n')
(void) fprintf(stderr, ": %s\n", elf_errmsg(elf_errno()));
-#if defined(__FreeBSD__)
- exit(0);
-#else
exit(1);
-#endif
}
diff --git a/cddl/contrib/opensolaris/cmd/mdb/tools/common/util.h b/cddl/contrib/opensolaris/cmd/mdb/tools/common/util.h
index a0932ada0d57..34e191b6a656 100644
--- a/cddl/contrib/opensolaris/cmd/mdb/tools/common/util.h
+++ b/cddl/contrib/opensolaris/cmd/mdb/tools/common/util.h
@@ -40,9 +40,7 @@ extern int findelfsecidx(Elf *, char *);
extern void die(char *, ...);
extern void elfdie(char *, ...);
-#if defined(sun)
extern const char *progname;
-#endif
#ifdef __cplusplus
}