From: Daniel Shahaf <d.s@daniel.shahaf.name>
To: zsh-workers@zsh.org
Subject: [PATCH 1/3] No functional change: rename local variables.
Date: Mon, 30 Nov 2015 03:21:05 +0000 [thread overview]
Message-ID: <20151130032105.GF2504@tarsus.local2> (raw)
---
Src/params.c | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/Src/params.c b/Src/params.c
index 4600284..ee15271 100644
--- a/Src/params.c
+++ b/Src/params.c
@@ -2547,7 +2547,9 @@ setarrvalue(Value v, char **val)
arrhashsetfn(v->pm, val, 1);
} else {
char **old, **new, **p, **q, **r;
- int n, ll, i;
+ int pre_assignment_length;
+ int post_assignment_length;
+ int i;
if ((PM_TYPE(v->pm->node.flags) == PM_HASHED)) {
freearray(val);
@@ -2561,31 +2563,32 @@ setarrvalue(Value v, char **val)
v->end--;
}
q = old = v->pm->gsu.a->getfn(v->pm);
- n = arrlen(old);
+ pre_assignment_length = arrlen(old);
if (v->start < 0) {
- v->start += n;
+ v->start += pre_assignment_length;
if (v->start < 0)
v->start = 0;
}
if (v->end < 0) {
- v->end += n + 1;
+ v->end += pre_assignment_length + 1;
if (v->end < 0)
v->end = 0;
}
if (v->end < v->start)
v->end = v->start;
- ll = v->start + arrlen(val);
- if (v->end <= n)
- ll += n - v->end + 1;
+ post_assignment_length = v->start + arrlen(val);
+ if (v->end <= pre_assignment_length)
+ post_assignment_length += pre_assignment_length - v->end + 1;
- p = new = (char **) zshcalloc(sizeof(char *) * (ll + 1));
+ p = new = (char **) zshcalloc(sizeof(char *)
+ * (post_assignment_length + 1));
for (i = 0; i < v->start; i++)
- *p++ = i < n ? ztrdup(*q++) : ztrdup("");
+ *p++ = i < pre_assignment_length ? ztrdup(*q++) : ztrdup("");
for (r = val; *r;)
*p++ = ztrdup(*r++);
- if (v->end < n)
+ if (v->end < pre_assignment_length)
for (q = old + v->end; *q;)
*p++ = ztrdup(*q++);
*p = NULL;
--
2.1.4
reply other threads:[~2015-11-30 3:32 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151130032105.GF2504@tarsus.local2 \
--to=d.s@daniel.shahaf.name \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).