[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gawk-diffs] [SCM] gawk branch, feature/fixtype, updated. gawk-4.1.0-204
From: |
Arnold Robbins |
Subject: |
[gawk-diffs] [SCM] gawk branch, feature/fixtype, updated. gawk-4.1.0-2049-g1f4057b |
Date: |
Sun, 23 Oct 2016 09:14:14 +0000 (UTC) |
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/fixtype has been updated
via 1f4057bf15e23e5883b7bf1c75c72f874fb4066f (commit)
via 3055361c2a022c9ac9ae42ac88c00e3055498a0d (commit)
via a562d9af7650afcda1115e2cd8a2426641c020df (commit)
via 2b7ce67a9289203e5523e0bdb822ccb859899acb (commit)
from 955985e72c6215fbe8b457d7a7f42ea89cd4f0c0 (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=1f4057bf15e23e5883b7bf1c75c72f874fb4066f
commit 1f4057bf15e23e5883b7bf1c75c72f874fb4066f
Merge: 955985e 3055361
Author: Arnold D. Robbins <address@hidden>
Date: Sun Oct 23 12:14:08 2016 +0300
Merge branch 'master' into feature/fixtype
diff --cc field.c
index 3307ace,4f24d5f..f83f7b7
--- a/field.c
+++ b/field.c
@@@ -338,28 -247,44 +338,28 @@@ voi
set_record(const char *buf, int cnt)
{
NODE *n;
- static char *databuf;
- static unsigned long databuf_size;
-#define INITIAL_SIZE 512
-#define MAX_SIZE ((unsigned long) ~0) /* maximally portable ... */
-
- reset_record();
- /* buffer management: */
- if (databuf_size == 0) { /* first time */
- emalloc(databuf, char *, INITIAL_SIZE, "set_record");
- databuf_size = INITIAL_SIZE;
- memset(databuf, '\0', INITIAL_SIZE);
+ purge_record();
+ allocate_databuf(cnt, true);
- }
- /*
- * Make sure there's enough room. Since we sometimes need
- * to place a sentinel at the end, we make sure
- * databuf_size is > cnt after allocation.
- */
- if (cnt >= databuf_size) {
- while (cnt >= databuf_size && databuf_size <= MAX_SIZE)
- databuf_size *= 2;
- erealloc(databuf, char *, databuf_size, "set_record");
- memset(databuf, '\0', databuf_size);
- }
/* copy the data */
- memcpy(databuf, buf, cnt);
+ memcpy(databuf.p, buf, cnt);
/*
- * Add terminating '\0' so that C library routines
+ * Add terminating '\0' so that C library routines
* will know when to stop.
*/
- databuf[cnt] = '\0';
+ databuf.p[cnt] = '\0';
+ databuf.space = databuf.p + cnt + 1;
/* manage field 0: */
+#ifndef NDEBUG
+ if ((fields_arr[0]->flags & MALLOC) == 0)
+ assert(fields_arr[0]->valref == 1);
+#endif
unref(fields_arr[0]);
getnode(n);
- n->stptr = databuf;
+ n->stptr = databuf.p;
n->stlen = cnt;
n->valref = 1;
n->type = Node_val;
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 +
array.c | 46 +-
awk.h | 42 +-
awkgram.c | 154 ++---
awkgram.y | 168 +++---
awklib/eg/lib/grcat.c | 1 -
builtin.c | 106 ++--
cint_array.c | 50 +-
cmd.h | 14 +-
command.c | 58 +-
command.y | 80 +--
custom.h | 10 +-
debug.c | 270 ++++-----
doc/ChangeLog | 5 +
doc/gawk.info | 1405 ++++++++++++++++++++------------------------
doc/gawk.texi | 283 +--------
doc/gawktexi.in | 283 +--------
eval.c | 46 +-
ext.c | 24 +-
extension/ChangeLog | 4 +
extension/filefuncs.c | 12 +-
extension/fnmatch.c | 8 +-
extension/fork.c | 8 +-
extension/inplace.c | 10 +-
extension/ordchr.c | 8 +-
extension/readdir.c | 8 +-
extension/readfile.c | 8 +-
extension/revoutput.c | 8 +-
extension/revtwoway.c | 8 +-
extension/rwarray.c | 12 +-
extension/rwarray0.c | 12 +-
extension/stack.c | 10 +-
extension/testext.c | 16 +-
field.c | 50 +-
floatcomp.c | 10 +-
floatmagic.h | 12 +-
gawkapi.c | 16 +-
gawkapi.h | 20 +-
gawkmisc.c | 10 +-
helpers/ChangeLog | 4 +
helpers/testdfa.c | 22 +-
helpers/testnet.c | 8 +-
int_array.c | 38 +-
interpret.h | 62 +-
io.c | 100 ++--
main.c | 34 +-
mbsupport.h | 10 +-
missing_d/ChangeLog | 4 +
missing_d/snprintf.c | 10 +-
mpfr.c | 60 +-
msg.c | 10 +-
node.c | 26 +-
nonposix.h | 10 +-
old-extension/ChangeLog | 4 +
old-extension/bindarr.c | 12 +-
old-extension/fileop.c | 10 +-
old-extension/sparr.c | 14 +-
old-extension/spec_array.c | 22 +-
pc/ChangeLog | 4 +
pc/popen.c | 2 +-
posix/ChangeLog | 4 +
posix/gawkmisc.c | 6 +-
profile.c | 52 +-
protos.h | 14 +-
random.h | 10 +-
re.c | 16 +-
regcomp.c | 2 +-
replace.c | 12 +-
str_array.c | 34 +-
symbol.c | 38 +-
vms/ChangeLog | 4 +
vms/vms_gawk.c | 2 +-
72 files changed, 1703 insertions(+), 2258 deletions(-)
hooks/post-receive
--
gawk
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gawk-diffs] [SCM] gawk branch, feature/fixtype, updated. gawk-4.1.0-2049-g1f4057b,
Arnold Robbins <=