[Tcladdressbook-commits] Source TclAddressBook.c,1.41,1.42

[Bernard D. <bde...@us...>]

Update of /cvsroot/tcladdressbook/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5030/Source

Modified Files:
	TclAddressBook.c 
Log Message:
ABSearchComparison explicit cast

Index: TclAddressBook.c
===================================================================
RCS file: /cvsroot/tcladdressbook/Source/TclAddressBook.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- TclAddressBook.c	9 Sep 2004 05:40:17 -0000	1.41
+++ TclAddressBook.c	30 Mar 2005 16:56:13 -0000	1.42
@@ -1,7 +1,7 @@
 /* 
  * File : "TclAddressBook.c"
  *                        Created: 2003-11-26 12:54:15
- *              Last modification: 2004-09-09 06:26:17
+ *              Last modification: 2004-08-08 22:27:19
  * Author: Bernard Desgraupes
  * e-mail: <bde...@ea...>
  *  
@@ -159,7 +159,7 @@
 		TCLAB_SEARCH, TCLAB_SET, TCLAB_SETME, TCLAB_TYPE 
 	};
 	
-	resultPtr = Tcl_NewObj();
+	resultPtr = Tcl_GetObjResult(interp);
 	
 	if (objc < 2) {
 		Tcl_WrongNumArgs(interp, 1, objv, "subcommand ?arg ...?");
@@ -264,8 +264,6 @@
 		panic("Tcl_GetIndexFromObj returned unrecognized subcommand");
 		result = TCL_ERROR;	/* Should never be reached. */
 	}
-	
-	Tcl_SetObjResult(interp, resultPtr);
 	return result;
 }
 
@@ -1777,14 +1775,14 @@
 		  if (!isNumeric && noCase) {
 			  comparison = kABEqualCaseInsensitive;
 		  } else {
-			  comparison = opIndex;
+			  comparison = (ABSearchComparison) opIndex;
 		  }
 		  break;
 		
 	  case TCLAB_SEARCHOP_GREATERTHAN:
 	  case TCLAB_SEARCHOP_GREATERTHANOREQUAL:
 		  if (isNumeric) {
-			  comparison = opIndex;
+			  comparison = (ABSearchComparison) opIndex;
 		  } else if (noCase) {
 			  comparison = kABContainsSubStringCaseInsensitive;
 		  } else {
@@ -1805,7 +1803,7 @@
 	  case TCLAB_SEARCHOP_NOTEQUAL:
 	  case TCLAB_SEARCHOP_LESSTHAN:
 	  case TCLAB_SEARCHOP_LESSTHANOREQUAL:
-		  comparison = opIndex;
+		  comparison = (ABSearchComparison) opIndex;
 		  break;
 	}