aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorantirez <antirez>2005-03-03 10:34:38 +0000
committerantirez <antirez>2005-03-03 10:34:38 +0000
commit482f075fe6602d409a789003655c27cb051f17fd (patch)
tree5ff2adecd755b54ae65f3070b43d5d55ef28166e
parent4c5fcfa101076458951e5471939dfe422334ba14 (diff)
downloadjimtcl-482f075fe6602d409a789003655c27cb051f17fd.zip
jimtcl-482f075fe6602d409a789003655c27cb051f17fd.tar.gz
jimtcl-482f075fe6602d409a789003655c27cb051f17fd.tar.bz2
const removed from Jim_GetString().
-rw-r--r--jim.c16
-rw-r--r--jim.h10
2 files changed, 13 insertions, 13 deletions
diff --git a/jim.c b/jim.c
index 3212d35..ebc8f1f 100644
--- a/jim.c
+++ b/jim.c
@@ -1771,7 +1771,7 @@ Jim_Obj *Jim_DuplicateObj(Jim_Interp *interp, Jim_Obj *objPtr)
/* Return the string representation for objPtr. If the object
* string representation is invalid, calls the method to create
* a new one starting from the internal representation of the object. */
-const char *Jim_GetString(const Jim_Obj *objPtr, int *lenPtr)
+const char *Jim_GetString(Jim_Obj *objPtr, int *lenPtr)
{
if (objPtr->bytes == NULL) {
/* Invalid string repr. Generate it. */
@@ -1779,7 +1779,7 @@ const char *Jim_GetString(const Jim_Obj *objPtr, int *lenPtr)
Jim_Panic("UpdataStringProc called against '%s' type.",
objPtr->typePtr->name);
}
- objPtr->typePtr->updateStringProc((Jim_Obj*)objPtr);
+ objPtr->typePtr->updateStringProc(objPtr);
}
if (lenPtr)
*lenPtr = objPtr->length;
@@ -1927,7 +1927,7 @@ void Jim_AppendStrings(Jim_Interp *interp, Jim_Obj *objPtr, ...)
va_end(ap);
}
-int Jim_StringEqObj(const Jim_Obj *aObjPtr, const Jim_Obj *bObjPtr, int nocase)
+int Jim_StringEqObj(Jim_Obj *aObjPtr, Jim_Obj *bObjPtr, int nocase)
{
const char *aStr, *bStr;
int aLen, bLen, i;
@@ -1945,7 +1945,7 @@ int Jim_StringEqObj(const Jim_Obj *aObjPtr, const Jim_Obj *bObjPtr, int nocase)
return 1;
}
-int Jim_StringMatchObj(const Jim_Obj *patternObjPtr, const Jim_Obj *objPtr,
+int Jim_StringMatchObj(Jim_Obj *patternObjPtr, Jim_Obj *objPtr,
int nocase)
{
const char *pattern, *string;
@@ -1956,8 +1956,8 @@ int Jim_StringMatchObj(const Jim_Obj *patternObjPtr, const Jim_Obj *objPtr,
return JimStringMatch(pattern, patternLen, string, stringLen, nocase);
}
-int Jim_StringCompareObj(const Jim_Obj *firstObjPtr,
- const Jim_Obj *secondObjPtr, int nocase)
+int Jim_StringCompareObj(Jim_Obj *firstObjPtr,
+ Jim_Obj *secondObjPtr, int nocase)
{
const char *s1, *s2;
int l1, l2;
@@ -4572,7 +4572,7 @@ unsigned int JimObjectHTHashFunction(const void *key)
const char *str;
int len;
- str = Jim_GetString(key, &len);
+ str = Jim_GetString((Jim_Obj*)key, &len); /* ATTENTION: const cast */
return Jim_DjbHashFunction(str, len);
}
@@ -4580,7 +4580,7 @@ int JimObjectHTKeyCompare(void *privdata, const void *key1, const void *key2)
{
privdata = privdata; /* not used */
- return Jim_StringEqObj(key1, key2, 0);
+ return Jim_StringEqObj((Jim_Obj*)key1, (Jim_Obj*)key2, 0);
}
static void JimObjectHTKeyValDestructor(void *interp, void *val)
diff --git a/jim.h b/jim.h
index 4ac60b6..3a2e9b9 100644
--- a/jim.h
+++ b/jim.h
@@ -523,7 +523,7 @@ JIM_STATIC void JIM_API(Jim_InitStringRep) (Jim_Obj *objPtr, const char *bytes,
int length);
JIM_STATIC Jim_Obj * JIM_API(Jim_DuplicateObj) (Jim_Interp *interp,
Jim_Obj *objPtr);
-JIM_STATIC const char * JIM_API(Jim_GetString)(const Jim_Obj *objPtr,
+JIM_STATIC const char * JIM_API(Jim_GetString)(Jim_Obj *objPtr,
int *lenPtr);
JIM_STATIC void JIM_API(Jim_InvalidateStringRep)(Jim_Obj *objPtr);
@@ -538,10 +538,10 @@ JIM_STATIC void JIM_API(Jim_AppendObj) (Jim_Interp *interp, Jim_Obj *objPtr,
Jim_Obj *appendObjPtr);
JIM_STATIC void JIM_API(Jim_AppendStrings) (Jim_Interp *interp,
Jim_Obj *objPtr, ...);
-JIM_STATIC int JIM_API(Jim_StringEqObj) (const Jim_Obj *aObjPtr,
- const Jim_Obj *bObjPtr, int nocase);
-JIM_STATIC int JIM_API(Jim_StringMatchObj) (const Jim_Obj *patternObjPtr,
- const Jim_Obj *objPtr, int nocase);
+JIM_STATIC int JIM_API(Jim_StringEqObj) (Jim_Obj *aObjPtr,
+ Jim_Obj *bObjPtr, int nocase);
+JIM_STATIC int JIM_API(Jim_StringMatchObj) (Jim_Obj *patternObjPtr,
+ Jim_Obj *objPtr, int nocase);
JIM_STATIC Jim_Obj * JIM_API(Jim_StringRangeObj) (Jim_Interp *interp,
Jim_Obj *strObjPtr, Jim_Obj *firstObjPtr,
Jim_Obj *lastObjPtr);