[gawk-diffs] [SCM] gawk branch, gawk-4.0-stable, updated. f8ca822a7e81bd80afa7181ec5c0f0b4a50a4945

[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, gawk-4.0-stable has been updated
       via  f8ca822a7e81bd80afa7181ec5c0f0b4a50a4945 (commit)
       via  15070b3cd065d20f04985568edf18723ee7d761e (commit)
      from  408223d694d6d838ca11d9617f23b0aa2d21f2e5 (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=f8ca822a7e81bd80afa7181ec5c0f0b4a50a4945

commit f8ca822a7e81bd80afa7181ec5c0f0b4a50a4945
Author: Arnold D. Robbins <address@hidden>
Date:   Mon May 7 21:59:26 2012 +0300

    Fix minor printf format warnings.

diff --git a/ChangeLog b/ChangeLog
index 7ce24b5..cf55c5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-07         Arnold D. Robbins     <address@hidden>
+
+       * array.c (prnode): Add casts to void* for %p format.
+       * debug.c (print_instruction): Ditto.
+       * builtin.c: Fix %lf format to be %f everywhere.
+
 2012-05-04         Arnold D. Robbins     <address@hidden>
 
        * getopt.c [DJGPP]: Change to __DJGPP__.
diff --git a/array.c b/array.c
index e814e97..f28a32d 100644
--- a/array.c
+++ b/array.c
@@ -882,10 +882,10 @@ static void
 pr_node(NODE *n)
 {
        if ((n->flags & NUMBER) != 0)
-               printf("%s %g p: %p", flags2str(n->flags), n->numbr, n);
+               printf("%s %g p: %p", flags2str(n->flags), n->numbr, (void *) 
n);
        else
                printf("%s %.*s p: %p", flags2str(n->flags),
-                               (int) n->stlen, n->stptr, n);
+                               (int) n->stlen, n->stptr, (void *) n);
 }
 
 
diff --git a/builtin.c b/builtin.c
index 44e0b85..c408212 100644
--- a/builtin.c
+++ b/builtin.c
@@ -2781,11 +2781,11 @@ do_lshift(int nargs)
        shift = force_number(s2);
        if (do_lint) {
                if (val < 0 || shift < 0)
-                       lintwarn(_("lshift(%lf, %lf): negative values will give 
strange results"), val, shift);
+                       lintwarn(_("lshift(%f, %f): negative values will give 
strange results"), val, shift);
                if (double_to_int(val) != val || double_to_int(shift) != shift)
-                       lintwarn(_("lshift(%lf, %lf): fractional values will be 
truncated"), val, shift);
+                       lintwarn(_("lshift(%f, %f): fractional values will be 
truncated"), val, shift);
                if (shift >= sizeof(uintmax_t) * CHAR_BIT)
-                       lintwarn(_("lshift(%lf, %lf): too large shift value 
will give strange results"), val, shift);
+                       lintwarn(_("lshift(%f, %f): too large shift value will 
give strange results"), val, shift);
        }
 
        DEREF(s1);
@@ -2818,11 +2818,11 @@ do_rshift(int nargs)
        shift = force_number(s2);
        if (do_lint) {
                if (val < 0 || shift < 0)
-                       lintwarn(_("rshift(%lf, %lf): negative values will give 
strange results"), val, shift);
+                       lintwarn(_("rshift(%f, %f): negative values will give 
strange results"), val, shift);
                if (double_to_int(val) != val || double_to_int(shift) != shift)
-                       lintwarn(_("rshift(%lf, %lf): fractional values will be 
truncated"), val, shift);
+                       lintwarn(_("rshift(%f, %f): fractional values will be 
truncated"), val, shift);
                if (shift >= sizeof(uintmax_t) * CHAR_BIT)
-                       lintwarn(_("rshift(%lf, %lf): too large shift value 
will give strange results"), val, shift);
+                       lintwarn(_("rshift(%f, %f): too large shift value will 
give strange results"), val, shift);
        }
 
        DEREF(s1);
@@ -2855,9 +2855,9 @@ do_and(int nargs)
        right = force_number(s2);
        if (do_lint) {
                if (left < 0 || right < 0)
-                       lintwarn(_("and(%lf, %lf): negative values will give 
strange results"), left, right);
+                       lintwarn(_("and(%f, %f): negative values will give 
strange results"), left, right);
                if (double_to_int(left) != left || double_to_int(right) != 
right)
-                       lintwarn(_("and(%lf, %lf): fractional values will be 
truncated"), left, right);
+                       lintwarn(_("and(%f, %f): fractional values will be 
truncated"), left, right);
        }
 
        DEREF(s1);
@@ -2890,9 +2890,9 @@ do_or(int nargs)
        right = force_number(s2);
        if (do_lint) {
                if (left < 0 || right < 0)
-                       lintwarn(_("or(%lf, %lf): negative values will give 
strange results"), left, right);
+                       lintwarn(_("or(%f, %f): negative values will give 
strange results"), left, right);
                if (double_to_int(left) != left || double_to_int(right) != 
right)
-                       lintwarn(_("or(%lf, %lf): fractional values will be 
truncated"), left, right);
+                       lintwarn(_("or(%f, %f): fractional values will be 
truncated"), left, right);
        }
 
        DEREF(s1);
@@ -2928,9 +2928,9 @@ do_xor(int nargs)
        right = force_number(s2);
        if (do_lint) {
                if (left < 0 || right < 0)
-                       lintwarn(_("xor(%lf, %lf): negative values will give 
strange results"), left, right);
+                       lintwarn(_("xor(%f, %f): negative values will give 
strange results"), left, right);
                if (double_to_int(left) != left || double_to_int(right) != 
right)
-                       lintwarn(_("xor(%lf, %lf): fractional values will be 
truncated"), left, right);
+                       lintwarn(_("xor(%f, %f): fractional values will be 
truncated"), left, right);
        }
 
        DEREF(s1);
@@ -2962,9 +2962,9 @@ do_compl(int nargs)
                if ((tmp->flags & (NUMCUR|NUMBER)) == 0)
                        lintwarn(_("compl: received non-numeric argument"));
                if (d < 0)
-                       lintwarn(_("compl(%lf): negative value will give 
strange results"), d);
+                       lintwarn(_("compl(%f): negative value will give strange 
results"), d);
                if (double_to_int(d) != d)
-                       lintwarn(_("compl(%lf): fractional value will be 
truncated"), d);
+                       lintwarn(_("compl(%f): fractional value will be 
truncated"), d);
        }
 
        uval = (uintmax_t) d;
diff --git a/debug.c b/debug.c
index 4306392..d8f5d5e 100644
--- a/debug.c
+++ b/debug.c
@@ -3704,7 +3704,8 @@ print_instruction(INSTRUCTION *pc, Func_print print_func, 
FILE *fp, int in_dump)
        if (noffset == 0) {
                static char buf[50];
                /* offset for 2nd to last lines in a multi-line output */
-               noffset = sprintf(buf, "[      :%p] %-20.20s: ", pc, 
opcode2str(pc->opcode));
+               noffset = sprintf(buf, "[      :%p] %-20.20s: ", (void *) pc,
+                               opcode2str(pc->opcode));
        }
 
        if (pc->opcode == Op_func) {

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

commit 15070b3cd065d20f04985568edf18723ee7d761e
Author: Arnold D. Robbins <address@hidden>
Date:   Mon May 7 21:57:23 2012 +0300

    Finish move to __DJGPP__ from DJGPP.

diff --git a/pc/ChangeLog b/pc/ChangeLog
index 41cc25b..98be86a 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-06         Eli Zaretskii  <address@hidden>
+
+       * config.sed: Update DJGPP -> __DJGPP__.
+
 2012-03-29         Arnold D. Robbins     <address@hidden>
 
        * config.h: Add definition for _Noreturn.
diff --git a/pc/config.sed b/pc/config.sed
index 96b2c2d..5e57e82 100644
--- a/pc/config.sed
+++ b/pc/config.sed
@@ -29,7 +29,7 @@
 s/^#undef GETPGRP_VOID *$/#define GETPGRP_VOID 1/
 s/^#undef GETGROUPS_T *$/#define GETGROUPS_T gid_t/
 /^#undef GETPGRP_VOID$/c\
-#ifdef DJGPP\
+#ifdef __DJGPP__\
 #define GETPGRP_VOID 1\
 #endif
 s/^#undef HAVE_ALARM *$/#define HAVE_ALARM 1/
@@ -100,7 +100,7 @@ s/^#undef HAVE_MEMCPY *$/#define HAVE_MEMCPY 1/
 #endif
 s/^#undef HAVE_MEMSET *$/#define HAVE_MEMSET 1/
 /^#undef HAVE_MKSTEMP *$/c\
-#ifdef DJGPP\
+#ifdef __DJGPP__\
 #define HAVE_MKSTEMP 1\
 #endif
 s/^#undef HAVE_MKTIME *$/#define HAVE_MKTIME 1/
@@ -160,7 +160,7 @@ s/^#undef HAVE_SYSTEM *$/#define HAVE_SYSTEM 1/
 #define HAVE_SYS_STAT_H 1\
 #endif
 /^#undef HAVE_SYS_TIME_H *$/c\
-#if defined(DJGPP) || defined(__MINGW32__)\
+#if defined(__DJGPP__) || defined(__MINGW32__)\
 #define HAVE_SYS_TIME_H 1\
 #endif
 s/^#undef HAVE_SYS_TYPES_H *$/#define HAVE_SYS_TYPES_H 1/
@@ -175,19 +175,19 @@ s/^#undef HAVE_SYS_TYPES_H *$/#define HAVE_SYS_TYPES_H 1/
 s/^#undef HAVE_TZNAME *$/#define HAVE_TZNAME 1/
 s/^#undef HAVE_TZSET *$/#define HAVE_TZSET 1/
 /^#undef HAVE_UINTMAX_T *$/c\
-#if defined(DJGPP) || defined(__MINGW32__)\
+#if defined(__DJGPP__) || defined(__MINGW32__)\
 #define HAVE_UINTMAX_T 1\
-#ifdef DJGPP\
+#ifdef __DJGPP__\
 #define uintmax_t unsigned long long\
 #endif\
 #endif
 /^#undef HAVE_UNISTD_H *$/c\
-#if defined(DJGPP) || defined(__MINGW32__)\
+#if defined(__DJGPP__) || defined(__MINGW32__)\
 #define HAVE_UNISTD_H 1\
 #endif
 s/^#undef HAVE_UNSIGNED_LONG_LONG *$/#define HAVE_UNSIGNED_LONG_LONG 1/
 /^#undef HAVE_USLEEP *$/c\
-#if defined(DJGPP) || defined(__MINGW32__)\
+#if defined(__DJGPP__) || defined(__MINGW32__)\
 #define HAVE_USLEEP 1\
 #endif
 s/^#undef HAVE_VPRINTF *$/#define HAVE_VPRINTF 1/
@@ -223,7 +223,7 @@ s/^#undef PROTOTYPES *$/#define PROTOTYPES 1/
 s/^#undef RETSIGTYPE *$/#define RETSIGTYPE void/
 /^#.*RETSIGTYPE /a\
 \
-#if defined(DJGPP) || defined(__MINGW32__)\
+#if defined(__DJGPP__) || defined(__MINGW32__)\
 #include <limits.h>\
 #endif
 /^#undef SIZEOF_UNSIGNED_INT *$/c\
@@ -243,15 +243,15 @@ s/^#undef TIME_WITH_SYS_TIME *$/#define 
TIME_WITH_SYS_TIME 1/
 #define inline __inline__\
 #endif
 /^#undef intmax_t *$/c\
-#ifdef DJGPP\
+#ifdef __DJGPP__\
 #define intmax_t long long\
 #endif
 /^#undef restrict *$/c\
-#ifdef DJGPP\
+#ifdef __DJGPP__\
 #define restrict\
 #endif
 /^#undef uintmax_t *$/c\
-#ifdef DJGPP\
+#ifdef __DJGPP__\
 #define uintmax_t unsigned long long\
 #endif
 
@@ -265,7 +265,7 @@ $a\
 # define DEFPATH  ".;c:/lib/awk;c:/gnu/lib/awk"\
 #endif\
 \
-#ifndef DJGPP\
+#ifndef __DJGPP__\
 #define HAVE_POPEN_H 1\
 #endif\
 \

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

Summary of changes:
 ChangeLog     |    6 ++++++
 array.c       |    4 ++--
 builtin.c     |   28 ++++++++++++++--------------
 debug.c       |    3 ++-
 pc/ChangeLog  |    4 ++++
 pc/config.sed |   24 ++++++++++++------------
 6 files changed, 40 insertions(+), 29 deletions(-)


hooks/post-receive
-- 
gawk