[gawk-diffs] [SCM] gawk branch, xgawk, updated. 85a195f6f9901e98abe9306f1e05e25107e61955

[Andrew J. Schorr]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, xgawk has been updated
       via  85a195f6f9901e98abe9306f1e05e25107e61955 (commit)
      from  c30225e9a828bb8d5245e0c648f08ec8bb165321 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=85a195f6f9901e98abe9306f1e05e25107e61955

commit 85a195f6f9901e98abe9306f1e05e25107e61955
Author: Andrew J. Schorr <address@hidden>
Date:   Sat Mar 24 11:16:23 2012 -0400

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

diff --git a/ChangeLog b/ChangeLog
index 1f12733..542ee78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-03-24         Andrew J. Schorr     <address@hidden>
+
+       * 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     <address@hidden>
 
        * awkgram.y (LEX_LOAD): New token to support @load.
diff --git a/io.c b/io.c
index 5a110e0..79bc868 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 693db0f..dafa15c 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);

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog |    8 ++++++++
 io.c      |   26 +++++++++++++-------------
 main.c    |    2 +-
 3 files changed, 22 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
gawk