* eval.c (op_modplace): Fix warning caught by gcc, but not g++.txr-55

* lib.c (replace_list): Fix code that is valid C++ but not C.

3 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 549fd7ea..24f4f8d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,12 @@
 
 2012-01-26  Kaz Kylheku  <kaz@kylheku.com>
 
+	* eval.c (op_modplace): Fix warning caught by gcc, but not g++.
+
+	* lib.c (replace_list): Fix code that is valid C++ but not C.
+
+2012-01-26  Kaz Kylheku  <kaz@kylheku.com>
+
 	* lib.c (replace_list): Always convert the input items to a list,
 	even in the trivial case that an empty list is being replaced.
 	Allow a string to be the replacement (split into a list of
diff --git a/eval.c b/eval.c
index af712130..8ae828fe 100644
--- a/eval.c
+++ b/eval.c
@@ -782,7 +782,7 @@ static val op_modplace(val form, val env)
     /* TODO: dispatch these with hash table. */
     val sym = car(place);
     if (sym == dwim_s) {
-      val ret;
+      val ret = nil;
       loc = dwim_loc(place, env, op, newval, &ret);
       if (loc == 0)
         return ret;
diff --git a/lib.c b/lib.c
index e00f8d1f..881d2c0c 100644
--- a/lib.c
+++ b/lib.c
@@ -496,12 +496,12 @@ val replace_list(val list, val from, val to, val items)
   else if (from == t)
     from = nil;
   else if (lt(from, zero))
-    from = plus(from, len ? len : len = length(list));
+    from = plus(from, len ? len : (len = length(list)));
 
   if (to == t)
     to = nil;
   if (to && lt(to, zero))
-    to = plus(to, len ? len : len = length(list));
+    to = plus(to, len ? len : (len = length(list)));
 
   if (!to || (len && ge(to, len)))  {
     if (from && zerop(from)) {