summary refs log tree commit diff
diff options
context:
space:
mode:
authorClint Adams <clint@users.sourceforge.net>2006-09-18 03:40:40 +0000
committerClint Adams <clint@users.sourceforge.net>2006-09-18 03:40:40 +0000
commit1554b8105322defdb7df5580d84a40490597711f (patch)
treebdf45de4acec9894af8aaefaa49c7fec4e240d5b
parenta7c0640c0a3b9ce7290b1c78a08eec7ed330ca67 (diff)
downloadzsh-1554b8105322defdb7df5580d84a40490597711f.tar.gz
zsh-1554b8105322defdb7df5580d84a40490597711f.tar.xz
zsh-1554b8105322defdb7df5580d84a40490597711f.zip
operator precedence fix
-rw-r--r--ChangeLog2
-rw-r--r--Src/Modules/parameter.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index edd47c516..84a0d322a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 2006-09-17  Clint Adams  <clint@zsh.org>
 
-	* 22728: Doc/Zsh/mod_parameter.yo, Src/Modules/parameter.c,
+	* 22728, 22734: Doc/Zsh/mod_parameter.yo, Src/Modules/parameter.c,
 	Src/Modules/parameter.mdd, Src/exec.c, Src/zsh.h: $functrace
 	parameter for function backtraces.
 
diff --git a/Src/Modules/parameter.c b/Src/Modules/parameter.c
index cec31d5cb..d9b8d1b4f 100644
--- a/Src/Modules/parameter.c
+++ b/Src/Modules/parameter.c
@@ -568,7 +568,7 @@ functracegetfn(UNUSED(Param pm))
     for (f = funcstack, p = ret; f; f = f->prev, p++) {
 	char *colonpair;
 
-	colonpair = zhalloc(strlen(f->caller) + f->lineno > 9999 ? 24 : 6);
+	colonpair = zhalloc(strlen(f->caller) + (f->lineno > 9999 ? 24 : 6));
 	sprintf(colonpair, "%s:%d", f->caller, f->lineno);
 
 	*p = colonpair;