diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-11-18 12:10:26 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-11-18 12:10:26 (GMT) |
| commit | 450b6f46c96b96bec44fb0bc119e3d11f3434f4a (patch) | |
| tree | 5f4ccb4d3df569fcd06e804ff1b5ebd8a72505bb /generic/tclUtil.c | |
| parent | 4d9fc11c2ffbcc95218111734c64397df0dfcf63 (diff) | |
| parent | edcac92c086fa48aff50db9763afecbed00c2a37 (diff) | |
| download | tcl-450b6f46c96b96bec44fb0bc119e3d11f3434f4a.zip tcl-450b6f46c96b96bec44fb0bc119e3d11f3434f4a.tar.gz tcl-450b6f46c96b96bec44fb0bc119e3d11f3434f4a.tar.bz2 | |
merge novem
Diffstat (limited to 'generic/tclUtil.c')
| -rw-r--r-- | generic/tclUtil.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/generic/tclUtil.c b/generic/tclUtil.c index 2cc0fbc..f230094 100644 --- a/generic/tclUtil.c +++ b/generic/tclUtil.c @@ -1920,7 +1920,7 @@ Tcl_ConcatObj( if (TclListObjIsCanonical(objPtr)) { continue; } - Tcl_GetString(objPtr); + TclGetString(objPtr); length = objPtr->length; if (length > 0) { break; @@ -2628,7 +2628,7 @@ TclDStringAppendObj( Tcl_DString *dsPtr, Tcl_Obj *objPtr) { - char *bytes = Tcl_GetString(objPtr); + char *bytes = TclGetString(objPtr); return Tcl_DStringAppend(dsPtr, bytes, objPtr->length); } @@ -2875,7 +2875,7 @@ Tcl_DStringGetResult( * of interp. */ { Tcl_Obj *obj = Tcl_GetObjResult(interp); - char *bytes = Tcl_GetString(obj); + char *bytes = TclGetString(obj); Tcl_DStringFree(dsPtr); Tcl_DStringAppend(dsPtr, bytes, obj->length); @@ -3524,7 +3524,7 @@ TclGetIntForIndex( parseError: if (interp != NULL) { - bytes = Tcl_GetString(objPtr); + bytes = TclGetString(objPtr); Tcl_SetObjResult(interp, Tcl_ObjPrintf( "bad index \"%s\": must be integer?[+-]integer? or" " end?[+-]integer?", bytes)); @@ -3817,10 +3817,10 @@ TclSetProcessGlobalValue( } else { Tcl_CreateExitHandler(FreeProcessGlobalValue, pgvPtr); } - bytes = Tcl_GetString(newValue); + bytes = TclGetString(newValue); pgvPtr->numBytes = newValue->length; pgvPtr->value = ckalloc(pgvPtr->numBytes + 1); - memcpy(pgvPtr->value, bytes, (unsigned) pgvPtr->numBytes + 1); + memcpy(pgvPtr->value, bytes, pgvPtr->numBytes + 1); if (pgvPtr->encoding) { Tcl_FreeEncoding(pgvPtr->encoding); } @@ -3895,7 +3895,7 @@ TclGetProcessGlobalValue( } } cacheMap = GetThreadHash(&pgvPtr->key); - hPtr = Tcl_FindHashEntry(cacheMap, (char *) INT2PTR(epoch)); + hPtr = Tcl_FindHashEntry(cacheMap, (void *) (epoch)); if (NULL == hPtr) { int dummy; @@ -4012,7 +4012,7 @@ const char * Tcl_GetNameOfExecutable(void) { Tcl_Obj *obj = TclGetObjNameOfExecutable(); - const char *bytes = Tcl_GetString(obj); + const char *bytes = TclGetString(obj); if (obj->length == 0) { return NULL; |