gawk-diffs
[Top][All Lists]
Advanced

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

[gawk-diffs] [SCM] gawk branch, gawk-4.1-stable, updated. gawk-4.1.0-661


From: Arnold Robbins
Subject: [gawk-diffs] [SCM] gawk branch, gawk-4.1-stable, updated. gawk-4.1.0-661-gf667d7d
Date: Thu, 16 Apr 2015 14:26:48 +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, gawk-4.1-stable has been updated
       via  f667d7da571b76a1a6776ccca1530c2d8dff3af1 (commit)
       via  d848f63eee0800fd1e10b046dffe4c0387bec776 (commit)
       via  f13dbca68d16b6598066a8d4bf401fd3e1f58bff (commit)
      from  5d781d9d27f2ab30679853317df3f5e9ad94be80 (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=f667d7da571b76a1a6776ccca1530c2d8dff3af1

commit f667d7da571b76a1a6776ccca1530c2d8dff3af1
Author: Arnold D. Robbins <address@hidden>
Date:   Thu Apr 16 17:26:30 2015 +0300

    Update pc/Makefile.tst.

diff --git a/pc/ChangeLog b/pc/ChangeLog
index 812c743..3e65499 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-16         Arnold D. Robbins     <address@hidden>
+
+       * Makefile.tst: Sync with mainline.
+       * config.h: Sync with mainline.
+
 2015-04-08  Eli Zaretskii  <address@hidden>
 
        * Makefile.ext (fnmatch.$(SOEXT), readdir.$(SOEXT), rwarray.$(SOEXT))
diff --git a/pc/Makefile.tst b/pc/Makefile.tst
index 77b9ecf..bb8d437 100644
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@ -190,7 +190,7 @@ GAWK_EXT_TESTS = \
        include include2 indirectbuiltin indirectcall indirectcall2 \
        lint lintold lintwarn \
        manyfiles match1 match2 match3 mbstr1 \
-       nastyparm next nondec nondec2 \
+       nastyparm negtime next nondec nondec2 \
        patsplit posix printfbad1 printfbad2 printfbad3 printfbad4 printhuge 
procinfs \
        profile0 profile1 profile2 profile3 profile4 profile5 profile6 profile7 
pty1 \
        rebuf regnul1 regnul2 regx8bit reginttrad reint reint2 rsgetline 
rsglstdin rsstart1 \
@@ -247,7 +247,7 @@ check:      msg \
        unix-msg-start   unix-tests      unix-msg-end \
        extend-msg-start gawk-extensions extend-msg-end \
        machine-msg-start machine-tests machine-msg-end \
-       charset-msg-start charset-tests charset-msg-end \
+       charset-tests-all \
        shlib-msg-start  shlib-tests     shlib-msg-end \
        mpfr-msg-start   mpfr-tests      mpfr-msg-end
        @$(MAKE) pass-fail || { $(MAKE) diffout; exit 1; }
@@ -258,6 +258,16 @@ unix-tests: $(UNIX_TESTS)
 
 gawk-extensions: $(GAWK_EXT_TESTS)
 
+charset-tests-all:
+       @if locale -a | grep -i 'en_US.UTF.*8' > /dev/null && \
+           locale -a | grep -i 'ru_RU.UTF.*8' > /dev/null && \
+           locale -a | grep -i 'ja_JP.UTF.*8' > /dev/null  ; \
+       then \
+               $(MAKE) charset-msg-start charset-tests charset-msg-end; \
+       else \
+               echo %%%%%%%%%% Inadequate locale support: skipping charset 
tests. ; \
+       fi
+
 charset-tests: $(LOCALE_CHARSET_TESTS)
 
 extra: $(EXTRA_TESTS) inet
@@ -320,12 +330,12 @@ machine-msg-end:
 
 charset-msg-start:
        @echo "======== Starting tests that can vary based on character set or 
locale support ========"
-       @echo "************************************************"
-       @echo "** Some or all of these tests may fail if you **"
-       @echo "** have inadequate or missing locale support  **"
-       @echo "** At least en_US.UTF-8, ru_RU.UTF-8 and      **"
-       @echo "** ja_JP.UTF-8 are needed.                    **"
-       @echo "************************************************"
+       @echo 
"**************************************************************************"
+       @echo "* Some or all of these tests may fail if you have inadequate or 
missing  *"
+       @echo "* locale support At least en_US.UTF-8, ru_RU.UTF-8 and 
ja_JP.UTF-8 are   *"
+       @echo "* needed. However, if you see this message, the Makefile thinks 
you have *"
+       @echo "* what you need ...                                              
        *"
+       @echo 
"**************************************************************************"
 
 charset-msg-end:
        @echo "======== Done with tests that can vary based on character set or 
locale support ========"
@@ -1216,6 +1226,11 @@ paramasfunc2::
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden --posix >_$@ 2>&1 || echo 
EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+negtime::
+       @echo $@
+       @TZ=GMT AWKPATH="$(srcdir)" $(AWK) -f address@hidden >_$@ 2>&1 || echo 
EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 Gt-dummy:
 # file Maketests, generated from Makefile.am by the Gentests program
 addcomma:
diff --git a/pc/config.h b/pc/config.h
index 65fb5e1..ee20901 100644
--- a/pc/config.h
+++ b/pc/config.h
@@ -426,7 +426,7 @@
 #define PACKAGE_NAME "GNU Awk"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "GNU Awk 4.1.1c"
+#define PACKAGE_STRING "GNU Awk 4.1.1d"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "gawk"
@@ -435,7 +435,7 @@
 #define PACKAGE_URL "http://www.gnu.org/software/gawk/";
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "4.1.1c"
+#define PACKAGE_VERSION "4.1.1d"
 
 /* Define to 1 if *printf supports %F format */
 #undef PRINTF_HAS_F_FORMAT
@@ -497,7 +497,7 @@
 
 
 /* Version number of package */
-#define VERSION "4.1.1c"
+#define VERSION "4.1.1d"
 
 /* Enable large inode numbers on Mac OS X 10.5.  */
 #ifndef _DARWIN_USE_64_BIT_INODE

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

commit d848f63eee0800fd1e10b046dffe4c0387bec776
Author: Arnold D. Robbins <address@hidden>
Date:   Thu Apr 16 17:26:10 2015 +0300

    Update po/gawk.pot before test tarball.

diff --git a/po/gawk.pot b/po/gawk.pot
index d95d3bf..bb16d2f 100644
--- a/po/gawk.pot
+++ b/po/gawk.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gawk 4.1.1c\n"
+"Project-Id-Version: gawk 4.1.1d\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2015-04-07 17:32+0300\n"
+"POT-Creation-Date: 2015-04-16 17:16+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -37,7 +37,7 @@ msgid "attempt to use scalar `%s' as an array"
 msgstr ""
 
 #: array.c:409 array.c:576 builtin.c:85 builtin.c:1606 builtin.c:1652
-#: builtin.c:1665 builtin.c:2092 builtin.c:2106 eval.c:1149 eval.c:1153
+#: builtin.c:1665 builtin.c:2106 builtin.c:2120 eval.c:1149 eval.c:1153
 #: eval.c:1558
 #, c-format
 msgid "attempt to use array `%s' in a scalar context"
@@ -742,202 +742,206 @@ msgid ""
 "substr: length %g at start index %g exceeds length of first argument (%lu)"
 msgstr ""
 
-#: builtin.c:1890
+#: builtin.c:1892
 msgid "strftime: format value in PROCINFO[\"strftime\"] has numeric type"
 msgstr ""
 
-#: builtin.c:1913
+#: builtin.c:1915
 msgid "strftime: received non-numeric second argument"
 msgstr ""
 
-#: builtin.c:1917
+#: builtin.c:1924
 msgid "strftime: second argument less than 0 or too big for time_t"
 msgstr ""
 
-#: builtin.c:1924
+#: builtin.c:1928
+msgid "strftime: second argument out of range for time_t"
+msgstr ""
+
+#: builtin.c:1935
 msgid "strftime: received non-string first argument"
 msgstr ""
 
-#: builtin.c:1931
+#: builtin.c:1942
 msgid "strftime: received empty format string"
 msgstr ""
 
-#: builtin.c:1997
+#: builtin.c:2011
 msgid "mktime: received non-string argument"
 msgstr ""
 
-#: builtin.c:2014
+#: builtin.c:2028
 msgid "mktime: at least one of the values is out of the default range"
 msgstr ""
 
-#: builtin.c:2049
+#: builtin.c:2063
 msgid "'system' function not allowed in sandbox mode"
 msgstr ""
 
-#: builtin.c:2054
+#: builtin.c:2068
 msgid "system: received non-string argument"
 msgstr ""
 
-#: builtin.c:2174
+#: builtin.c:2188
 #, c-format
 msgid "reference to uninitialized field `$%d'"
 msgstr ""
 
-#: builtin.c:2259
+#: builtin.c:2273
 msgid "tolower: received non-string argument"
 msgstr ""
 
-#: builtin.c:2290
+#: builtin.c:2304
 msgid "toupper: received non-string argument"
 msgstr ""
 
-#: builtin.c:2323 mpfr.c:679
+#: builtin.c:2337 mpfr.c:679
 msgid "atan2: received non-numeric first argument"
 msgstr ""
 
-#: builtin.c:2325 mpfr.c:681
+#: builtin.c:2339 mpfr.c:681
 msgid "atan2: received non-numeric second argument"
 msgstr ""
 
-#: builtin.c:2344
+#: builtin.c:2358
 msgid "sin: received non-numeric argument"
 msgstr ""
 
-#: builtin.c:2360
+#: builtin.c:2374
 msgid "cos: received non-numeric argument"
 msgstr ""
 
-#: builtin.c:2413 mpfr.c:1176
+#: builtin.c:2427 mpfr.c:1176
 msgid "srand: received non-numeric argument"
 msgstr ""
 
-#: builtin.c:2444
+#: builtin.c:2458
 msgid "match: third argument is not an array"
 msgstr ""
 
-#: builtin.c:2705
+#: builtin.c:2719
 #, c-format
 msgid "gensub: third argument `%.*s' treated as 1"
 msgstr ""
 
-#: builtin.c:2720
+#: builtin.c:2734
 #, c-format
 msgid "gensub: third argument %g treated as 1"
 msgstr ""
 
-#: builtin.c:3018
+#: builtin.c:3032
 #, c-format
 msgid "%s: can be called indirectly only with two arguments"
 msgstr ""
 
-#: builtin.c:3108
+#: builtin.c:3122
 #, c-format
 msgid "indirect call to %s requires at least two arguments"
 msgstr ""
 
-#: builtin.c:3160
+#: builtin.c:3174
 msgid "lshift: received non-numeric first argument"
 msgstr ""
 
-#: builtin.c:3162
+#: builtin.c:3176
 msgid "lshift: received non-numeric second argument"
 msgstr ""
 
-#: builtin.c:3168
+#: builtin.c:3182
 #, c-format
 msgid "lshift(%f, %f): negative values will give strange results"
 msgstr ""
 
-#: builtin.c:3170
+#: builtin.c:3184
 #, c-format
 msgid "lshift(%f, %f): fractional values will be truncated"
 msgstr ""
 
-#: builtin.c:3172
+#: builtin.c:3186
 #, c-format
 msgid "lshift(%f, %f): too large shift value will give strange results"
 msgstr ""
 
-#: builtin.c:3197
+#: builtin.c:3211
 msgid "rshift: received non-numeric first argument"
 msgstr ""
 
-#: builtin.c:3199
+#: builtin.c:3213
 msgid "rshift: received non-numeric second argument"
 msgstr ""
 
-#: builtin.c:3205
+#: builtin.c:3219
 #, c-format
 msgid "rshift(%f, %f): negative values will give strange results"
 msgstr ""
 
-#: builtin.c:3207
+#: builtin.c:3221
 #, c-format
 msgid "rshift(%f, %f): fractional values will be truncated"
 msgstr ""
 
-#: builtin.c:3209
+#: builtin.c:3223
 #, c-format
 msgid "rshift(%f, %f): too large shift value will give strange results"
 msgstr ""
 
-#: builtin.c:3234 mpfr.c:988
+#: builtin.c:3248 mpfr.c:988
 msgid "and: called with less than two arguments"
 msgstr ""
 
-#: builtin.c:3239
+#: builtin.c:3253
 #, c-format
 msgid "and: argument %d is non-numeric"
 msgstr ""
 
-#: builtin.c:3243
+#: builtin.c:3257
 #, c-format
 msgid "and: argument %d negative value %g will give strange results"
 msgstr ""
 
-#: builtin.c:3266 mpfr.c:1020
+#: builtin.c:3280 mpfr.c:1020
 msgid "or: called with less than two arguments"
 msgstr ""
 
-#: builtin.c:3271
+#: builtin.c:3285
 #, c-format
 msgid "or: argument %d is non-numeric"
 msgstr ""
 
-#: builtin.c:3275
+#: builtin.c:3289
 #, c-format
 msgid "or: argument %d negative value %g will give strange results"
 msgstr ""
 
-#: builtin.c:3297 mpfr.c:1051
+#: builtin.c:3311 mpfr.c:1051
 msgid "xor: called with less than two arguments"
 msgstr ""
 
-#: builtin.c:3303
+#: builtin.c:3317
 #, c-format
 msgid "xor: argument %d is non-numeric"
 msgstr ""
 
-#: builtin.c:3307
+#: builtin.c:3321
 #, c-format
 msgid "xor: argument %d negative value %g will give strange results"
 msgstr ""
 
-#: builtin.c:3332 mpfr.c:807
+#: builtin.c:3346 mpfr.c:807
 msgid "compl: received non-numeric argument"
 msgstr ""
 
-#: builtin.c:3338
+#: builtin.c:3352
 #, c-format
 msgid "compl(%f): negative value will give strange results"
 msgstr ""
 
-#: builtin.c:3340
+#: builtin.c:3354
 #, c-format
 msgid "compl(%f): fractional value will be truncated"
 msgstr ""
 
-#: builtin.c:3509
+#: builtin.c:3523
 #, c-format
 msgid "dcgettext: `%s' is not a valid locale category"
 msgstr ""
@@ -2668,12 +2672,12 @@ msgstr ""
 msgid "no explicit close of file `%s' provided"
 msgstr ""
 
-#: io.c:1317 io.c:1375 main.c:628 main.c:670
+#: io.c:1317 io.c:1375 main.c:632 main.c:674
 #, c-format
 msgid "error writing standard output (%s)"
 msgstr ""
 
-#: io.c:1322 io.c:1381 main.c:630
+#: io.c:1322 io.c:1381 main.c:634
 #, c-format
 msgid "error writing standard error (%s)"
 msgstr ""
@@ -2703,141 +2707,141 @@ msgstr ""
 msgid "remote host and port information (%s, %s) invalid"
 msgstr ""
 
-#: io.c:1673
+#: io.c:1699
 msgid "TCP/IP communications are not supported"
 msgstr ""
 
-#: io.c:1854
+#: io.c:1880
 #, c-format
 msgid "could not open `%s', mode `%s'"
 msgstr ""
 
-#: io.c:1904
+#: io.c:1930
 #, c-format
 msgid "close of master pty failed (%s)"
 msgstr ""
 
-#: io.c:1906 io.c:2092 io.c:2293
+#: io.c:1932 io.c:2118 io.c:2319
 #, c-format
 msgid "close of stdout in child failed (%s)"
 msgstr ""
 
-#: io.c:1909
+#: io.c:1935
 #, c-format
 msgid "moving slave pty to stdout in child failed (dup: %s)"
 msgstr ""
 
-#: io.c:1911 io.c:2097
+#: io.c:1937 io.c:2123
 #, c-format
 msgid "close of stdin in child failed (%s)"
 msgstr ""
 
-#: io.c:1914
+#: io.c:1940
 #, c-format
 msgid "moving slave pty to stdin in child failed (dup: %s)"
 msgstr ""
 
-#: io.c:1916 io.c:1938
+#: io.c:1942 io.c:1964
 #, c-format
 msgid "close of slave pty failed (%s)"
 msgstr ""
 
-#: io.c:2027 io.c:2095 io.c:2264 io.c:2296
+#: io.c:2053 io.c:2121 io.c:2290 io.c:2322
 #, c-format
 msgid "moving pipe to stdout in child failed (dup: %s)"
 msgstr ""
 
-#: io.c:2034 io.c:2100
+#: io.c:2060 io.c:2126
 #, c-format
 msgid "moving pipe to stdin in child failed (dup: %s)"
 msgstr ""
 
-#: io.c:2060 io.c:2286
+#: io.c:2086 io.c:2312
 msgid "restoring stdout in parent process failed\n"
 msgstr ""
 
-#: io.c:2068
+#: io.c:2094
 msgid "restoring stdin in parent process failed\n"
 msgstr ""
 
-#: io.c:2103 io.c:2298 io.c:2313
+#: io.c:2129 io.c:2324 io.c:2339
 #, c-format
 msgid "close of pipe failed (%s)"
 msgstr ""
 
-#: io.c:2162
+#: io.c:2188
 msgid "`|&' not supported"
 msgstr ""
 
-#: io.c:2249
+#: io.c:2275
 #, c-format
 msgid "cannot open pipe `%s' (%s)"
 msgstr ""
 
-#: io.c:2307
+#: io.c:2333
 #, c-format
 msgid "cannot create child process for `%s' (fork: %s)"
 msgstr ""
 
-#: io.c:2734
+#: io.c:2760
 msgid "register_input_parser: received NULL pointer"
 msgstr ""
 
-#: io.c:2762
+#: io.c:2788
 #, c-format
 msgid "input parser `%s' conflicts with previously installed input parser `%s'"
 msgstr ""
 
-#: io.c:2769
+#: io.c:2795
 #, c-format
 msgid "input parser `%s' failed to open `%s'"
 msgstr ""
 
-#: io.c:2789
+#: io.c:2815
 msgid "register_output_wrapper: received NULL pointer"
 msgstr ""
 
-#: io.c:2817
+#: io.c:2843
 #, c-format
 msgid ""
 "output wrapper `%s' conflicts with previously installed output wrapper `%s'"
 msgstr ""
 
-#: io.c:2824
+#: io.c:2850
 #, c-format
 msgid "output wrapper `%s' failed to open `%s'"
 msgstr ""
 
-#: io.c:2845
+#: io.c:2871
 msgid "register_output_processor: received NULL pointer"
 msgstr ""
 
-#: io.c:2874
+#: io.c:2900
 #, c-format
 msgid ""
 "two-way processor `%s' conflicts with previously installed two-way processor "
 "`%s'"
 msgstr ""
 
-#: io.c:2883
+#: io.c:2909
 #, c-format
 msgid "two way processor `%s' failed to open `%s'"
 msgstr ""
 
-#: io.c:3008
+#: io.c:3034
 #, c-format
 msgid "data file `%s' is empty"
 msgstr ""
 
-#: io.c:3050 io.c:3058
+#: io.c:3076 io.c:3084
 msgid "could not allocate more input memory"
 msgstr ""
 
-#: io.c:3636
+#: io.c:3662
 msgid "multicharacter value of `RS' is a gawk extension"
 msgstr ""
 
-#: io.c:3783
+#: io.c:3809
 msgid "IPv6 communication is not supported"
 msgstr ""
 
@@ -2955,59 +2959,62 @@ msgstr ""
 msgid "\t-l library\t\t--load=library\n"
 msgstr ""
 
-#: main.c:586
+#. TRANSLATORS: the "fatal" and "invalid" here are literal
+#. values, they should not be translated. Thanks.
+#.
+#: main.c:590
 msgid "\t-L[fatal|invalid]\t--lint[=fatal|invalid]\n"
 msgstr ""
 
-#: main.c:587
+#: main.c:591
 msgid "\t-M\t\t\t--bignum\n"
 msgstr ""
 
-#: main.c:588
+#: main.c:592
 msgid "\t-N\t\t\t--use-lc-numeric\n"
 msgstr ""
 
-#: main.c:589
+#: main.c:593
 msgid "\t-n\t\t\t--non-decimal-data\n"
 msgstr ""
 
-#: main.c:590
+#: main.c:594
 msgid "\t-o[file]\t\t--pretty-print[=file]\n"
 msgstr ""
 
-#: main.c:591
+#: main.c:595
 msgid "\t-O\t\t\t--optimize\n"
 msgstr ""
 
-#: main.c:592
+#: main.c:596
 msgid "\t-p[file]\t\t--profile[=file]\n"
 msgstr ""
 
-#: main.c:593
+#: main.c:597
 msgid "\t-P\t\t\t--posix\n"
 msgstr ""
 
-#: main.c:594
+#: main.c:598
 msgid "\t-r\t\t\t--re-interval\n"
 msgstr ""
 
-#: main.c:595
+#: main.c:599
 msgid "\t-S\t\t\t--sandbox\n"
 msgstr ""
 
-#: main.c:596
+#: main.c:600
 msgid "\t-t\t\t\t--lint-old\n"
 msgstr ""
 
-#: main.c:597
+#: main.c:601
 msgid "\t-V\t\t\t--version\n"
 msgstr ""
 
-#: main.c:599
+#: main.c:603
 msgid "\t-W nostalgia\t\t--nostalgia\n"
 msgstr ""
 
-#: main.c:602
+#: main.c:606
 msgid "\t-Y\t\t--parsedebug\n"
 msgstr ""
 
@@ -3016,7 +3023,7 @@ msgstr ""
 #. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: main.c:611
+#: main.c:615
 msgid ""
 "\n"
 "To report bugs, see node `Bugs' in `gawk.info', which is\n"
@@ -3024,21 +3031,21 @@ msgid ""
 "\n"
 msgstr ""
 
-#: main.c:615
+#: main.c:619
 msgid ""
 "gawk is a pattern scanning and processing language.\n"
 "By default it reads standard input and writes standard output.\n"
 "\n"
 msgstr ""
 
-#: main.c:619
+#: main.c:623
 msgid ""
 "Examples:\n"
 "\tgawk '{ sum += $1 }; END { print sum }' file\n"
 "\tgawk -F: '{ print $1 }' /etc/passwd\n"
 msgstr ""
 
-#: main.c:644
+#: main.c:648
 #, c-format
 msgid ""
 "Copyright (C) 1989, 1991-%d Free Software Foundation.\n"
@@ -3050,7 +3057,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: main.c:652
+#: main.c:656
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -3059,88 +3066,88 @@ msgid ""
 "\n"
 msgstr ""
 
-#: main.c:658
+#: main.c:662
 msgid ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program. If not, see http://www.gnu.org/licenses/.\n";
 msgstr ""
 
-#: main.c:695
+#: main.c:699
 msgid "-Ft does not set FS to tab in POSIX awk"
 msgstr ""
 
-#: main.c:982
+#: main.c:986
 #, c-format
 msgid "unknown value for field spec: %d\n"
 msgstr ""
 
-#: main.c:1080
+#: main.c:1084
 #, c-format
 msgid ""
 "%s: `%s' argument to `-v' not in `var=value' form\n"
 "\n"
 msgstr ""
 
-#: main.c:1106
+#: main.c:1110
 #, c-format
 msgid "`%s' is not a legal variable name"
 msgstr ""
 
-#: main.c:1109
+#: main.c:1113
 #, c-format
 msgid "`%s' is not a variable name, looking for file `%s=%s'"
 msgstr ""
 
-#: main.c:1113
+#: main.c:1117
 #, c-format
 msgid "cannot use gawk builtin `%s' as variable name"
 msgstr ""
 
-#: main.c:1118
+#: main.c:1122
 #, c-format
 msgid "cannot use function `%s' as variable name"
 msgstr ""
 
-#: main.c:1171
+#: main.c:1175
 msgid "floating point exception"
 msgstr ""
 
-#: main.c:1178
+#: main.c:1182
 msgid "fatal error: internal error"
 msgstr ""
 
-#: main.c:1193
+#: main.c:1197
 msgid "fatal error: internal error: segfault"
 msgstr ""
 
-#: main.c:1205
+#: main.c:1209
 msgid "fatal error: internal error: stack overflow"
 msgstr ""
 
-#: main.c:1264
+#: main.c:1268
 #, c-format
 msgid "no pre-opened fd %d"
 msgstr ""
 
-#: main.c:1271
+#: main.c:1275
 #, c-format
 msgid "could not pre-open /dev/null for fd %d"
 msgstr ""
 
-#: main.c:1485
+#: main.c:1489
 msgid "empty argument to `-e/--source' ignored"
 msgstr ""
 
-#: main.c:1556
+#: main.c:1560
 msgid "-M ignored: MPFR/GMP support not compiled in"
 msgstr ""
 
-#: main.c:1577
+#: main.c:1581
 #, c-format
 msgid "%s: option `-W %s' unrecognized, ignored\n"
 msgstr ""
 
-#: main.c:1630
+#: main.c:1634
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr ""
@@ -3245,58 +3252,58 @@ msgstr ""
 msgid "%s %s `%s': could not set close-on-exec: (fcntl F_SETFD: %s)"
 msgstr ""
 
-#: profile.c:71
+#: profile.c:91
 #, c-format
 msgid "could not open `%s' for writing: %s"
 msgstr ""
 
-#: profile.c:73
+#: profile.c:93
 msgid "sending profile to standard error"
 msgstr ""
 
-#: profile.c:193
+#: profile.c:213
 #, c-format
 msgid ""
 "\t# %s rule(s)\n"
 "\n"
 msgstr ""
 
-#: profile.c:198
+#: profile.c:218
 #, c-format
 msgid ""
 "\t# Rule(s)\n"
 "\n"
 msgstr ""
 
-#: profile.c:272
+#: profile.c:292
 #, c-format
 msgid "internal error: %s with null vname"
 msgstr ""
 
-#: profile.c:538
+#: profile.c:558
 msgid "internal error: builtin with null fname"
 msgstr ""
 
-#: profile.c:958
+#: profile.c:978
 #, c-format
 msgid ""
 "\t# Loaded extensions (-l and/or @load)\n"
 "\n"
 msgstr ""
 
-#: profile.c:981
+#: profile.c:1001
 #, c-format
 msgid "\t# gawk profile, created %s\n"
 msgstr ""
 
-#: profile.c:1535
+#: profile.c:1555
 #, c-format
 msgid ""
 "\n"
 "\t# Functions, listed alphabetically\n"
 msgstr ""
 
-#: profile.c:1573
+#: profile.c:1593
 #, c-format
 msgid "redir2str: unknown redirection type %d"
 msgstr ""

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

commit f13dbca68d16b6598066a8d4bf401fd3e1f58bff
Author: Arnold D. Robbins <address@hidden>
Date:   Thu Apr 16 17:25:42 2015 +0300

    Fix printf format in regex malloc wrappers.

diff --git a/ChangeLog b/ChangeLog
index 53e82de..d8325dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,12 @@
        * builtin.c (do_strftime): Use a double for the timestamp and
        check that the value is within range for a time_t.
 
+       Unrelated:
+
+       * regex_internal.h (test_malloc, test_realloc): Use %lu in printf
+       format for error messages. Thanks to Michal Jaegermann for
+       pointing this out.
+
 2015-04-14         Arnold D. Robbins     <address@hidden>
 
        * builtin.c (do_strftime): Restore checking for negative result and
diff --git a/regex_internal.h b/regex_internal.h
index 6a870f2..327bd7e 100644
--- a/regex_internal.h
+++ b/regex_internal.h
@@ -479,7 +479,7 @@ static void *
 test_malloc(size_t count, const char *file, size_t line)
 {
        if (count == 0) {
-               fprintf(stderr, "%s:%d: allocation of zero bytes\n",
+               fprintf(stderr, "%s:%lu: allocation of zero bytes\n",
                                file, line);
                exit(1);
        }
@@ -490,7 +490,7 @@ static void *
 test_realloc(void *p, size_t count, const char *file, size_t line)
 {
        if (count == 0) {
-               fprintf(stderr, "%s:%d: reallocation of zero bytes\n",
+               fprintf(stderr, "%s:%lu: reallocation of zero bytes\n",
                                file, line);
                exit(1);
        }

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

Summary of changes:
 ChangeLog        |    6 ++
 pc/ChangeLog     |    5 +
 pc/Makefile.tst  |   31 +++++--
 pc/config.h      |    6 +-
 po/gawk.pot      |  259 ++++++++++++++++++++++++++++--------------------------
 regex_internal.h |    4 +-
 6 files changed, 172 insertions(+), 139 deletions(-)


hooks/post-receive
-- 
gawk



reply via email to

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