gawk-diffs
[Top][All Lists]
Advanced

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

[SCM] gawk branch, feature/cpp-compile, updated. gawk-4.1.0-4189-g0d4201


From: Arnold Robbins
Subject: [SCM] gawk branch, feature/cpp-compile, updated. gawk-4.1.0-4189-g0d42019
Date: Mon, 16 Nov 2020 04:09:22 -0500 (EST)

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, feature/cpp-compile has been updated
       via  0d42019f7066a89e5294d9a442503f8b7b6065eb (commit)
      from  f0a8185634de13a2c1cf020ab1a2e67b10e28356 (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=0d42019f7066a89e5294d9a442503f8b7b6065eb

commit 0d42019f7066a89e5294d9a442503f8b7b6065eb
Author: Arnold D. Robbins <arnold@skeeve.com>
Date:   Mon Nov 16 11:08:59 2020 +0200

    Finish removing C++ warnings.

diff --git a/awkgram.c b/awkgram.c
index 3b3928b..d9d9f69 100644
--- a/awkgram.c
+++ b/awkgram.c
@@ -5584,7 +5584,7 @@ get_src_buf()
        int n;
        char *scan;
        bool newfile;
-       int savelen;
+       size_t savelen;
        struct stat sbuf;
 
        /*
@@ -5724,7 +5724,7 @@ get_src_buf()
                         * of the available space.
                         */
 
-                       if (savelen > sourcefile->bufsize / 2) { /* long line 
or token  */
+                       if (savelen > sourcefile->bufsize / 2u) { /* long line 
or token  */
                                sourcefile->bufsize *= 2;
                                erealloc(sourcefile->buf, char *, 
sourcefile->bufsize, "get_src_buf");
                                scan = sourcefile->buf + (scan - lexptr_begin);
diff --git a/awkgram.y b/awkgram.y
index 8dc978d..b9c3547 100644
--- a/awkgram.y
+++ b/awkgram.y
@@ -3222,7 +3222,7 @@ get_src_buf()
                         * of the available space.
                         */
 
-                       if (savelen > sourcefile->bufsize / 2) { /* long line 
or token  */
+                       if (savelen > sourcefile->bufsize / 2u) { /* long line 
or token  */
                                sourcefile->bufsize *= 2;
                                erealloc(sourcefile->buf, char *, 
sourcefile->bufsize, "get_src_buf");
                                scan = sourcefile->buf + (scan - lexptr_begin);
diff --git a/builtin.c b/builtin.c
index cd0d53c..d0ebad0 100644
--- a/builtin.c
+++ b/builtin.c
@@ -1151,7 +1151,7 @@ out0:
                                prec = arg->stlen;
                        else {
                                char_count = mbc_char_count(arg->stptr, 
arg->stlen);
-                               if (! have_prec || prec > char_count)
+                               if (! have_prec || (size_t) prec > char_count)
                                        prec = char_count;
                        }
                        cp = arg->stptr;
@@ -1196,14 +1196,14 @@ out0:
                         * Use snprintf return value to tell if there
                         * is enough room in the buffer or not.
                         */
-                       while ((i = snprintf(cpbufs[1].buf,
+                       while ((size_t)(i = snprintf(cpbufs[1].buf,
                                             cpbufs[1].bufsize, "%.0f",
                                             tmpval)) >=
                               cpbufs[1].bufsize) {
                                if (cpbufs[1].buf == cpbufs[1].stackbuf)
                                        cpbufs[1].buf = NULL;
                                if (i > 0) {
-                                       cpbufs[1].bufsize += ((i > 
cpbufs[1].bufsize) ?
+                                       cpbufs[1].bufsize += (((size_t)i > 
cpbufs[1].bufsize) ?
                                                              i : 
cpbufs[1].bufsize);
                                }
                                else
@@ -1574,19 +1574,19 @@ mpf1:
 #ifdef HAVE_MPFR
                        case MP_INT_WITH_PREC:
                                sprintf(cp, "*.*Z%c", cs1);
-                               while ((nc = mpfr_snprintf(obufout, ofre, cpbuf,
+                               while ((size_t)(nc = mpfr_snprintf(obufout, 
ofre, cpbuf,
                                             (int) fw, (int) prec, zi)) >= ofre)
                                        chksize(nc)
                                break;
                        case MP_INT_WITHOUT_PREC:
                                sprintf(cp, "*Z%c", cs1);
-                               while ((nc = mpfr_snprintf(obufout, ofre, cpbuf,
+                               while ((size_t)(nc = mpfr_snprintf(obufout, 
ofre, cpbuf,
                                             (int) fw, zi)) >= ofre)
                                        chksize(nc)
                                break;
                        case MP_FLOAT:
                                sprintf(cp, "*.*R*%c", cs1);
-                               while ((nc = mpfr_snprintf(obufout, ofre, cpbuf,
+                               while ((size_t)(nc = mpfr_snprintf(obufout, 
ofre, cpbuf,
                                             (int) fw, (int) prec, ROUND_MODE, 
mf)) >= ofre)
                                        chksize(nc)
                                break;
@@ -1594,7 +1594,7 @@ mpf1:
                        default:
                                if (have_prec || tolower(cs1) != 'a') {
                                        sprintf(cp, "*.*%c", cs1);
-                                       while ((nc = snprintf(obufout, ofre, 
cpbuf,
+                                       while ((size_t)(nc = snprintf(obufout, 
ofre, cpbuf,
                                                     (int) fw, (int) prec,
                                                     (double) tmpval)) >= ofre)
                                                chksize(nc)
@@ -1602,7 +1602,7 @@ mpf1:
                                        // For %a and %A, use the default 
precision if it
                                        // wasn't supplied by the user.
                                        sprintf(cp, "*%c", cs1);
-                                       while ((nc = snprintf(obufout, ofre, 
cpbuf,
+                                       while ((size_t)(nc = snprintf(obufout, 
ofre, cpbuf,
                                                     (int) fw,
                                                     (double) tmpval)) >= ofre)
                                                chksize(nc)
@@ -1636,7 +1636,7 @@ mpf1:
                if (need_format)
                        lintwarn(
                        _("[s]printf: format specifier does not have control 
letter"));
-               if (cur_arg < num_args)
+               if (cur_arg < (size_t)num_args)
                        lintwarn(
                        _("too many arguments supplied for format string"));
        }
@@ -2062,7 +2062,7 @@ do_strftime(int nargs)
                 * format string, it's not failing for lack of room.
                 * Thanks to Paul Eggert for pointing out this issue.
                 */
-               if (buflen > 0 || bufsize >= 1024 * formatlen)
+               if (buflen > 0 || bufsize >= (size_t)(1024 * formatlen))
                        break;
                bufsize *= 2;
                if (bufp == buf)
@@ -2698,7 +2698,7 @@ do_match(int nargs)
                        subsepstr = SUBSEP_node->var_value->stptr;
                        subseplen = SUBSEP_node->var_value->stlen;
 
-                       for (ii = 0; ii < NUMSUBPATS(rp, t1->stptr); ii++) {
+                       for (ii = 0; (size_t)ii < NUMSUBPATS(rp, t1->stptr); 
ii++) {
                                /*
                                 * Loop over all the subpats; some of them may 
have
                                 * matched even if all of them did not.
@@ -2948,7 +2948,7 @@ do_sub(int nargs, unsigned int flags)
 
        /* do the search early to avoid work on non-match */
        if (research(rp, target->stptr, 0, target->stlen, RE_NEED_START) == -1 
||
-                       RESTART(rp, target->stptr) > target->stlen)
+                       (size_t)RESTART(rp, target->stptr) > target->stlen)
                goto done;
 
        target->flags |= STRING;
@@ -3093,7 +3093,7 @@ do_sub(int nargs, unsigned int flags)
                                ) {
                                        if (flags & GENSUB) {   /* gensub, 
behave sanely */
                                                if (isdigit((unsigned char) 
scan[1])) {
-                                                       int dig = scan[1] - '0';
+                                                       size_t dig = scan[1] - 
'0';
                                                        if (dig < 
NUMSUBPATS(rp, target->stptr) && SUBPATSTART(rp, tp->stptr, dig) != -1) {
                                                                char *start, 
*end;
 
diff --git a/cint_array.c b/cint_array.c
index ea5b7e5..38994a7 100644
--- a/cint_array.c
+++ b/cint_array.c
@@ -525,7 +525,7 @@ cint_dump(NODE *symbol, NODE *ndump)
                fprintf(output_fp, "flags: %s\n", flags2str(symbol->flags));
        }
        indent(indent_level);
-       fprintf(output_fp, "NHAT: %d\n", NHAT);
+       fprintf(output_fp, "NHAT: %lu\n", NHAT);
        indent(indent_level);
        fprintf(output_fp, "THRESHOLD: %ld\n", THRESHOLD);
        indent(indent_level);

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

Summary of changes:
 awkgram.c    |  4 ++--
 awkgram.y    |  2 +-
 builtin.c    | 26 +++++++++++++-------------
 cint_array.c |  2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
gawk



reply via email to

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