From: florian <florian@openbsd.org>
Date: Sat, 27 Feb 2021 10:32:28 +0000 (+0000)
Subject: Path #defines are traditionally prefixed with _PATH.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=ee5be19506226a56d2774ea2e8cc39a8a341536f;p=openbsd

Path #defines are traditionally prefixed with _PATH.
Pointed out by deraadt
---

diff --git a/sbin/unwind/parse.y b/sbin/unwind/parse.y
index 84c5fc6d40a..5fb796655b8 100644
--- a/sbin/unwind/parse.y
+++ b/sbin/unwind/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.24 2020/11/09 04:22:05 tb Exp $	*/
+/*	$OpenBSD: parse.y,v 1.25 2021/02/27 10:32:28 florian Exp $	*/
 
 /*
  * Copyright (c) 2018 Florian Obser <florian@openbsd.org>
@@ -783,7 +783,7 @@ parse_config(char *filename)
 
 	conf = config_new_empty();
 
-	file = pushfile(filename != NULL ? filename : CONF_FILE, 0);
+	file = pushfile(filename != NULL ? filename : _PATH_CONF_FILE, 0);
 	if (file == NULL) {
 		/* no default config file is fine */
 		if (errno == ENOENT && filename == NULL)
diff --git a/sbin/unwind/unwind.c b/sbin/unwind/unwind.c
index d75c0baa9b0..4697767ac34 100644
--- a/sbin/unwind/unwind.c
+++ b/sbin/unwind/unwind.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: unwind.c,v 1.60 2021/02/06 18:01:02 florian Exp $	*/
+/*	$OpenBSD: unwind.c,v 1.61 2021/02/27 10:32:28 florian Exp $	*/
 
 /*
  * Copyright (c) 2018 Florian Obser <florian@openbsd.org>
@@ -128,7 +128,7 @@ main(int argc, char *argv[])
 	int		 control_fd, ta_fd;
 	char		*csock, *saved_argv0;
 
-	csock = UNWIND_SOCKET;
+	csock = _PATH_UNWIND_SOCKET;
 
 	log_init(1, LOG_DAEMON);	/* Log to stderr until daemonized. */
 	log_setverbose(1);
diff --git a/sbin/unwind/unwind.h b/sbin/unwind/unwind.h
index e1a2c052987..59379a4ba99 100644
--- a/sbin/unwind/unwind.h
+++ b/sbin/unwind/unwind.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: unwind.h,v 1.53 2021/01/27 08:30:50 florian Exp $	*/
+/*	$OpenBSD: unwind.h,v 1.54 2021/02/27 10:32:28 florian Exp $	*/
 
 /*
  * Copyright (c) 2018 Florian Obser <florian@openbsd.org>
@@ -30,9 +30,9 @@
 #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
 #endif
 
-#define CONF_FILE	"/etc/unwind.conf"
-#define	UNWIND_SOCKET	"/dev/unwind.sock"
-#define UNWIND_USER	"_unwind"
+#define _PATH_CONF_FILE		"/etc/unwind.conf"
+#define	_PATH_UNWIND_SOCKET	"/dev/unwind.sock"
+#define UNWIND_USER		"_unwind"
 
 #define OPT_VERBOSE	0x00000001
 #define OPT_VERBOSE2	0x00000002
diff --git a/usr.sbin/unwindctl/unwindctl.c b/usr.sbin/unwindctl/unwindctl.c
index 23f12c4a8aa..32bc7b73624 100644
--- a/usr.sbin/unwindctl/unwindctl.c
+++ b/usr.sbin/unwindctl/unwindctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: unwindctl.c,v 1.26 2019/12/18 09:18:28 florian Exp $	*/
+/*	$OpenBSD: unwindctl.c,v 1.27 2021/02/27 10:32:29 florian Exp $	*/
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -77,7 +77,7 @@ main(int argc, char *argv[])
 	int				 ch, column_offset;
 	char				*sockname;
 
-	sockname = UNWIND_SOCKET;
+	sockname = _PATH_UNWIND_SOCKET;
 	while ((ch = getopt(argc, argv, "s:")) != -1) {
 		switch (ch) {
 		case 's':