[Tclresource-commits] Source tclResourceOSX.c,1.10,1.11

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

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

Modified Files:
	tclResourceOSX.c 
Log Message:
resId's should always be short

Index: tclResourceOSX.c
===================================================================
RCS file: /cvsroot/tclresource/Source/tclResourceOSX.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- tclResourceOSX.c	4 Sep 2004 16:29:03 -0000	1.10
+++ tclResourceOSX.c	4 Sep 2004 16:47:21 -0000	1.11
@@ -338,7 +338,7 @@
     Tcl_Obj *resultPtr)			/* Pointer to store the result. */
 {
     int index, result, gotInt, gotValue, length, newValue;
-    long rsrcId;
+    short rsrcId;
     short saveRef, theAttrs;
     char *resourceId = NULL;
     char buffer[16];
@@ -423,7 +423,7 @@
 
 	    switch (index) {
 		case RESOURCE_ATTRIBUTES_ID:		
-		    if (Tcl_GetLongFromObj(interp, objv[4], &rsrcId)
+		    if (Tcl_GetIntFromObj(interp, objv[4], &rsrcId)
 			    != TCL_OK) {
 			return TCL_ERROR;
 		    }
@@ -636,7 +636,7 @@
     int index, result, gotInt;
     int i, limitSearch, length;
     short saveRef, resInfo;
-    long fileRef, rsrcId;
+    short fileRef, rsrcId;
     char *resourceId = NULL;	
     OpenResourceFork *resourceRef;
     Handle resource = NULL;
@@ -670,7 +670,7 @@
 
 		switch (index) {
 		    case RESOURCE_DELETE_ID:		
-			if (Tcl_GetLongFromObj(interp, objv[i+1], &rsrcId)
+			if (Tcl_GetIntFromObj(interp, objv[i+1], &rsrcId)
 				!= TCL_OK) {
 			    return TCL_ERROR;
 			}
@@ -991,7 +991,7 @@
     Tcl_Obj *CONST objv[],		/* Argument values. */
     Tcl_Obj *resultPtr)			/* Pointer to store the result. */
 {
-    short rsrcId = 0;  /* A short, not a long. Reverse from ResourceNameObjCmd */
+    short rsrcId = 0;
     int length, releaseIt = 0;
     char *stringPtr;
     char *resourceId = NULL;	
@@ -1185,7 +1185,7 @@
     Tcl_Obj *CONST objv[],		/* Argument values. */
     Tcl_Obj *resultPtr)			/* Pointer to store the result. */
 {
-    long rsrcId;  /* A long, not a short. Reverse from ResourceIdObjCmd */
+    short rsrcId;
     int length, releaseIt = 0;
     char *stringPtr;
     Handle resource = NULL;
@@ -1204,7 +1204,7 @@
 		return TCL_ERROR;
 	    }
 	    
-	    if (Tcl_GetLongFromObj(interp, objv[3], &rsrcId)
+	    if (Tcl_GetIntFromObj(interp, objv[3], &rsrcId)
 		    != TCL_OK) {
 		Tcl_AppendStringsToObj(resultPtr,
 			"wrong third argument: expected integer",
@@ -1597,7 +1597,8 @@
     Tcl_Obj *CONST objv[],		/* Argument values. */
     Tcl_Obj *resultPtr)			/* Pointer to store the result. */
 {
-    long rsrcId, size;
+    long size;
+	short rsrcId;
     int length, releaseIt = 0;
     char *stringPtr;
     char *resourceId = NULL;	
@@ -1614,7 +1615,7 @@
 		return TCL_ERROR;
 	    }
 	    
-	    if (Tcl_GetLongFromObj((Tcl_Interp *) NULL, objv[3], &rsrcId)
+	    if (Tcl_GetIntFromObj((Tcl_Interp *) NULL, objv[3], &rsrcId)
 		    != TCL_OK) {
 		resourceId = Tcl_GetStringFromObj(objv[3], &length);
             }
@@ -1811,7 +1812,7 @@
 {
     int index, result, gotInt, releaseIt = 0, force;
     int i, limitSearch, length;
-    long rsrcId;
+    short rsrcId;
     short saveRef;
     char *stringPtr;
     char *resourceId = NULL;	
@@ -1854,7 +1855,7 @@
 		
 		switch (index) {
 			case RESOURCE_WRITE_ID:		
-			if (Tcl_GetLongFromObj(interp, objv[i+1], &rsrcId)
+			if (Tcl_GetIntFromObj(interp, objv[i+1], &rsrcId)
 				!= TCL_OK) {
 				return TCL_ERROR;
 			}
@@ -1936,7 +1937,7 @@
 		HLock(resource);
 		memcpy(*resource, stringPtr, length);
 		HUnlock(resource);
-		AddResource(resource, rezType, (short) rsrcId, (StringPtr) resourceId);
+		AddResource(resource, rezType, rsrcId, (StringPtr) resourceId);
 		releaseIt = 1;
 	} else {
 		/*