summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbentley <bentley@openbsd.org>2014-11-19 03:42:40 +0000
committerbentley <bentley@openbsd.org>2014-11-19 03:42:40 +0000
commitb81c38f1e510104387423023fa43e4caab81bc82 (patch)
tree152f9ef2bd6ed9e2acb39cdf6f9d40233541f0f4
parentBugfix: run for the specified number of seconds as described in the manual, (diff)
downloadwireguard-openbsd-b81c38f1e510104387423023fa43e4caab81bc82.tar.xz
wireguard-openbsd-b81c38f1e510104387423023fa43e4caab81bc82.zip
Remove ifdef checks for LIBRARY.
It is undocumented and triggers the same conditional inclusions as PURIFY does. From Martin Natano.
-rw-r--r--usr.bin/vi/cl/cl_main.c4
-rw-r--r--usr.bin/vi/common/main.c8
-rw-r--r--usr.bin/vi/perl_api/perl.xs4
3 files changed, 8 insertions, 8 deletions
diff --git a/usr.bin/vi/cl/cl_main.c b/usr.bin/vi/cl/cl_main.c
index ec0122a7bd4..e80ea19b9a8 100644
--- a/usr.bin/vi/cl/cl_main.c
+++ b/usr.bin/vi/cl/cl_main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cl_main.c,v 1.24 2014/11/14 20:27:03 tedu Exp $ */
+/* $OpenBSD: cl_main.c,v 1.25 2014/11/19 03:42:40 bentley Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -128,7 +128,7 @@ main(int argc, char *argv[])
}
/* Free the global and CL private areas. */
-#if defined(DEBUG) || defined(PURIFY) || defined(LIBRARY)
+#if defined(DEBUG) || defined(PURIFY)
free(clp);
free(gp);
#endif
diff --git a/usr.bin/vi/common/main.c b/usr.bin/vi/common/main.c
index 0920a00e8c0..1272c87d1bf 100644
--- a/usr.bin/vi/common/main.c
+++ b/usr.bin/vi/common/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.24 2014/11/14 20:27:03 tedu Exp $ */
+/* $OpenBSD: main.c,v 1.25 2014/11/19 03:42:40 bentley Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -461,7 +461,7 @@ v_end(GS *gp)
perl_end(gp);
#endif
-#if defined(DEBUG) || defined(PURIFY) || defined(LIBRARY)
+#if defined(DEBUG) || defined(PURIFY)
{ FREF *frp;
/* Free FREF's. */
while ((frp = TAILQ_FIRST(&gp->frefq))) {
@@ -505,13 +505,13 @@ v_end(GS *gp)
(void)fprintf(stderr, "%s%.*s",
mp->mtype == M_ERR ? "ex/vi: " : "", (int)mp->len, mp->buf);
LIST_REMOVE(mp, q);
-#if defined(DEBUG) || defined(PURIFY) || defined(LIBRARY)
+#if defined(DEBUG) || defined(PURIFY)
free(mp->buf);
free(mp);
#endif
}
-#if defined(DEBUG) || defined(PURIFY) || defined(LIBRARY)
+#if defined(DEBUG) || defined(PURIFY)
/* Free any temporary space. */
if (gp->tmp_bp != NULL)
free(gp->tmp_bp);
diff --git a/usr.bin/vi/perl_api/perl.xs b/usr.bin/vi/perl_api/perl.xs
index aacc5e6dd61..0223b4a7fde 100644
--- a/usr.bin/vi/perl_api/perl.xs
+++ b/usr.bin/vi/perl_api/perl.xs
@@ -1,4 +1,4 @@
-/* $OpenBSD: perl.xs,v 1.4 2009/10/27 23:59:47 deraadt Exp $ */
+/* $OpenBSD: perl.xs,v 1.5 2014/11/19 03:42:40 bentley Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -74,7 +74,7 @@ perl_end(gp)
/*Irestartop = 0; / * XXX */
perl_run(gp->perl_interp);
perl_destruct(gp->perl_interp);
-#if defined(DEBUG) || defined(PURIFY) || defined(LIBRARY)
+#if defined(DEBUG) || defined(PURIFY)
perl_free(gp->perl_interp);
#endif
}