Fix some coding style issues and a typo in a comment.

3 files changed, 22 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 1f12733a..542ee78d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-03-24         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* io.c (path_info): Fix white space.
+	(pi_awkpath, pi_awklibpath): Avoid structure initializers.
+	(do_find_source): Eliminate pointless parentheses.
+	(find_source): Leave a space after "&".
+	* main.c (load_environ): Fix typo in comment.
+
 2012-03-21         Andrew J. Schorr     <aschorr@telemetry-investments.com>
 
 	* awkgram.y (LEX_LOAD): New token to support @load.
diff --git a/io.c b/io.c
index 5a110e02..79bc8682 100644
--- a/io.c
+++ b/io.c
@@ -2312,23 +2312,23 @@ do_getline(int intovar, IOBUF *iop)
 }
 
 typedef struct {
-   const char *envname;
-   char **dfltp;
-   char try_cwd;		/* always search current directory? */
-   char **awkpath;		/* array containing library search paths */ 
-   int max_pathlen;		/* length of the longest item in awkpath */ 
+	const char *envname;
+	char **dfltp;		/* pointer to address of default path */
+	char try_cwd;		/* always search current directory? */
+	char **awkpath;		/* array containing library search paths */ 
+	int max_pathlen;	/* length of the longest item in awkpath */ 
 } path_info;
 
 static path_info pi_awkpath = {
-   .envname = "AWKPATH",
-   .dfltp = &defpath,
-   .try_cwd = TRUE,
+	/* envname */	"AWKPATH",
+	/* dfltp */	& defpath,
+	/* try_cwd */	TRUE,
 };
 
 static path_info pi_awklibpath = {
-   .envname = "AWKLIBPATH",
-   .dfltp = &deflibpath,
-   .try_cwd = FALSE,
+	/* envname */	"AWKLIBPATH",
+	/* dfltp */	& deflibpath,
+	/* try_cwd */	FALSE,
 };
 
 /* init_awkpath --- split path(=$AWKPATH) into components */
@@ -2432,7 +2432,7 @@ do_find_source(const char *src, struct stat *stb, int *errcode, path_info *pi)
 	}
 
 	/* try current directory before $AWKPATH search */
-	if (pi->try_cwd && (stat(src, stb) == 0)) {
+	if (pi->try_cwd && stat(src, stb) == 0) {
 		path = get_cwd();
 		if (path == NULL) {
 			*errcode = errno;
@@ -2470,7 +2470,7 @@ char *
 find_source(const char *src, struct stat *stb, int *errcode, int is_extlib)
 {
 	char *path;
-	path_info *pi = (is_extlib ? &pi_awklibpath : &pi_awkpath);
+	path_info *pi = (is_extlib ? & pi_awklibpath : & pi_awkpath);
 
 	*errcode = 0;
 	if (src == NULL || *src == '\0')
diff --git a/main.c b/main.c
index 693db0f4..dafa15cf 100644
--- a/main.c
+++ b/main.c
@@ -1029,7 +1029,7 @@ load_environ()
 			*--val = '=';
 	}
 	/*
-	 * Put AWKPATH and AWKLIBPATh into ENVIRON if not already there.
+	 * Put AWKPATH and AWKLIBPATH into ENVIRON if not already there.
 	 * This allows querying it from within awk programs.
 	 */
 	path_environ("AWKPATH", defpath);