summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2021-06-10 14:11:40 +0300
committerArnold D. Robbins <arnold@skeeve.com>2021-06-10 14:11:40 +0300
commite583dbaaedb7930fe33e768527f901a4f106c909 (patch)
treecc9dc85b557234d067604e9a9e6970397f2f532d
parent1b5a933dff3a532f3c1413ba93ea7f60f2a074ba (diff)
parent0ef226ffbc493ac284ffdc1100f936cb27800120 (diff)
downloadgawk-e583dbaaedb7930fe33e768527f901a4f106c909.tar.gz
Merge branch 'gawk-5.1-stable'
-rw-r--r--ChangeLog8
-rw-r--r--builtin.c10
-rw-r--r--doc/ChangeLog4
-rw-r--r--doc/wordlist5
4 files changed, 22 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index d2fb42a2..b3f59ce8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2021-06-04 Arnold D. Robbins <arnold@skeeve.com>
+
+ * builtin.c (format_tree): In MPFR prints, cast values to
+ int for proper int vs. unsigned comparison. Fixes things
+ for HP-UX. Thanks to Daniel Richard G. for the report.
+
+2021-06-04 Arnold D. Robbins <arnold@skeeve.com>
+
2021-05-21 Arnold D. Robbins <arnold@skeeve.com>
* debug.c: For z/OS, use %#p to print pointers, %p everything else.
diff --git a/builtin.c b/builtin.c
index ff4a53af..fe87cbe6 100644
--- a/builtin.c
+++ b/builtin.c
@@ -1558,19 +1558,19 @@ mpf1:
case MP_INT_WITH_PREC:
sprintf(cp, "*.*Z%c", cs1);
while ((nc = mpfr_snprintf(obufout, ofre, cpbuf,
- (int) fw, (int) prec, zi)) >= ofre)
+ (int) fw, (int) prec, zi)) >= (int) ofre)
chksize(nc)
break;
case MP_INT_WITHOUT_PREC:
sprintf(cp, "*Z%c", cs1);
while ((nc = mpfr_snprintf(obufout, ofre, cpbuf,
- (int) fw, zi)) >= ofre)
+ (int) fw, zi)) >= (int) ofre)
chksize(nc)
break;
case MP_FLOAT:
sprintf(cp, "*.*R*%c", cs1);
while ((nc = mpfr_snprintf(obufout, ofre, cpbuf,
- (int) fw, (int) prec, ROUND_MODE, mf)) >= ofre)
+ (int) fw, (int) prec, ROUND_MODE, mf)) >= (int) ofre)
chksize(nc)
break;
#endif
@@ -1579,7 +1579,7 @@ mpf1:
sprintf(cp, "*.*%c", cs1);
while ((nc = snprintf(obufout, ofre, cpbuf,
(int) fw, (int) prec,
- (double) tmpval)) >= ofre)
+ (double) tmpval)) >= (int) ofre)
chksize(nc)
} else {
// For %a and %A, use the default precision if it
@@ -1587,7 +1587,7 @@ mpf1:
sprintf(cp, "*%c", cs1);
while ((nc = snprintf(obufout, ofre, cpbuf,
(int) fw,
- (double) tmpval)) >= ofre)
+ (double) tmpval)) >= (int) ofre)
chksize(nc)
}
}
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 7a61562a..9213557a 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-10 Arnold D. Robbins <arnold@skeeve.com>
+
+ * wordlist: Add some more words.
+
2021-05-30 Arnold D. Robbins <arnold@skeeve.com>
* gawktexi.in (Feature History): Fix a typo and clarify wording.
diff --git a/doc/wordlist b/doc/wordlist
index be7655ec..2aa56fcb 100644
--- a/doc/wordlist
+++ b/doc/wordlist
@@ -20,6 +20,7 @@ AWKBUFSIZE
AWKLIBPATH
AWKPATH
AWKREADFUNC
+AbbC
AdditionalResources
Affero
Aharon
@@ -65,6 +66,7 @@ Byname
Byuid
CAKuGj
CASEFOLD
+CBA
CC
CDE
CEST
@@ -80,6 +82,7 @@ CRTL
CSV
CSVMODE
CTYPE
+CbbA
Cc
Chana
ChangeLog
@@ -645,6 +648,7 @@ basedefs
baselineskip
bax
baz
+bb
bc
bcd
becky
@@ -1782,6 +1786,7 @@ writea
www
wy
xA
+xAxBxCx
xDEADBEEF
xDeadBeef
xFOO