[gdb/testsuite, tclint] Fix gdb.server some more

Running tclint on the test-cases in gdb.server shows a few problems.

Fix these.

Tested on x86_64-linux.

diff --git a/gdb/testsuite/gdb.server/inferior-args.exp b/gdb/testsuite/gdb.server/inferior-args.exp
index 9c33874a9e5bd804f8936b7db2a8e24c512cf156..18ac5a39f94342503a2c03d4569484853d3089c7 100644 (file)
--- a/gdb/testsuite/gdb.server/inferior-args.exp
+++ b/gdb/testsuite/gdb.server/inferior-args.exp
@@ -91,7 +91,7 @@ proc do_test_inner { extended_p with_shell_p escape_p arglist re_list } {
     gdb_breakpoint main
     gdb_continue_to_breakpoint main
 
-    set expected_len [expr 1 + [llength $re_list]]
+    set expected_len [expr {1 + [llength $re_list]}]
     gdb_test "print argc" \
        "\\\$$::decimal = $expected_len" "check argc"
 
@@ -100,7 +100,7 @@ proc do_test_inner { extended_p with_shell_p escape_p arglist re_list } {
        gdb_test "print argv\[$i\]" \
            "\\\$$::decimal = $::hex \"$arg\"" \
            "check argv\[$i\]"
-       set i [expr $i + 1]
+       incr i
     }
 }