summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
Diffstat (limited to 'generic')
-rw-r--r--generic/tcl.decls6
-rw-r--r--generic/tclBinary.c14
-rw-r--r--generic/tclDecls.h6
-rw-r--r--generic/tclIO.c2
-rw-r--r--generic/tclInt.decls5
-rw-r--r--generic/tclIntDecls.h10
-rw-r--r--generic/tclStubInit.c4
-rw-r--r--generic/tclTest.c2
-rw-r--r--generic/tclZipfs.c2
-rw-r--r--generic/tclZlib.c24
10 files changed, 38 insertions, 37 deletions
diff --git a/generic/tcl.decls b/generic/tcl.decls
index e49ed66..93f3ff4 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -2402,6 +2402,12 @@ declare 648 {
int length, Tcl_DString *dsPtr)
}
+# TIP #568
+declare 649 {
+ unsigned char *Tcl_GetBytesFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
+ int *lengthPtr)
+}
+
# ----- BASELINE -- FOR -- 8.7.0 ----- #
##############################################################################
diff --git a/generic/tclBinary.c b/generic/tclBinary.c
index 168d399..806bd58 100644
--- a/generic/tclBinary.c
+++ b/generic/tclBinary.c
@@ -440,7 +440,7 @@ Tcl_SetByteArrayObj(
/*
*----------------------------------------------------------------------
*
- * TclGetBytesFromObj --
+ * Tcl_GetBytesFromObj --
*
* Attempt to extract the value from objPtr in the representation
* of a byte sequence. On success return the extracted byte sequence.
@@ -455,7 +455,7 @@ Tcl_SetByteArrayObj(
*/
unsigned char *
-TclGetBytesFromObj(
+Tcl_GetBytesFromObj(
Tcl_Interp *interp, /* For error reporting */
Tcl_Obj *objPtr, /* Value to extract from */
int *lengthPtr) /* If non-NULL, filled with length of the
@@ -519,7 +519,7 @@ Tcl_GetByteArrayFromObj(
{
ByteArray *baPtr;
const Tcl_ObjIntRep *irPtr;
- unsigned char *result = TclGetBytesFromObj(NULL, objPtr, lengthPtr);
+ unsigned char *result = Tcl_GetBytesFromObj(NULL, objPtr, lengthPtr);
if (result) {
return result;
@@ -2616,7 +2616,7 @@ BinaryDecodeHex(
}
TclNewObj(resultObj);
- data = TclGetBytesFromObj(NULL, objv[objc - 1], &count);
+ data = Tcl_GetBytesFromObj(NULL, objv[objc - 1], &count);
if (data == NULL) {
pure = 0;
data = (unsigned char *) TclGetStringFromObj(objv[objc - 1], &count);
@@ -2748,7 +2748,7 @@ BinaryEncode64(
}
break;
case OPT_WRAPCHAR:
- wrapchar = (const char *)TclGetBytesFromObj(NULL,
+ wrapchar = (const char *)Tcl_GetBytesFromObj(NULL,
objv[i + 1], &wrapcharlen);
if (wrapchar == NULL) {
purewrap = 0;
@@ -3011,7 +3011,7 @@ BinaryDecodeUu(
}
TclNewObj(resultObj);
- data = TclGetBytesFromObj(NULL, objv[objc - 1], &count);
+ data = Tcl_GetBytesFromObj(NULL, objv[objc - 1], &count);
if (data == NULL) {
pure = 0;
data = (unsigned char *) TclGetStringFromObj(objv[objc - 1], &count);
@@ -3185,7 +3185,7 @@ BinaryDecode64(
}
TclNewObj(resultObj);
- data = TclGetBytesFromObj(NULL, objv[objc - 1], &count);
+ data = Tcl_GetBytesFromObj(NULL, objv[objc - 1], &count);
if (data == NULL) {
pure = 0;
data = (unsigned char *) TclGetStringFromObj(objv[objc - 1], &count);
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 9ea6838..57c1ca7 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -1920,6 +1920,9 @@ EXTERN char * Tcl_UniCharToUtfDString(const int *uniStr,
/* 648 */
EXTERN int * Tcl_UtfToUniCharDString(const char *src, int length,
Tcl_DString *dsPtr);
+/* 649 */
+EXTERN unsigned char * Tcl_GetBytesFromObj(Tcl_Interp *interp,
+ Tcl_Obj *objPtr, int *lengthPtr);
typedef struct {
const struct TclPlatStubs *tclPlatStubs;
@@ -2604,6 +2607,7 @@ typedef struct TclStubs {
int (*tcl_UtfToUniChar) (const char *src, int *chPtr); /* 646 */
char * (*tcl_UniCharToUtfDString) (const int *uniStr, int uniLength, Tcl_DString *dsPtr); /* 647 */
int * (*tcl_UtfToUniCharDString) (const char *src, int length, Tcl_DString *dsPtr); /* 648 */
+ unsigned char * (*tcl_GetBytesFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *lengthPtr); /* 649 */
} TclStubs;
extern const TclStubs *tclStubsPtr;
@@ -3932,6 +3936,8 @@ extern const TclStubs *tclStubsPtr;
(tclStubsPtr->tcl_UniCharToUtfDString) /* 647 */
#define Tcl_UtfToUniCharDString \
(tclStubsPtr->tcl_UtfToUniCharDString) /* 648 */
+#define Tcl_GetBytesFromObj \
+ (tclStubsPtr->tcl_GetBytesFromObj) /* 649 */
#endif /* defined(USE_TCL_STUBS) */
diff --git a/generic/tclIO.c b/generic/tclIO.c
index 7af6aa0..8c778d4 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -5863,7 +5863,7 @@ DoReadChars(
&& (statePtr->inEofChar == '\0');
if (appendFlag) {
- if (binaryMode && (NULL == TclGetBytesFromObj(NULL, objPtr, NULL))) {
+ if (binaryMode && (NULL == Tcl_GetBytesFromObj(NULL, objPtr, NULL))) {
binaryMode = 0;
}
} else {
diff --git a/generic/tclInt.decls b/generic/tclInt.decls
index 0addf66..4599bce 100644
--- a/generic/tclInt.decls
+++ b/generic/tclInt.decls
@@ -1036,11 +1036,6 @@ declare 258 {
}
declare 259 {
- unsigned char *TclGetBytesFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
- int *lengthPtr)
-}
-
-declare 260 {
void TclUnusedStubEntry(void)
}
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
index b698c08..2c5b292 100644
--- a/generic/tclIntDecls.h
+++ b/generic/tclIntDecls.h
@@ -659,9 +659,6 @@ EXTERN void TclStaticPackage(Tcl_Interp *interp,
EXTERN Tcl_Obj * TclpCreateTemporaryDirectory(Tcl_Obj *dirObj,
Tcl_Obj *basenameObj);
/* 259 */
-EXTERN unsigned char * TclGetBytesFromObj(Tcl_Interp *interp,
- Tcl_Obj *objPtr, int *lengthPtr);
-/* 260 */
EXTERN void TclUnusedStubEntry(void);
typedef struct TclIntStubs {
@@ -927,8 +924,7 @@ typedef struct TclIntStubs {
int (*tclPtrUnsetVar) (Tcl_Interp *interp, Tcl_Var varPtr, Tcl_Var arrayPtr, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, const int flags); /* 256 */
void (*tclStaticPackage) (Tcl_Interp *interp, const char *pkgName, Tcl_PackageInitProc *initProc, Tcl_PackageInitProc *safeInitProc); /* 257 */
Tcl_Obj * (*tclpCreateTemporaryDirectory) (Tcl_Obj *dirObj, Tcl_Obj *basenameObj); /* 258 */
- unsigned char * (*tclGetBytesFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *lengthPtr); /* 259 */
- void (*tclUnusedStubEntry) (void); /* 260 */
+ void (*tclUnusedStubEntry) (void); /* 259 */
} TclIntStubs;
extern const TclIntStubs *tclIntStubsPtr;
@@ -1374,10 +1370,8 @@ extern const TclIntStubs *tclIntStubsPtr;
(tclIntStubsPtr->tclStaticPackage) /* 257 */
#define TclpCreateTemporaryDirectory \
(tclIntStubsPtr->tclpCreateTemporaryDirectory) /* 258 */
-#define TclGetBytesFromObj \
- (tclIntStubsPtr->tclGetBytesFromObj) /* 259 */
#define TclUnusedStubEntry \
- (tclIntStubsPtr->tclUnusedStubEntry) /* 260 */
+ (tclIntStubsPtr->tclUnusedStubEntry) /* 259 */
#endif /* defined(USE_TCL_STUBS) */
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 5d79d7d..b6eb9da 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -983,8 +983,7 @@ static const TclIntStubs tclIntStubs = {
TclPtrUnsetVar, /* 256 */
TclStaticPackage, /* 257 */
TclpCreateTemporaryDirectory, /* 258 */
- TclGetBytesFromObj, /* 259 */
- TclUnusedStubEntry, /* 260 */
+ TclUnusedStubEntry, /* 259 */
};
static const TclIntPlatStubs tclIntPlatStubs = {
@@ -1872,6 +1871,7 @@ const TclStubs tclStubs = {
Tcl_UtfToUniChar, /* 646 */
Tcl_UniCharToUtfDString, /* 647 */
Tcl_UtfToUniCharDString, /* 648 */
+ Tcl_GetBytesFromObj, /* 649 */
};
/* !END!: Do not edit above this line. */
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 5ebbfdd..91d486e 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -5077,7 +5077,7 @@ TestbytestringObjCmd(
return TCL_ERROR;
}
- p = (const char *)TclGetBytesFromObj(interp, objv[1], &n);
+ p = (const char *)Tcl_GetBytesFromObj(interp, objv[1], &n);
if (p == NULL) {
return TCL_ERROR;
}
diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c
index 695c814..e90f286 100644
--- a/generic/tclZipfs.c
+++ b/generic/tclZipfs.c
@@ -1896,7 +1896,7 @@ ZipFSMountBufferObjCmd(
return TCL_OK;
}
- data = TclGetBytesFromObj(interp, objv[2], &length);
+ data = Tcl_GetBytesFromObj(interp, objv[2], &length);
if (data == NULL) {
return TCL_ERROR;
}
diff --git a/generic/tclZlib.c b/generic/tclZlib.c
index e70c4b3..40aa20f 100644
--- a/generic/tclZlib.c
+++ b/generic/tclZlib.c
@@ -1153,7 +1153,7 @@ Tcl_ZlibStreamSetCompressionDictionary(
{
ZlibStreamHandle *zshPtr = (ZlibStreamHandle *) zshandle;
- if (compressionDictionaryObj && (NULL == TclGetBytesFromObj(NULL,
+ if (compressionDictionaryObj && (NULL == Tcl_GetBytesFromObj(NULL,
compressionDictionaryObj, NULL))) {
/* Missing or invalid compression dictionary */
compressionDictionaryObj = NULL;
@@ -1208,7 +1208,7 @@ Tcl_ZlibStreamPut(
return TCL_ERROR;
}
- bytes = TclGetBytesFromObj(zshPtr->interp, data, &size);
+ bytes = Tcl_GetBytesFromObj(zshPtr->interp, data, &size);
if (bytes == NULL) {
return TCL_ERROR;
}
@@ -1338,7 +1338,7 @@ Tcl_ZlibStreamGet(
return TCL_OK;
}
- if (NULL == TclGetBytesFromObj(zshPtr->interp, data, &existing)) {
+ if (NULL == Tcl_GetBytesFromObj(zshPtr->interp, data, &existing)) {
return TCL_ERROR;
}
@@ -1592,7 +1592,7 @@ Tcl_ZlibDeflate(
* to the deflate command.
*/
- inData = TclGetBytesFromObj(interp, data, &inLen);
+ inData = Tcl_GetBytesFromObj(interp, data, &inLen);
if (inData == NULL) {
return TCL_ERROR;
}
@@ -1741,7 +1741,7 @@ Tcl_ZlibInflate(
return TCL_ERROR;
}
- inData = TclGetBytesFromObj(interp, data, &inLen);
+ inData = Tcl_GetBytesFromObj(interp, data, &inLen);
if (inData == NULL) {
return TCL_ERROR;
}
@@ -1978,7 +1978,7 @@ ZlibCmd(
Tcl_WrongNumArgs(interp, 2, objv, "data ?startValue?");
return TCL_ERROR;
}
- data = TclGetBytesFromObj(interp, objv[2], &dlen);
+ data = Tcl_GetBytesFromObj(interp, objv[2], &dlen);
if (data == NULL) {
return TCL_ERROR;
}
@@ -1998,7 +1998,7 @@ ZlibCmd(
Tcl_WrongNumArgs(interp, 2, objv, "data ?startValue?");
return TCL_ERROR;
}
- data = TclGetBytesFromObj(interp, objv[2], &dlen);
+ data = Tcl_GetBytesFromObj(interp, objv[2], &dlen);
if (data == NULL) {
return TCL_ERROR;
}
@@ -2342,7 +2342,7 @@ ZlibStreamSubcmd(
}
if (compDictObj) {
- if (NULL == TclGetBytesFromObj(interp, compDictObj, NULL)) {
+ if (NULL == Tcl_GetBytesFromObj(interp, compDictObj, NULL)) {
return TCL_ERROR;
}
}
@@ -2524,7 +2524,7 @@ ZlibPushSubcmd(
}
}
- if (compDictObj && (NULL == TclGetBytesFromObj(interp, compDictObj, NULL))) {
+ if (compDictObj && (NULL == Tcl_GetBytesFromObj(interp, compDictObj, NULL))) {
return TCL_ERROR;
}
@@ -2773,7 +2773,7 @@ ZlibStreamAddCmd(
if (compDictObj != NULL) {
int len;
- if (NULL == TclGetBytesFromObj(interp, compDictObj, &len)) {
+ if (NULL == Tcl_GetBytesFromObj(interp, compDictObj, &len)) {
return TCL_ERROR;
}
@@ -2880,7 +2880,7 @@ ZlibStreamPutCmd(
if (compDictObj != NULL) {
int len;
- if (NULL == TclGetBytesFromObj(interp, compDictObj, &len)) {
+ if (NULL == Tcl_GetBytesFromObj(interp, compDictObj, &len)) {
return TCL_ERROR;
}
if (len == 0) {
@@ -3318,7 +3318,7 @@ ZlibTransformSetOption( /* not used */
TclNewStringObj(compDictObj, value, strlen(value));
Tcl_IncrRefCount(compDictObj);
- if (NULL == TclGetBytesFromObj(interp, compDictObj, NULL)) {
+ if (NULL == Tcl_GetBytesFromObj(interp, compDictObj, NULL)) {
Tcl_DecrRefCount(compDictObj);
return TCL_ERROR;
}
generated by cgit v0.12 at 2024-10-22 08:50:00 (GMT)