[gawk-diffs] [SCM] gawk branch, master, updated. 2c8f64a8d56bcede9e1dd08859b3b235fc9bd40f

[Arnold Robbins]

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, master has been updated
       via  2c8f64a8d56bcede9e1dd08859b3b235fc9bd40f (commit)
       via  23d37c1740baeaebefd8310c53b232904c1e1f77 (commit)
      from  73d24cae0db6cc817db209e5e1ea93b0733d1cca (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=2c8f64a8d56bcede9e1dd08859b3b235fc9bd40f

commit 2c8f64a8d56bcede9e1dd08859b3b235fc9bd40f
Author: Arnold D. Robbins <address@hidden>
Date:   Wed Dec 28 18:12:52 2011 +0200

    Documentation updates.

diff --git a/FUTURES b/FUTURES
index 6b57056..03fe71d 100644
--- a/FUTURES
+++ b/FUTURES
@@ -11,14 +11,14 @@ don't bug us too much about schedules or what all this 
really means.
 
 For 4.1
 =======
-       Merge gawk/pgawk/dgawk into one executable
+       DONE: Merge gawk/pgawk/dgawk into one executable
 
        Consider removing use of and/or need for the protos.h file.
 
        Consider moving var_value info into Node_var itself
        to reduce memory usage.
 
-       Merge xmlgawk -l feature
+       DONE: Merge xmlgawk -l feature
 
        Merge xmlgawk XML extensions
 
diff --git a/NEWS b/NEWS
index 1485501..803c1d5 100644
--- a/NEWS
+++ b/NEWS
@@ -9,9 +9,10 @@ Changes from 4.0.1 to 4.1
 1. The three executables gawk, pgawk, and dgawk, have been merged into
    one, named just gawk.  As a result:
        * The -R option is gone
-       * Use -D ...
-       * Use -o ...
-       * Use -p ...
+       * Use -D to run the debugger. An optional file argument is a
+         list of commands to run first.
+       * Use -o to do pretty-printing only.
+       * Use -p to do profiling.
 
 2. The new -l option is used for loading dynamic extensions.
  
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 7dda7e1..eb9bbf4 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2011-12-28         Arnold D. Robbins     <address@hidden>
+
+       * awkcard.in, gawk.1: Minor edits after merge of executables.
+
 2011-12-21         John Haque     <address@hidden>
 
        * gawk.texi: Updated sections on profiling and debugging
diff --git a/doc/awkcard.in b/doc/awkcard.in
index 862c307..c8d4183 100644
--- a/doc/awkcard.in
+++ b/doc/awkcard.in
@@ -75,7 +75,7 @@ Pattern Elements
     8
 Printf Formats
        14
 Records
       10
 Regular Expressions
   11
-Signals (\*(PK)
       4
+Signals (\*(GK \*(FC\-\^\-profile\*(FR)
       4
 Special Filenames
     12
 String Functions
      16
 Time Functions (\*(GK)
        17
@@ -302,12 +302,7 @@ Disable common and GNU extensions.
 Enable \*(FIinterval expressions\*(FR in regular
 expression matching (see \fHRegular
 Expressions\fP below). Useful if
-\*(FC\-\^\-traditional\*(FR is specified.
-.TI "\*(FC\-S\*(FR, \*(FC\-\^\-sandbox\*(FR
-Disable the \*(FCsystem()\*(FR function,
-input redirection with \*(FCgetline\*(FR,
-output redirection with \*(FCprint\*(FR and \*(FCprintf\*(FR,
-and dynamic extensions loading.\*(CB
+\*(FC\-\^\-traditional\*(FR is specified.\*(CB
 .in -4n
 .EB "\s+2\f(HBCOMMAND LINE ARGUMENTS (\*(GK\f(HB)\*(FR\s0"
 
@@ -319,6 +314,11 @@ and dynamic extensions loading.\*(CB
 .ES
 .fi
 .in +4n
+.TI "\*(FC\-S\*(FR, \*(FC\-\^\-sandbox\*(FR
+Disable the \*(FCsystem()\*(FR function,
+input redirection with \*(FCgetline\*(FR,
+output redirection with \*(FCprint\*(FR and \*(FCprintf\*(FR,
+and dynamic extensions loading.
 .TI "\*(FC-t\*(FR, \*(FC\-\^\-lint\-old\*(FR
 Warn about constructs that are not
 portable to the original version of
@@ -390,7 +390,7 @@ and so on.\*(CB
 \*(FCSIGUSR1\fP dumps a profile and function call stack to the
 profile file.  It then continues to run.
 \*(FCSIGHUP\fP is similar, but exits.\*(CB
-.EB "\s+2\f(HBSIGNALS (\*(PK\f(HB)\*(FR\s0"
+.EB "\s+2\f(HBSIGNALS (\*(GK \f(HB\-\^\-profile)\*(FR\s0"
 
 .\" --- Lines And Statements
 .ES
diff --git a/doc/gawk.1 b/doc/gawk.1
index c171acb..662ace3 100644
--- a/doc/gawk.1
+++ b/doc/gawk.1
@@ -97,8 +97,8 @@ while long options start with \*(lq\-\^\-\*(rq.
 Long options are provided for both \*(GN-specific features and
 for \*(PX-mandated features.
 .PP
-.IR Gawk -
-specific options are typically used in long-option form.
+.IR Gawk -specific
+options are typically used in long-option form.
 Arguments to long options are either joined with the option
 by an
 .B =

http://git.sv.gnu.org/cgit/gawk.git/commit/?id=23d37c1740baeaebefd8310c53b232904c1e1f77

commit 23d37c1740baeaebefd8310c53b232904c1e1f77
Author: Arnold D. Robbins <address@hidden>
Date:   Wed Dec 28 18:12:21 2011 +0200

    Fix compiler warnings on printf calls.

diff --git a/ChangeLog b/ChangeLog
index 9999d8b..f904f7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-28         Arnold D. Robbins     <address@hidden>
+
+       * int_array.c, str_array.c: Fix some compiler warnings 32/64
+       bit system differences.
+
 2011-12-26         John Haque      <address@hidden>
 
        Merge gawk, pgawk and dgawk into a single executable gawk.
diff --git a/int_array.c b/int_array.c
index 200431f..6adb763 100644
--- a/int_array.c
+++ b/int_array.c
@@ -584,7 +584,7 @@ int_dump(NODE *symbol, NODE *ndump)
                fprintf(output_fp, "flags: %s\n", flags2str(symbol->flags));
        }
        indent(indent_level);
-       fprintf(output_fp, "INT_CHAIN_MAX: %lu\n", INT_CHAIN_MAX);
+       fprintf(output_fp, "INT_CHAIN_MAX: %lu\n", (unsigned long) 
INT_CHAIN_MAX);
        indent(indent_level);
        fprintf(output_fp, "array_size: %lu (int)\n", (unsigned long) 
symbol->array_size);
        indent(indent_level);
diff --git a/str_array.c b/str_array.c
index be431e5..0b17796 100644
--- a/str_array.c
+++ b/str_array.c
@@ -446,7 +446,7 @@ str_dump(NODE *symbol, NODE *ndump)
                fprintf(output_fp, "flags: %s\n", flags2str(symbol->flags));
        }
        indent(indent_level);
-       fprintf(output_fp, "STR_CHAIN_MAX: %lu\n", STR_CHAIN_MAX);
+       fprintf(output_fp, "STR_CHAIN_MAX: %lu\n", (unsigned long) 
STR_CHAIN_MAX);
        indent(indent_level);
        fprintf(output_fp, "array_size: %lu\n", (unsigned long) 
symbol->array_size);
        indent(indent_level);

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

Summary of changes:
 ChangeLog      |    5 +++++
 FUTURES        |    4 ++--
 NEWS           |    7 ++++---
 doc/ChangeLog  |    4 ++++
 doc/awkcard.in |   16 ++++++++--------
 doc/gawk.1     |    4 ++--
 int_array.c    |    2 +-
 str_array.c    |    2 +-
 8 files changed, 27 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
gawk