summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2011-05-23 16:08:47 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2011-05-23 16:08:47 +0000
commit29d0aa8ef8d4a996505ec48f698895836a0f3b56 (patch)
tree9da7e5924e90ea33c1ed39f225ca843c907ce65a
parente051cb908ffcddf82e5a2e6812272bdec0d236a3 (diff)
downloadzsh-29d0aa8ef8d4a996505ec48f698895836a0f3b56.tar.gz
zsh-29d0aa8ef8d4a996505ec48f698895836a0f3b56.tar.xz
zsh-29d0aa8ef8d4a996505ec48f698895836a0f3b56.zip
29351: casts needed to pass integers through stdarg
-rw-r--r--ChangeLog5
-rw-r--r--Src/subst.c5
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e4940aa29..fe3dc939a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-05-23  Peter Stephenson  <pws@csr.com>
 
+	* 29351: Src/subst.c: need to cast non-integer
+	stdarg arguments to integer to fit % prototype.
+
 	* unposted: Config/version.mk: 4.3.11-dev-4.
 
 	* unposted: Completion/Unix/Command/_go: typo
@@ -14786,5 +14789,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5319 $
+* $Revision: 1.5320 $
 *****************************************************
diff --git a/Src/subst.c b/Src/subst.c
index 5628c11d2..f9c48404b 100644
--- a/Src/subst.c
+++ b/Src/subst.c
@@ -2892,7 +2892,7 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int ssub)
 			    length += alen - offset;
 			if (length < 0) {
 			    zerr("substring expression: %d < %d",
-			         length + offset, offset);
+			         (int)(length + offset), (int)offset);
 			    return NULL;
 			}
 		    } else
@@ -2942,7 +2942,8 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int ssub)
 			    }
 			    if (length < 0) {
 				zerr("substring expression: %d < %d",
-				     length + given_offset, given_offset);
+				     (int)(length + given_offset),
+				     (int)given_offset);
 				return NULL;
 			    }
 			}