diff --git a/usr.bin/sdiff/Makefile b/usr.bin/sdiff/Makefile index 504adc2a663e..f4772cc3da59 100644 --- a/usr.bin/sdiff/Makefile +++ b/usr.bin/sdiff/Makefile @@ -3,7 +3,7 @@ .include PROG= sdiff -SRCS= common.c edit.c sdiff.c +SRCS= edit.c sdiff.c WARNS= 3 MAN1= sdiff.1 diff --git a/usr.bin/sdiff/common.c b/usr.bin/sdiff/common.c deleted file mode 100644 index 686965c32b99..000000000000 --- a/usr.bin/sdiff/common.c +++ /dev/null @@ -1,24 +0,0 @@ -/* $OpenBSD: common.c,v 1.4 2006/05/25 03:20:32 ray Exp $ */ - -/* - * Written by Raymond Lai . - * Public domain. - */ - -#include -__FBSDID("$FreeBSD$"); - -#include -#include -#include - -#include "common.h" - -void -cleanup(const char *filename) -{ - - if (unlink(filename)) - err(2, "could not delete: %s", filename); - exit(2); -} diff --git a/usr.bin/sdiff/common.h b/usr.bin/sdiff/common.h deleted file mode 100644 index 127c1f4b70f2..000000000000 --- a/usr.bin/sdiff/common.h +++ /dev/null @@ -1,9 +0,0 @@ -/* $OpenBSD: common.h,v 1.2 2006/05/25 03:20:32 ray Exp $ */ -/* $FreeBSD$ */ - -/* - * Written by Raymond Lai . - * Public domain. - */ - -void cleanup(const char *) __dead2; diff --git a/usr.bin/sdiff/edit.c b/usr.bin/sdiff/edit.c index 7c01889d3551..993b515c49b5 100644 --- a/usr.bin/sdiff/edit.c +++ b/usr.bin/sdiff/edit.c @@ -21,9 +21,17 @@ __FBSDID("$FreeBSD$"); #include #include -#include "common.h" #include "extern.h" +static void +cleanup(const char *filename) +{ + + if (unlink(filename)) + err(2, "could not delete: %s", filename); + exit(2); +} + /* * Execute an editor on the specified pathname, which is interpreted * from the shell. This means flags may be included.