gawk-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Arnold Robbins
Subject: [gawk-diffs] [SCM] gawk branch, master, updated. 2a4dd34fb580343358035dea126f188e9fb5c68c
Date: Sat, 26 Jan 2013 17:08:09 +0000

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  2a4dd34fb580343358035dea126f188e9fb5c68c (commit)
       via  da1d22c183f5d8241538524665e572c5c6a15865 (commit)
       via  5cca2a2d008689dfc415415f71bae1b7b7923bd6 (commit)
      from  629dd814b6e24e1d5651a82cb53783e651b5ec74 (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=2a4dd34fb580343358035dea126f188e9fb5c68c

commit 2a4dd34fb580343358035dea126f188e9fb5c68c
Author: Arnold D. Robbins <address@hidden>
Date:   Fri Jan 25 12:14:03 2013 +0200

    More portability - find readline dependencies.

diff --git a/ChangeLog b/ChangeLog
index 2e1592b..c401f66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
        * dfa.c (MALLOC): Undef first, for Irix.
        * Makefile.am (LDADD): Use LIBREADLINE and LIBMPFR instead of
        automake substitutions.
+       * configure.ac (AC_INIT): Version bump.
+       (GAWK_CHECK_READLINE): Renamed from GNUPG_CHECK_READLINE.
 
 2013-01-23         Arnold D. Robbins     <address@hidden>
 
diff --git a/configure b/configure
index 3d63d3c..246641d 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for GNU Awk 4.0.72.
+# Generated by GNU Autoconf 2.69 for GNU Awk 4.0.73.
 #
 # Report bugs to <address@hidden>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='GNU Awk'
 PACKAGE_TARNAME='gawk'
-PACKAGE_VERSION='4.0.72'
-PACKAGE_STRING='GNU Awk 4.0.72'
+PACKAGE_VERSION='4.0.73'
+PACKAGE_STRING='GNU Awk 4.0.73'
 PACKAGE_BUGREPORT='address@hidden'
 PACKAGE_URL='http://www.gnu.org/software/gawk/'
 
@@ -1316,7 +1316,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GNU Awk 4.0.72 to adapt to many kinds of systems.
+\`configure' configures GNU Awk 4.0.73 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1386,7 +1386,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GNU Awk 4.0.72:";;
+     short | recursive ) echo "Configuration of GNU Awk 4.0.73:";;
    esac
   cat <<\_ACEOF
 
@@ -1501,7 +1501,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-GNU Awk configure 4.0.72
+GNU Awk configure 4.0.73
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2210,7 +2210,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GNU Awk $as_me 4.0.72, which was
+It was created by GNU Awk $as_me 4.0.73, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3054,7 +3054,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gawk'
- VERSION='4.0.72'
+ VERSION='4.0.73'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -10354,36 +10354,42 @@ fi
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether readline via 
\"$_combo\" is present and sane" >&5
 $as_echo_n "checking whether readline via \"$_combo\" is present and sane... " 
>&6; }
 
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+       if test "$cross_compiling" = yes; then :
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
-
 #include <stdio.h>
 #include <readline/readline.h>
 #include <readline/history.h>
 
-int
-main ()
+int main(int argc, char **argv)
 {
+       int fd;
+       char *line;
 
-rl_completion_func_t *completer;
-add_history("foobar");
-rl_catch_signals=0;
-rl_inhibit_completion=0;
-rl_attempted_completion_function=NULL;
-rl_completion_matches(NULL,NULL);
+       close(0);
+       close(1);
+       fd = open("/dev/null", 2);      /* should get fd 0 */
+       dup(fd);
+       line = readline("giveittome> ");
 
-  ;
-  return 0;
+       printf("got <%s>\n", line);
+       return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  _found_readline=yes
+if ac_fn_c_try_run "$LINENO"; then :
+              _found_readline=yes
 else
-  _found_readline=no
+              _found_readline=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_found_readline" >&5
 $as_echo "$_found_readline" >&6; }
@@ -11414,7 +11420,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by GNU Awk $as_me 4.0.72, which was
+This file was extended by GNU Awk $as_me 4.0.73, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -11482,7 +11488,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; 
s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-GNU Awk config.status 4.0.72
+GNU Awk config.status 4.0.73
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index d9357c3..4ba5f6a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ dnl
 
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([GNU Awk], 4.0.72, address@hidden, gawk)
+AC_INIT([GNU Awk], 4.0.73, address@hidden, gawk)
 
 # This is a hack. Different versions of install on different systems
 # are just too different. Chuck it and use install-sh.
@@ -347,7 +347,7 @@ dnl check for sockets
 GAWK_AC_LIB_SOCKETS
 
 dnl check for readline support
-GNUPG_CHECK_READLINE
+GAWK_CHECK_READLINE
 
 dnl check for mpfr support
 GNUPG_CHECK_MPFR
diff --git a/m4/ChangeLog b/m4/ChangeLog
index 365ccde..e90d4d0 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,10 @@
+2013-01-25         Arnold D. Robbins     <address@hidden>
+
+       * readline.m4 (GAWK_CHECK_READLINE): Renamed from GNUPG_CHECK_READLINE.
+       Test program changed and test changed to try to run the built program
+       since some systems don't notice a link dependency between libreadline
+       and other libs until runtime. Isn't that fun?
+
 2012-12-24         Arnold D. Robbins     <address@hidden>
 
        * 4.0.2: Release tar ball made.
diff --git a/m4/readline.m4 b/m4/readline.m4
index 73bbf2a..648ea38 100644
--- a/m4/readline.m4
+++ b/m4/readline.m4
@@ -1,5 +1,5 @@
 dnl Check for readline and dependencies
-dnl Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+dnl Copyright (C) 2004, 2005, 2013 Free Software Foundation, Inc.
 dnl
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -9,8 +9,14 @@ dnl the same distribution terms as the rest of that program.
 dnl
 dnl Defines HAVE_LIBREADLINE to 1 if a working readline setup is
 dnl found, and sets @LIBREADLINE@ to the necessary libraries.
+dnl
+dnl Based upon GNUPG_CHECK_READLINE.  Many more years into the
+dnl twenty-first century, it is not enough to link a test program
+dnl with the readline library. On several systems, if readline is
+dnl not linked with the curses / termcap / whatever libraries, the
+dnl problem is only discovered at run time.  Isn't that special?
 
-AC_DEFUN([GNUPG_CHECK_READLINE],
+AC_DEFUN([GAWK_CHECK_READLINE],
 [
   AC_ARG_WITH([readline],
      AC_HELP_STRING([--with-readline=DIR],
@@ -30,19 +36,31 @@ AC_DEFUN([GNUPG_CHECK_READLINE],
 
         AC_MSG_CHECKING([whether readline via \"$_combo\" is present and sane])
 
-        AC_LINK_IFELSE([
-       AC_LANG_PROGRAM([
-#include <stdio.h>
+       AC_TRY_RUN(
+dnl source program:
+AC_LANG_SOURCE([[#include <stdio.h>
 #include <readline/readline.h>
 #include <readline/history.h>
-],[
-rl_completion_func_t *completer;
-add_history("foobar");
-rl_catch_signals=0;
-rl_inhibit_completion=0;
-rl_attempted_completion_function=NULL;
-rl_completion_matches(NULL,NULL);
-])],_found_readline=yes,_found_readline=no)
+
+int main(int argc, char **argv)
+{
+       int fd;
+       char *line;
+
+       close(0);
+       close(1);
+       fd = open("/dev/null", 2);      /* should get fd 0 */
+       dup(fd);
+       line = readline("giveittome> ");
+
+       printf("got <%s>\n", line);
+       return 0;
+}]]),
+dnl action if true:
+            [_found_readline=yes],
+dnl action if false:
+            [_found_readline=no],
+       )
 
         AC_MSG_RESULT([$_found_readline])
 
diff --git a/pc/ChangeLog b/pc/ChangeLog
index a24c5db..1dc181d 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,7 @@
+2013-01-25         Arnold D. Robbins     <address@hidden>
+
+       * config.h: Version bumped.
+
 2012-12-28  Eli Zaretskii  <address@hidden>
 
        * Makefile (install1): Don't require a Unixy shell and Sed.  Don't
diff --git a/pc/config.h b/pc/config.h
index fbdbf6f..8adbef0 100644
--- a/pc/config.h
+++ b/pc/config.h
@@ -419,7 +419,7 @@
 #define PACKAGE_NAME "GNU Awk"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "GNU Awk 4.0.72"
+#define PACKAGE_STRING "GNU Awk 4.0.73"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "gawk"
@@ -428,7 +428,7 @@
 #define PACKAGE_URL "http://www.gnu.org/software/gawk/";
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "4.0.72"
+#define PACKAGE_VERSION "4.0.73"
 
 /* Define to 1 if *printf supports %F format */
 #undef PRINTF_HAS_F_FORMAT
@@ -490,7 +490,7 @@
 
 
 /* Version number of package */
-#define VERSION "4.0.72"
+#define VERSION "4.0.73"
 
 /* Enable large inode numbers on Mac OS X 10.5.  */
 #ifndef _DARWIN_USE_64_BIT_INODE
diff --git a/version.c b/version.c
index f4685cc..1e2d093 100644
--- a/version.c
+++ b/version.c
@@ -1,3 +1,3 @@
 #include "config.h"
 
-const char *version_string = "GNU Awk 4.0.72";
+const char *version_string = "GNU Awk 4.0.73";

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

commit da1d22c183f5d8241538524665e572c5c6a15865
Author: Arnold D. Robbins <address@hidden>
Date:   Fri Jan 25 10:50:12 2013 +0200

    Considerable additional portability fixes.

diff --git a/ChangeLog b/ChangeLog
index 22e45ff..2e1592b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-01-25         Arnold D. Robbins     <address@hidden>
+
+       * awkgram.y (parms_shadow): Change int param to bool.
+       * cmd.h (output_is_tty): Sync type with rest of code (is bool).
+       * dfa.c (MALLOC): Undef first, for Irix.
+       * Makefile.am (LDADD): Use LIBREADLINE and LIBMPFR instead of
+       automake substitutions.
+
 2013-01-23         Arnold D. Robbins     <address@hidden>
 
        * awk.h (list_functions): Change parameter to bool.
diff --git a/Makefile.am b/Makefile.am
index 085eadf..8d387e9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -130,7 +130,7 @@ base_sources = \
 gawk_SOURCES = $(base_sources)
 
 # Get extra libs as needed, Automake will supply LIBINTL and SOCKET_LIBS.
-LDADD = $(LIBSIGSEGV) $(LIBINTL) $(SOCKET_LIBS) @LIBREADLINE@ @LIBMPFR@
+LDADD = $(LIBSIGSEGV) $(LIBINTL) $(SOCKET_LIBS) $(LIBREADLINE) $(LIBMPFR)
 
 # Directory for gawk's data files. Automake supplies datadir.
 pkgdatadir = $(datadir)/awk
diff --git a/Makefile.in b/Makefile.in
index 2c7e948..40d0be9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -117,6 +117,7 @@ gawk_OBJECTS = $(am_gawk_OBJECTS)
 gawk_LDADD = $(LDADD)
 am__DEPENDENCIES_1 =
 gawk_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+       $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
        $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = address@hidden@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -458,7 +459,7 @@ base_sources = \
 gawk_SOURCES = $(base_sources)
 
 # Get extra libs as needed, Automake will supply LIBINTL and SOCKET_LIBS.
-LDADD = $(LIBSIGSEGV) $(LIBINTL) $(SOCKET_LIBS) @LIBREADLINE@ @LIBMPFR@
+LDADD = $(LIBSIGSEGV) $(LIBINTL) $(SOCKET_LIBS) $(LIBREADLINE) $(LIBMPFR)
 
 # stuff for compiling gawk/pgawk
 DEFPATH = '".$(PATH_SEPARATOR)$(pkgdatadir)"'
diff --git a/awkgram.c b/awkgram.c
index 07a6dce..d15e5ac 100644
--- a/awkgram.c
+++ b/awkgram.c
@@ -87,7 +87,7 @@ static char **check_params(char *fname, int pcount, 
INSTRUCTION *list);
 static int install_function(char *fname, INSTRUCTION *fi, INSTRUCTION *plist);
 static NODE *mk_rexp(INSTRUCTION *exp);
 static void param_sanity(INSTRUCTION *arglist);
-static int parms_shadow(INSTRUCTION *pc, int *shadow);
+static int parms_shadow(INSTRUCTION *pc, bool *shadow);
 #ifndef NO_LINT
 static int isnoeffect(OPCODE type);
 #endif
@@ -6530,7 +6530,7 @@ snode(INSTRUCTION *subn, INSTRUCTION *r)
 /* parms_shadow --- check if parameters shadow globals */
 
 static int
-parms_shadow(INSTRUCTION *pc, int *shadow)
+parms_shadow(INSTRUCTION *pc, bool *shadow)
 {
        int pcount, i;
        bool ret = false;
diff --git a/awkgram.y b/awkgram.y
index a6dff9e..71e70de 100644
--- a/awkgram.y
+++ b/awkgram.y
@@ -46,7 +46,7 @@ static char **check_params(char *fname, int pcount, 
INSTRUCTION *list);
 static int install_function(char *fname, INSTRUCTION *fi, INSTRUCTION *plist);
 static NODE *mk_rexp(INSTRUCTION *exp);
 static void param_sanity(INSTRUCTION *arglist);
-static int parms_shadow(INSTRUCTION *pc, int *shadow);
+static int parms_shadow(INSTRUCTION *pc, bool *shadow);
 #ifndef NO_LINT
 static int isnoeffect(OPCODE type);
 #endif
@@ -3994,7 +3994,7 @@ snode(INSTRUCTION *subn, INSTRUCTION *r)
 /* parms_shadow --- check if parameters shadow globals */
 
 static int
-parms_shadow(INSTRUCTION *pc, int *shadow)
+parms_shadow(INSTRUCTION *pc, bool *shadow)
 {
        int pcount, i;
        bool ret = false;
diff --git a/cmd.h b/cmd.h
index 382f1bd..b321863 100644
--- a/cmd.h
+++ b/cmd.h
@@ -38,7 +38,7 @@ extern int gprintf(FILE *fp, const char *format, ...);
 extern jmp_buf pager_quit_tag;
 extern bool pager_quit_tag_valid;
 
-extern int output_is_tty;
+extern bool output_is_tty;
 extern int input_fd;
 extern bool input_from_tty;
 extern FILE *out_fp;
diff --git a/dfa.c b/dfa.c
index a7f6938..8782e46 100644
--- a/dfa.c
+++ b/dfa.c
@@ -480,6 +480,7 @@ static void regexp (void);
     (sizeof (t) == 1 ? xzalloc (n) : xcalloc (n, sizeof (t)))
 
 #define CALLOC(p, n) do { (p) = XCALLOC (n, *(p)); } while (0)
+#undef MALLOC  /* Irix defines this */
 #define MALLOC(p, n) do { (p) = XNMALLOC (n, *(p)); } while (0)
 #define REALLOC(p, n) do {(p) = xnrealloc (p, n, sizeof (*(p))); } while (0)
 
diff --git a/extension/ChangeLog b/extension/ChangeLog
index e2490e9..4752e95 100644
--- a/extension/ChangeLog
+++ b/extension/ChangeLog
@@ -1,3 +1,7 @@
+2013-01-25         Arnold D. Robbins     <address@hidden>
+
+       * gawkfts.c: Make include of <limits.h> be unconditional.
+
 2013-01-22         Arnold D. Robbins     <address@hidden>
 
        Improve portability. We hope.
diff --git a/extension/gawkfts.c b/extension/gawkfts.c
index 2a03b4f..e70a154 100644
--- a/extension/gawkfts.c
+++ b/extension/gawkfts.c
@@ -41,12 +41,12 @@ static char sccsid[] = "@(#)fts.c   8.6 (Berkeley) 8/14/94";
 
 #define _BSD_SOURCE
 
+#include <limits.h>
 /* #include "namespace.h" */
 #ifndef ZOS_USS
 #include <sys/param.h>
 #else
 #include <stdio.h>
-#include <limits.h>
 #endif /* ZOS_USS */
 #include <sys/stat.h>
 

http://git.sv.gnu.org/cgit/gawk.git/commit/?id=5cca2a2d008689dfc415415f71bae1b7b7923bd6

commit 5cca2a2d008689dfc415415f71bae1b7b7923bd6
Author: Arnold D. Robbins <address@hidden>
Date:   Fri Jan 25 10:45:14 2013 +0200

    Improve code in symbol.c.

diff --git a/ChangeLog b/ChangeLog
index 63f0965..22e45ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-01-23         Arnold D. Robbins     <address@hidden>
+
+       * awk.h (list_functions): Change parameter to bool.
+       * symbol.c (list_functions): Ditto.
+       (get_symbols): Change sort parameter to bool. Additional
+       code cleanup.
+
 2013-01-22         Arnold D. Robbins     <address@hidden>
 
        * symbol.c (get_symbols): Reset count after each loop to only
diff --git a/awk.h b/awk.h
index e90cecf..f26ec20 100644
--- a/awk.h
+++ b/awk.h
@@ -1647,7 +1647,7 @@ extern void pop_context();
 extern int in_main_context();
 extern void free_context(AWK_CONTEXT *ctxt, bool keep_globals);
 extern NODE **variable_list();
-extern NODE **function_list(int sort);
+extern NODE **function_list(bool sort);
 extern void print_vars(NODE **table, Func_print print_func, FILE *fp);
 
 /* floatcomp.c */
diff --git a/symbol.c b/symbol.c
index c775c93..354bfca 100644
--- a/symbol.c
+++ b/symbol.c
@@ -366,13 +366,13 @@ typedef enum { FUNCTION = 1, VARIABLE } SYMBOL_TYPE;
 /* get_symbols --- return a list of optionally sorted symbols */
  
 static NODE **
-get_symbols(SYMBOL_TYPE what, int sort)
+get_symbols(SYMBOL_TYPE what, bool sort)
 {
        int i;
        NODE **table;
        NODE **list;
        NODE *r;
-       long j, count = 0;
+       long count = 0;
        long max;
        NODE *the_table;
 
@@ -384,38 +384,34 @@ get_symbols(SYMBOL_TYPE what, int sort)
         */
 
        if (what == FUNCTION) {
-               count = func_count;
                the_table = func_table;
-
                max = the_table->table_size * 2;
+
                list = assoc_list(the_table, "@unsorted", ASORTI);
-               emalloc(table, NODE **, (count + 1) * sizeof(NODE *), 
"get_symbols");
+               emalloc(table, NODE **, (func_count + 1) * sizeof(NODE *), 
"get_symbols");
 
-               for (i = j = 0; i < max; i += 2) {
+               for (i = count = 0; i < max; i += 2) {
                        r = list[i+1];
                        if (r->type == Node_ext_func)
                                continue;
                        assert(r->type == Node_func);
-                       table[j++] = r;
+                       table[count++] = r;
                }
-               count = j;
        } else {        /* what == VARIABLE */
-               the_table = symbol_table;
-               count = var_count;
-
                update_global_values();
 
+               the_table = symbol_table;
                max = the_table->table_size * 2;
+
                list = assoc_list(the_table, "@unsorted", ASORTI);
-               emalloc(table, NODE **, (count + 1) * sizeof(NODE *), 
"get_symbols");
+               emalloc(table, NODE **, (var_count + 1) * sizeof(NODE *), 
"get_symbols");
 
-               for (i = j = 0; i < max; i += 2) {
+               for (i = count = 0; i < max; i += 2) {
                        r = list[i+1];
                        if (r->type == Node_val)        /* non-variable in 
SYMTAB */
                                continue;
-                       table[j++] = r;
+                       table[count++] = r;
                }
-               count = j;
        }
 
        efree(list);
@@ -438,7 +434,7 @@ variable_list()
 /* function_list --- list of functions */
 
 NODE **
-function_list(int sort)
+function_list(bool sort)
 {
        return get_symbols(FUNCTION, sort);
 }

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

Summary of changes:
 ChangeLog           |   17 ++++++++++++++
 Makefile.am         |    2 +-
 Makefile.in         |    3 +-
 awk.h               |    2 +-
 awkgram.c           |    4 +-
 awkgram.y           |    4 +-
 cmd.h               |    2 +-
 configure           |   62 ++++++++++++++++++++++++++++-----------------------
 configure.ac        |    4 +-
 dfa.c               |    1 +
 extension/ChangeLog |    4 +++
 extension/gawkfts.c |    2 +-
 m4/ChangeLog        |    7 +++++
 m4/readline.m4      |   44 +++++++++++++++++++++++++----------
 pc/ChangeLog        |    4 +++
 pc/config.h         |    6 ++--
 symbol.c            |   28 ++++++++++-------------
 version.c           |    2 +-
 18 files changed, 126 insertions(+), 72 deletions(-)


hooks/post-receive
-- 
gawk



reply via email to

[Prev in Thread] Current Thread [Next in Thread]