aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Bennett <steveb@workware.net.au>2014-01-17 11:10:00 +1000
committerSteve Bennett <steveb@workware.net.au>2014-01-17 11:12:00 +1000
commit3cdf03ea83a1605639f86ee675743f7007fb5751 (patch)
treef0ae507451f1325869448c448a4c97272bf0f287
parentf24e0bdfd4e90f255285cb56c4f79acccd9f470d (diff)
downloadjimtcl-3cdf03ea83a1605639f86ee675743f7007fb5751.zip
jimtcl-3cdf03ea83a1605639f86ee675743f7007fb5751.tar.gz
jimtcl-3cdf03ea83a1605639f86ee675743f7007fb5751.tar.bz2
format: fix format %hd on some platforms
Signed-off-by: Steve Bennett <steveb@workware.net.au>
-rw-r--r--jim-format.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/jim-format.c b/jim-format.c
index 8bb4e9e..9ea0b51 100644
--- a/jim-format.c
+++ b/jim-format.c
@@ -381,7 +381,6 @@ Jim_Obj *Jim_FormatString(Jim_Interp *interp, Jim_Obj *fmtObjPtr, int objc, Jim_
}
length = JIM_INTEGER_SPACE;
if (useShort) {
- *p++ = 'h';
if (ch == 'd') {
w = (short)w;
}
@@ -389,14 +388,12 @@ Jim_Obj *Jim_FormatString(Jim_Interp *interp, Jim_Obj *fmtObjPtr, int objc, Jim_
w = (unsigned short)w;
}
}
- else {
- *p++ = 'l';
+ *p++ = 'l';
#ifdef HAVE_LONG_LONG
- if (sizeof(long long) == sizeof(jim_wide)) {
- *p++ = 'l';
- }
-#endif
+ if (sizeof(long long) == sizeof(jim_wide)) {
+ *p++ = 'l';
}
+#endif
}
*p++ = (char) ch;