MFC r264581, r264744:

Various style(9) fixes and typos in printf, grep, sort and patch.

#define should be followed by a tab.

2 files changed, 27 insertions, 27 deletions

diff --git a/usr.bin/patch/common.h b/usr.bin/patch/common.h
index 9425968..a6da179 100644
--- a/usr.bin/patch/common.h
+++ b/usr.bin/patch/common.h
@@ -32,32 +32,32 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#define DEBUGGING
+#define	DEBUGGING
 
 /* constants */
 
-#define MAXHUNKSIZE 200000	/* is this enough lines? */
-#define INITHUNKMAX 125		/* initial dynamic allocation size */
-#define INITLINELEN 4096
-#define BUFFERSIZE 4096
+#define	MAXHUNKSIZE 200000	/* is this enough lines? */
+#define	INITHUNKMAX 125		/* initial dynamic allocation size */
+#define	INITLINELEN 4096
+#define	BUFFERSIZE 4096
 
-#define SCCSPREFIX "s."
-#define GET "get -e %s"
-#define SCCSDIFF "get -p %s | diff - %s >/dev/null"
+#define	SCCSPREFIX "s."
+#define	GET "get -e %s"
+#define	SCCSDIFF "get -p %s | diff - %s >/dev/null"
 
-#define RCSSUFFIX ",v"
-#define CHECKOUT "co -l %s"
-#define RCSDIFF "rcsdiff %s > /dev/null"
+#define	RCSSUFFIX ",v"
+#define	CHECKOUT "co -l %s"
+#define	RCSDIFF "rcsdiff %s > /dev/null"
 
-#define ORIGEXT ".orig"
-#define REJEXT ".rej"
+#define	ORIGEXT ".orig"
+#define	REJEXT ".rej"
 
 /* handy definitions */
 
-#define strNE(s1,s2) (strcmp(s1, s2))
-#define strEQ(s1,s2) (!strcmp(s1, s2))
-#define strnNE(s1,s2,l) (strncmp(s1, s2, l))
-#define strnEQ(s1,s2,l) (!strncmp(s1, s2, l))
+#define	strNE(s1,s2) (strcmp(s1, s2))
+#define	strEQ(s1,s2) (!strcmp(s1, s2))
+#define	strnNE(s1,s2,l) (strncmp(s1, s2, l))
+#define	strnEQ(s1,s2,l) (!strncmp(s1, s2, l))
 
 /* typedefs */
 
@@ -73,7 +73,7 @@ extern size_t	buf_size;	/* size of general purpose buffer */
 extern bool	using_plan_a;	/* try to keep everything in memory */
 extern bool	out_of_mem;	/* ran out of memory in plan a */
 
-#define MAXFILEC 2
+#define	MAXFILEC 2
 
 extern char	*filearg[MAXFILEC];
 extern bool	ok_to_create_file;
@@ -105,11 +105,11 @@ extern bool	warn_on_invalid_line;
 extern bool	last_line_missing_eol;
 
 
-#define CONTEXT_DIFF 1
-#define NORMAL_DIFF 2
-#define ED_DIFF 3
-#define NEW_CONTEXT_DIFF 4
-#define UNI_DIFF 5
+#define	CONTEXT_DIFF 1
+#define	NORMAL_DIFF 2
+#define	ED_DIFF 3
+#define	NEW_CONTEXT_DIFF 4
+#define	UNI_DIFF 5
 
 extern int	diff_type;
 extern char	*revision;	/* prerequisite revision, if any */
diff --git a/usr.bin/patch/pch.h b/usr.bin/patch/pch.h
index 42910c2..e60cc86 100644
--- a/usr.bin/patch/pch.h
+++ b/usr.bin/patch/pch.h
@@ -27,10 +27,10 @@
  * $FreeBSD$
  */
 
-#define OLD_FILE	0
-#define NEW_FILE	1
-#define INDEX_FILE	2
-#define MAX_FILE	3
+#define	OLD_FILE	0
+#define	NEW_FILE	1
+#define	INDEX_FILE	2
+#define	MAX_FILE	3
 
 struct file_name {
 	char *path;