summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <bonzini@gnu.org>2011-05-27 09:37:25 +0200
committerPaolo Bonzini <bonzini@gnu.org>2012-03-16 10:13:01 +0100
commit54da30b4fcfe45e52416bdf0779d2afa0ed8b129 (patch)
treefed7773924be6e2ddf4a4552193314fd85428b9d
parent923b8429c8c070b29f62c1cc6a596dbb371cad59 (diff)
downloadsed-54da30b4fcfe45e52416bdf0779d2afa0ed8b129.tar.gz
simplify the code handling \l and \u
2011-05-27 Paolo Bonzini <bonzini@gnu.org> * sed/execute.c (append_replacement, do_subst): Further simplification.
-rw-r--r--ChangeLog5
-rw-r--r--sed/execute.c12
2 files changed, 10 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index c19e45f..dcb9b64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-27 Paolo Bonzini <bonzini@gnu.org>
+
+ * sed/execute.c (append_replacement, do_subst): Further
+ simplification.
+
2012-03-16 Paolo Bonzini <bonzini@gnu.org>
* basicdefs.h (FREE): Remove.
diff --git a/sed/execute.c b/sed/execute.c
index d6d02c4..a430f62 100644
--- a/sed/execute.c
+++ b/sed/execute.c
@@ -1011,15 +1011,15 @@ do_list(line_len)
static void append_replacement P_((struct line *, struct replacement *,
- struct re_registers *,
- enum replacement_types));
+ struct re_registers *));
static void
-append_replacement (buf, p, regs, repl_mod)
+append_replacement (buf, p, regs)
struct line *buf;
struct replacement *p;
struct re_registers *regs;
- enum replacement_types repl_mod;
{
+ enum replacement_types repl_mod = 0;
+
for (; p; p=p->next)
{
int i = p->subst_id;
@@ -1100,8 +1100,6 @@ do_subst(sub)
do
{
- enum replacement_types repl_mod = 0;
-
size_t offset = regs.start[0];
size_t matched = regs.end[0] - regs.start[0];
@@ -1125,7 +1123,7 @@ do_subst(sub)
replaced = true;
/* Now expand the replacement string into the output string. */
- append_replacement (&s_accum, sub->replacement, &regs, repl_mod);
+ append_replacement (&s_accum, sub->replacement, &regs);
again = sub->global;
}
else