summaryrefslogtreecommitdiffstats
path: root/src/bltOp.C
diff options
context:
space:
mode:
authorjoye <joye>2015-06-24 21:04:55 (GMT)
committerjoye <joye>2015-06-24 21:04:55 (GMT)
commit1532d0ed55d2c814c83bb5798eeb34cc25869304 (patch)
tree0aafca012f06dcd017d768b585fd026da983d81c /src/bltOp.C
parent821e38f363b36d8ce19b6af6f5940db4f2adbadd (diff)
downloadblt-1532d0ed55d2c814c83bb5798eeb34cc25869304.zip
blt-1532d0ed55d2c814c83bb5798eeb34cc25869304.tar.gz
blt-1532d0ed55d2c814c83bb5798eeb34cc25869304.tar.bz2
*** empty log message ***
Diffstat (limited to 'src/bltOp.C')
-rw-r--r--src/bltOp.C17
1 files changed, 7 insertions, 10 deletions
diff --git a/src/bltOp.C b/src/bltOp.C
index d52c133..aee1bff 100644
--- a/src/bltOp.C
+++ b/src/bltOp.C
@@ -71,9 +71,8 @@ static int LinearOpSearch(Blt_OpSpec *specs, int nSpecs, const char *string,
char c = string[0];
int nMatches = 0;
int last = -1;
- int i;
- Blt_OpSpec *specPtr;
- for (specPtr = specs, i = 0; i < nSpecs; i++, specPtr++) {
+ int i =0;
+ for (Blt_OpSpec *specPtr = specs; i<nSpecs; i++, specPtr++) {
if ((c == specPtr->name[0]) &&
(strncmp(string, specPtr->name, length) == 0)) {
last = i;
@@ -104,11 +103,9 @@ void* Blt::GetOpFromObj(Tcl_Interp* interp, int nSpecs, Blt_OpSpec *specs,
usage:
Tcl_AppendResult(interp, "should be one of...", (char *)NULL);
for (n = 0; n < nSpecs; n++) {
- int i;
-
Tcl_AppendResult(interp, "\n ", (char *)NULL);
- for (i = 0; i < operPos; i++) {
- Tcl_AppendResult(interp, Tcl_GetString(objv[i]), " ",
+ for (int ii = 0; ii < operPos; ii++) {
+ Tcl_AppendResult(interp, Tcl_GetString(objv[ii]), " ",
(char *)NULL);
}
specPtr = specs + n;
@@ -120,11 +117,11 @@ void* Blt::GetOpFromObj(Tcl_Interp* interp, int nSpecs, Blt_OpSpec *specs,
int length;
const char* string = Tcl_GetStringFromObj(objv[operPos], &length);
- if (flags & BLT_OP_LINEAR_SEARCH) {
+ if (flags & BLT_OP_LINEAR_SEARCH)
n = LinearOpSearch(specs, nSpecs, string, length);
- } else {
+ else
n = BinaryOpSearch(specs, nSpecs, string, length);
- }
+
if (n == -2) {
char c;