diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-07-02 19:39:34 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-07-02 19:39:34 (GMT) |
| commit | 79f1d89388b7f8956b21b3f074ed61cf941bfef5 (patch) | |
| tree | 2e6e4d5347aaf54008d46f6a19736a346ea766cf /generic/tclStringObj.c | |
| parent | b8e604ca082e309711235f3230402d582ef5a7a9 (diff) | |
| download | tcl-79f1d89388b7f8956b21b3f074ed61cf941bfef5.zip tcl-79f1d89388b7f8956b21b3f074ed61cf941bfef5.tar.gz tcl-79f1d89388b7f8956b21b3f074ed61cf941bfef5.tar.bz2 | |
Use size_t in more API's, e.g. *RegExp* types
Diffstat (limited to 'generic/tclStringObj.c')
| -rw-r--r-- | generic/tclStringObj.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c index 36d169a..26634da 100644 --- a/generic/tclStringObj.c +++ b/generic/tclStringObj.c @@ -2947,7 +2947,8 @@ TclStringCat( int flags) { Tcl_Obj *objResultPtr, * const *ov; - int oc, length = 0, binary = 1; + int oc, binary = 1; + size_t length = 0; int allowUniChar = 1, requestUniChar = 0; int first = objc - 1; /* Index of first value possibly not empty */ int last = 0; /* Index of last value possibly not empty */ @@ -3069,7 +3070,7 @@ TclStringCat( /* No string rep; Take the chance we can avoid making it */ pendingPtr = objPtr; } else { - Tcl_GetStringFromObj(objPtr, &length); /* PANIC? */ + (void *)TclGetStringFromObj(objPtr, &length); /* PANIC? */ } } while (--oc && (length == 0) && (pendingPtr == NULL)); @@ -3103,7 +3104,7 @@ TclStringCat( last = objc -oc -1; } if (oc || numBytes) { - Tcl_GetStringFromObj(pendingPtr, &length); + (void)TclGetStringFromObj(pendingPtr, &length); } if (length == 0) { if (numBytes) { @@ -3228,11 +3229,11 @@ TclStringCat( char *dst; if (inPlace && !Tcl_IsShared(*objv)) { - int start; + size_t start; objResultPtr = *objv++; objc--; - Tcl_GetStringFromObj(objResultPtr, &start); + (void)TclGetStringFromObj(objResultPtr, &start); if (0 == Tcl_AttemptSetObjLength(objResultPtr, length)) { if (interp) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( @@ -3264,8 +3265,8 @@ TclStringCat( Tcl_Obj *objPtr = *objv++; if ((objPtr->bytes == NULL) || (objPtr->length)) { - int more; - char *src = Tcl_GetStringFromObj(objPtr, &more); + size_t more; + char *src = TclGetStringFromObj(objPtr, &more); memcpy(dst, src, (size_t) more); dst += more; |