From f8d9ff23eb8d3e3286ff5cf4d5f9493532991bb7 Mon Sep 17 00:00:00 2001
From: zlg <zlg@zlg.space>
Date: Thu, 16 Jun 2016 10:15:33 -0700
Subject: The massive astyle sweep!

Code style should be consistent now. All future commits will be run through
astyle or they will be amended.
---
 ch6/6-01_getword-enhanced.c      | 2 +-
 ch6/6-02_common-prefix-printer.c | 8 ++++----
 ch6/6-03_line_location.c         | 4 ++--
 ch6/6-04_top-words.c             | 4 ++--
 ch6/6-05_undef.c                 | 2 +-
 ch6/6-06_define-processor.c      | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'ch6')

diff --git a/ch6/6-01_getword-enhanced.c b/ch6/6-01_getword-enhanced.c
index c040d1e..7e2777e 100644
--- a/ch6/6-01_getword-enhanced.c
+++ b/ch6/6-01_getword-enhanced.c
@@ -159,7 +159,7 @@ int getword(char *word, int lim) {
 		*w = '\0';
 		return c;
 	}
-	for ( ; --lim > 0; w++) {
+	for (; --lim > 0; w++) {
 		if (!isalnum(*w = getch()) && *w != '_') {
 			ungetch(*w);
 			break;
diff --git a/ch6/6-02_common-prefix-printer.c b/ch6/6-02_common-prefix-printer.c
index fedb389..f5314d7 100644
--- a/ch6/6-02_common-prefix-printer.c
+++ b/ch6/6-02_common-prefix-printer.c
@@ -53,7 +53,7 @@ struct tnode *addtree(struct tnode *, char *);
 void treeprint(struct tnode *, int);
 struct tnode *talloc(void);
 char *mystrdup(char *);
-int check_prefix(char *, char*, int);
+int check_prefix(char *, char *, int);
 
 int main(int argc, char *argv[]) {
 	switch (argc) {
@@ -130,7 +130,7 @@ int getword(char *word, int lim) {
 		*w = '\0';
 		return c;
 	}
-	for ( ; --lim > 0; w++) {
+	for (; --lim > 0; w++) {
 		if (!isalnum(*w = getch()) && *w != '_') {
 			ungetch(*w);
 			break;
@@ -146,7 +146,7 @@ struct key *binsearch(char *word, struct key *tab, int n) {
 	struct key *high = &tab[n];
 	struct key *mid;
 	while (low < high) {
-		mid = low + (high-low) / 2;
+		mid = low + (high - low) / 2;
 		if ((cond = strcmp(word, mid->word)) < 0) {
 			high = mid;
 		} else if (cond > 0) {
@@ -231,7 +231,7 @@ struct tnode *talloc(void) {
 
 char *mystrdup(char *s) {
 	char *p;
-	p = (char *) malloc(strlen(s)+1);
+	p = (char *) malloc(strlen(s) + 1);
 	if (p != NULL) {
 		strcpy(p , s);
 	}
diff --git a/ch6/6-03_line_location.c b/ch6/6-03_line_location.c
index 9a22c81..52c1782 100644
--- a/ch6/6-03_line_location.c
+++ b/ch6/6-03_line_location.c
@@ -93,7 +93,7 @@ int getword(char *word, int lim) {
 	if (c != EOF) {
 		*w++ = c;
 	}
-	for ( ; --lim > 0; w++) {
+	for (; --lim > 0; w++) {
 		if (!isalpha(*w = getch())) {
 			ungetch(*w);
 			break;
@@ -182,7 +182,7 @@ struct tlist *lalloc(void) {
 
 char *mystrdup(char *s) {
 	char *p;
-	p = (char *) malloc(strlen(s)+1);
+	p = (char *) malloc(strlen(s) + 1);
 	if (p != NULL) {
 		strcpy(p , s);
 	}
diff --git a/ch6/6-04_top-words.c b/ch6/6-04_top-words.c
index 796dac1..784a950 100644
--- a/ch6/6-04_top-words.c
+++ b/ch6/6-04_top-words.c
@@ -114,7 +114,7 @@ int getword(char *word, int lim) {
 	if (c != EOF) {
 		*w++ = c;
 	}
-	for ( ; --lim > 0; w++) {
+	for (; --lim > 0; w++) {
 		if (!isalpha(*w = getch())) {
 			ungetch(*w);
 			break;
@@ -169,7 +169,7 @@ struct tnode *talloc(void) {
 
 char *mystrdup(char *s) {
 	char *p;
-	p = (char *) malloc(strlen(s)+1);
+	p = (char *) malloc(strlen(s) + 1);
 	if (p != NULL) {
 		strcpy(p , s);
 	}
diff --git a/ch6/6-05_undef.c b/ch6/6-05_undef.c
index d65f435..40ac87e 100644
--- a/ch6/6-05_undef.c
+++ b/ch6/6-05_undef.c
@@ -79,7 +79,7 @@ struct nlist *install(char *name, char *defn) {
 		np->next = hashtab[hashval];
 		hashtab[hashval] = np;
 	} else {
-		free ((void *) np->defn);
+		free((void *) np->defn);
 	}
 	if ((np->defn = strdup(defn)) == NULL) {
 		return NULL;
diff --git a/ch6/6-06_define-processor.c b/ch6/6-06_define-processor.c
index d26ddbc..e24f173 100644
--- a/ch6/6-06_define-processor.c
+++ b/ch6/6-06_define-processor.c
@@ -115,7 +115,7 @@ struct nlist *install(char *name, char *defn) {
 		np->next = hashtab[hashval];
 		hashtab[hashval] = np;
 	} else {
-		free ((void *) np->defn);
+		free((void *) np->defn);
 	}
 	if ((np->defn = strdup(defn)) == NULL) {
 		return NULL;
@@ -188,7 +188,7 @@ int getword(char *word, int lim) {
 		*w = '\0';
 		return c;
 	}
-	for ( ; --lim > 0; w++) {
+	for (; --lim > 0; w++) {
 		if (!isalnum(*w = getch())) {
 			ungetch(*w);
 			break;
-- 
cgit v1.2.3-54-g00ecf