aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Bennett <steveb@workware.net.au>2017-03-03 07:15:44 +1000
committerSteve Bennett <steveb@workware.net.au>2017-03-03 07:17:05 +1000
commit4204f3100253afc3f94be9624231f5c47ef5591a (patch)
tree65544c2aa041cdad62d6d89cee695bb2a4bcf7ed
parentf2601486583192dd5fc2838be7e3be211f674d26 (diff)
downloadjimtcl-4204f3100253afc3f94be9624231f5c47ef5591a.zip
jimtcl-4204f3100253afc3f94be9624231f5c47ef5591a.tar.gz
jimtcl-4204f3100253afc3f94be9624231f5c47ef5591a.tar.bz2
Fix some declarations after code
For the benefit of C89 compilers. Signed-off-by: Steve Bennett <steveb@workware.net.au>
-rw-r--r--jim-interactive.c3
-rw-r--r--jim-tclprefix.c4
-rw-r--r--jim.c5
3 files changed, 7 insertions, 5 deletions
diff --git a/jim-interactive.c b/jim-interactive.c
index d263e83..8a18092 100644
--- a/jim-interactive.c
+++ b/jim-interactive.c
@@ -94,11 +94,12 @@ void JimCompletionCallback(const char *prefix, linenoiseCompletions *comp, void
{
struct JimCompletionInfo *info = (struct JimCompletionInfo *)userdata;
Jim_Obj *objv[2];
+ int ret;
objv[0] = info->command;
objv[1] = Jim_NewStringObj(info->interp, prefix, -1);
- int ret = Jim_EvalObjVector(info->interp, 2, objv);
+ ret = Jim_EvalObjVector(info->interp, 2, objv);
/* XXX: Consider how best to handle errors here. bgerror? */
if (ret == JIM_OK) {
diff --git a/jim-tclprefix.c b/jim-tclprefix.c
index d7a1c45..6434499 100644
--- a/jim-tclprefix.c
+++ b/jim-tclprefix.c
@@ -156,11 +156,11 @@ static int Jim_TclPrefixCoreCommand(Jim_Interp *interp, int argc, Jim_Obj *const
else if (Jim_ListLength(interp, argv[2])) {
const char *longeststr = NULL;
int longestlen = 0;
+ int i;
+ int listlen = Jim_ListLength(interp, argv[2]);
stringObj = argv[3];
- int i;
- int listlen = Jim_ListLength(interp, argv[2]);
for (i = 0; i < listlen; i++) {
Jim_Obj *valObj = Jim_ListGetIndex(interp, argv[2], i);
diff --git a/jim.c b/jim.c
index f35865f..291c9ac 100644
--- a/jim.c
+++ b/jim.c
@@ -14356,6 +14356,8 @@ int Jim_DictInfo(Jim_Interp *interp, Jim_Obj *objPtr)
char buffer[100];
int sum = 0;
int nonzero_count = 0;
+ Jim_Obj *output;
+ int bucket_counts[11] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
if (SetDictFromAny(interp, objPtr) != JIM_OK) {
return JIM_ERR;
@@ -14365,9 +14367,8 @@ int Jim_DictInfo(Jim_Interp *interp, Jim_Obj *objPtr)
/* Note that this uses internal knowledge of the hash table */
snprintf(buffer, sizeof(buffer), "%d entries in table, %d buckets\n", ht->used, ht->size);
- Jim_Obj *output = Jim_NewStringObj(interp, buffer, -1);
+ output = Jim_NewStringObj(interp, buffer, -1);
- int bucket_counts[11] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
for (i = 0; i < ht->size; i++) {
Jim_HashEntry *he = ht->table[i];
int entries = 0;