summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2012-03-26 07:11:58 -0700
committerKaz Kylheku <kaz@kylheku.com>2012-03-26 07:11:58 -0700
commit7892a9800b16ed13e59f92f236dfc373762c0048 (patch)
tree1785508318e9842f6452de6884b079fb46bd46d6
parent97f8a48e8aca3ab9837051d0d07e129fa41d7f17 (diff)
downloadtxr-7892a9800b16ed13e59f92f236dfc373762c0048.tar.gz
txr-7892a9800b16ed13e59f92f236dfc373762c0048.tar.bz2
txr-7892a9800b16ed13e59f92f236dfc373762c0048.zip
* arith.c (to_float): Fix unterminated argument list in throwf.
* lib.c (funcall): Likewise.
-rw-r--r--ChangeLog6
-rw-r--r--arith.c2
-rw-r--r--lib.c2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index dc46ec3e..c57dd97d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-03-26 Kaz Kylheku <kaz@kylheku.com>
+
+ * arith.c (to_float): Fix unterminated argument list in throwf.
+
+ * lib.c (funcall): Likewise.
+
2012-03-24 Kaz Kylheku <kaz@kylheku.com>
* lib.c (rebind_s): New symbol variable.
diff --git a/arith.c b/arith.c
index 4ee87055..5dd42347 100644
--- a/arith.c
+++ b/arith.c
@@ -890,7 +890,7 @@ static val to_float(val func, val num)
case FLNUM:
return num;
default:
- uw_throwf(error_s, lit("~s: invalid operand ~s"), func, num);
+ uw_throwf(error_s, lit("~s: invalid operand ~s"), func, num, nao);
}
}
diff --git a/lib.c b/lib.c
index 437b4eec..a0872cf8 100644
--- a/lib.c
+++ b/lib.c
@@ -2616,7 +2616,7 @@ val funcall(val fun)
break;
}
}
- uw_throwf(error_s, lit("funcall: wrong number of arguments"));
+ uw_throw(error_s, lit("funcall: wrong number of arguments"));
}
val funcall1(val fun, val arg)