summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
Diffstat (limited to 'generic')
-rw-r--r--generic/tcl.h7
-rw-r--r--generic/tclEncoding.c26
-rw-r--r--generic/tclExecute.c6
-rw-r--r--generic/tclIO.c24
-rw-r--r--generic/tclIO.h7
-rw-r--r--generic/tclStringObj.c6
-rw-r--r--generic/tclTest.c3
-rw-r--r--generic/tclTestObj.c3
-rw-r--r--generic/tclZlib.c6
9 files changed, 39 insertions, 49 deletions
diff --git a/generic/tcl.h b/generic/tcl.h
index ae0e19e..946d7b9 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -1967,13 +1967,6 @@ typedef struct Tcl_EncodingType {
#define TCL_ENCODING_PROFILE_TCL8 0x01000000
#define TCL_ENCODING_PROFILE_STRICT 0x02000000
#define TCL_ENCODING_PROFILE_REPLACE 0x03000000
-#define TCL_ENCODING_PROFILE_MASK 0xFF000000
-#define TCL_ENCODING_PROFILE_GET(flags_) ((flags_) & TCL_ENCODING_PROFILE_MASK)
-#define TCL_ENCODING_PROFILE_SET(flags_, profile_) \
- do { \
- (flags_) &= ~TCL_ENCODING_PROFILE_MASK; \
- (flags_) |= profile_; \
- } while (0)
/* Still being argued - For Tcl9, is the default strict? TODO */
#if TCL_MAJOR_VERSION < 9
#define TCL_ENCODING_PROFILE_DEFAULT TCL_ENCODING_PROFILE_TCL8
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 4e043de..a87eb7f 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -200,16 +200,16 @@ static struct TclEncodingProfiles {
{"tcl8", TCL_ENCODING_PROFILE_TCL8},
};
#define PROFILE_TCL8(flags_) \
- ((TCL_ENCODING_PROFILE_GET(flags_) == TCL_ENCODING_PROFILE_TCL8) \
- || (TCL_ENCODING_PROFILE_GET(flags_) == 0 \
+ ((CHANNEL_PROFILE_GET(flags_) == TCL_ENCODING_PROFILE_TCL8) \
+ || (CHANNEL_PROFILE_GET(flags_) == 0 \
&& TCL_ENCODING_PROFILE_DEFAULT == TCL_ENCODING_PROFILE_TCL8))
#define PROFILE_STRICT(flags_) \
- ((TCL_ENCODING_PROFILE_GET(flags_) == TCL_ENCODING_PROFILE_STRICT) \
- || (TCL_ENCODING_PROFILE_GET(flags_) == 0 \
+ ((CHANNEL_PROFILE_GET(flags_) == TCL_ENCODING_PROFILE_STRICT) \
+ || (CHANNEL_PROFILE_GET(flags_) == 0 \
&& TCL_ENCODING_PROFILE_DEFAULT == TCL_ENCODING_PROFILE_STRICT))
#define PROFILE_REPLACE(flags_) \
- ((TCL_ENCODING_PROFILE_GET(flags_) == TCL_ENCODING_PROFILE_REPLACE) \
- || (TCL_ENCODING_PROFILE_GET(flags_) == 0 \
+ ((CHANNEL_PROFILE_GET(flags_) == TCL_ENCODING_PROFILE_REPLACE) \
+ || (CHANNEL_PROFILE_GET(flags_) == 0 \
&& TCL_ENCODING_PROFILE_DEFAULT == TCL_ENCODING_PROFILE_REPLACE))
#define UNICODE_REPLACE_CHAR ((Tcl_UniChar)0xFFFD)
@@ -2532,7 +2532,7 @@ UtfToUtfProc(
flags |= PTR2INT(clientData);
dstEnd = dst + dstLen - ((flags & ENCODING_UTF) ? TCL_UTF_MAX : 6);
- profile = TCL_ENCODING_PROFILE_GET(flags);
+ profile = CHANNEL_PROFILE_GET(flags);
for (numChars = 0; src < srcEnd && numChars <= charLimit; numChars++) {
if ((src > srcClose) && (!Tcl_UtfCharComplete(src, srcEnd - src))) {
@@ -2655,8 +2655,7 @@ UtfToUtfProc(
if (PROFILE_REPLACE(profile)) {
/* TODO - is this right for cesu8 or should we fall through below? */
ch = UNICODE_REPLACE_CHAR;
- }
- else {
+ } else {
int low = ch;
len = (src <= srcEnd - 3) ? TclUtfToUCS4(src, &low) : 0;
@@ -3108,8 +3107,7 @@ Utf16ToUtfProc(
} else if (PROFILE_REPLACE(flags)) {
dst--;
dst += Tcl_UniCharToUtf(UNICODE_REPLACE_CHAR, dst);
- }
- else {
+ } else {
/* Bug [10c2c17c32]. If Hi surrogate, finish 3-byte UTF-8 */
dst += Tcl_UniCharToUtf(-1, dst);
}
@@ -4585,9 +4583,9 @@ TclEncodingProfileIdToName(
int TclEncodingSetProfileFlags(int flags)
{
if (flags & TCL_ENCODING_STOPONERROR) {
- TCL_ENCODING_PROFILE_SET(flags, TCL_ENCODING_PROFILE_STRICT);
+ CHANNEL_PROFILE_SET(flags, TCL_ENCODING_PROFILE_STRICT);
} else {
- int profile = TCL_ENCODING_PROFILE_GET(flags);
+ int profile = CHANNEL_PROFILE_GET(flags);
switch (profile) {
case TCL_ENCODING_PROFILE_TCL8:
case TCL_ENCODING_PROFILE_STRICT:
@@ -4595,7 +4593,7 @@ int TclEncodingSetProfileFlags(int flags)
break;
case 0: /* Unspecified by caller */
default:
- TCL_ENCODING_PROFILE_SET(flags, TCL_ENCODING_PROFILE_DEFAULT);
+ CHANNEL_PROFILE_SET(flags, TCL_ENCODING_PROFILE_DEFAULT);
break;
}
}
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index a2578e4..724a49e 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -5071,8 +5071,7 @@ TEBCresume(
}
if (fromIdx == TCL_INDEX_NONE) {
fromIdx = 0;
- }
- else if (fromIdx > length) {
+ } else if (fromIdx > length) {
fromIdx = length;
}
numToDelete = 0;
@@ -5111,8 +5110,7 @@ TEBCresume(
}
TRACE_APPEND(("\"%.30s\"\n", O2S(objResultPtr)));
NEXT_INST_V(6, opnd, 1);
- }
- else {
+ } else {
if (Tcl_ListObjReplace(interp,
valuePtr,
fromIdx,
diff --git a/generic/tclIO.c b/generic/tclIO.c
index 880477b..5414e73 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -1677,11 +1677,11 @@ Tcl_CreateChannel(
}
statePtr->inputEncodingState = NULL;
statePtr->inputEncodingFlags = TCL_ENCODING_START;
- TCL_ENCODING_PROFILE_SET(statePtr->inputEncodingFlags,
+ CHANNEL_PROFILE_SET(statePtr->inputEncodingFlags,
TCL_ENCODING_PROFILE_DEFAULT);
statePtr->outputEncodingState = NULL;
statePtr->outputEncodingFlags = TCL_ENCODING_START;
- TCL_ENCODING_PROFILE_SET(statePtr->outputEncodingFlags,
+ CHANNEL_PROFILE_SET(statePtr->outputEncodingFlags,
TCL_ENCODING_PROFILE_DEFAULT);
/*
@@ -7998,7 +7998,7 @@ Tcl_GetChannelOption(
Tcl_DStringAppendElement(dsPtr, "-profile");
}
/* Note currently input and output profiles are same */
- profile = TCL_ENCODING_PROFILE_GET(statePtr->inputEncodingFlags);
+ profile = CHANNEL_PROFILE_GET(statePtr->inputEncodingFlags);
profileName = TclEncodingProfileIdToName(interp, profile);
if (profileName == NULL) {
return TCL_ERROR;
@@ -8214,12 +8214,12 @@ Tcl_SetChannelOption(
Tcl_FreeEncoding(statePtr->encoding);
statePtr->encoding = encoding;
statePtr->inputEncodingState = NULL;
- profile = TCL_ENCODING_PROFILE_GET(statePtr->inputEncodingFlags);
+ profile = CHANNEL_PROFILE_GET(statePtr->inputEncodingFlags);
statePtr->inputEncodingFlags = TCL_ENCODING_START;
- TCL_ENCODING_PROFILE_SET(statePtr->inputEncodingFlags, profile);
+ CHANNEL_PROFILE_SET(statePtr->inputEncodingFlags, profile);
statePtr->outputEncodingState = NULL;
statePtr->outputEncodingFlags = TCL_ENCODING_START;
- TCL_ENCODING_PROFILE_SET(statePtr->outputEncodingFlags, profile); /* Same as input */
+ CHANNEL_PROFILE_SET(statePtr->outputEncodingFlags, profile); /* Same as input */
ResetFlag(statePtr, CHANNEL_NEED_MORE_DATA|CHANNEL_ENCODING_ERROR);
UpdateInterest(chanPtr);
return TCL_OK;
@@ -8262,8 +8262,8 @@ Tcl_SetChannelOption(
if (TclEncodingProfileNameToId(interp, newValue, &profile) != TCL_OK) {
return TCL_ERROR;
}
- TCL_ENCODING_PROFILE_SET(statePtr->inputEncodingFlags, profile);
- TCL_ENCODING_PROFILE_SET(statePtr->outputEncodingFlags, profile);
+ CHANNEL_PROFILE_SET(statePtr->inputEncodingFlags, profile);
+ CHANNEL_PROFILE_SET(statePtr->outputEncodingFlags, profile);
ResetFlag(statePtr, CHANNEL_NEED_MORE_DATA|CHANNEL_ENCODING_ERROR);
return TCL_OK;
} else if (HaveOpt(1, "-translation")) {
@@ -9380,8 +9380,8 @@ TclCopyChannel(
&& inStatePtr->inputTranslation == TCL_TRANSLATE_LF
&& outStatePtr->outputTranslation == TCL_TRANSLATE_LF
&& inStatePtr->encoding == outStatePtr->encoding
- && TCL_ENCODING_PROFILE_GET(inStatePtr->flags) != TCL_ENCODING_PROFILE_STRICT
- && TCL_ENCODING_PROFILE_GET(outStatePtr->flags) == TCL_ENCODING_PROFILE_TCL8;
+ && CHANNEL_PROFILE_GET(inStatePtr->flags) != TCL_ENCODING_PROFILE_STRICT
+ && CHANNEL_PROFILE_GET(outStatePtr->flags) == TCL_ENCODING_PROFILE_TCL8;
/*
* Allocate a new CopyState to maintain info about the current copy in
@@ -9710,8 +9710,8 @@ CopyData(
inBinary = (inStatePtr->encoding == NULL);
outBinary = (outStatePtr->encoding == NULL);
sameEncoding = inStatePtr->encoding == outStatePtr->encoding
- && TCL_ENCODING_PROFILE_GET(inStatePtr->flags) != TCL_ENCODING_PROFILE_STRICT
- && TCL_ENCODING_PROFILE_GET(outStatePtr->flags) == TCL_ENCODING_PROFILE_TCL8;
+ && CHANNEL_PROFILE_GET(inStatePtr->flags) != TCL_ENCODING_PROFILE_STRICT
+ && CHANNEL_PROFILE_GET(outStatePtr->flags) == TCL_ENCODING_PROFILE_TCL8;
if (!(inBinary || sameEncoding)) {
TclNewObj(bufObj);
diff --git a/generic/tclIO.h b/generic/tclIO.h
index e3eac72..67807c0 100644
--- a/generic/tclIO.h
+++ b/generic/tclIO.h
@@ -288,6 +288,13 @@ typedef struct ChannelState {
#define CHANNEL_CLOSEDWRITE (1<<21) /* Channel write side has been closed.
* No further Tcl-level write IO on
* the channel is allowed. */
+#define CHANNEL_PROFILE_MASK 0xFF000000
+#define CHANNEL_PROFILE_GET(flags_) ((flags_) & CHANNEL_PROFILE_MASK)
+#define CHANNEL_PROFILE_SET(flags_, profile_) \
+ do { \
+ (flags_) &= ~CHANNEL_PROFILE_MASK; \
+ (flags_) |= profile_; \
+ } while (0)
/*
* The length of time to wait between synthetic timer events. Must be zero or
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index 0acc6e2..edfe141 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -2960,13 +2960,11 @@ TclStringRepeat(
/* Result will be pure byte array. Pre-size it */
(void)Tcl_GetByteArrayFromObj(objPtr, &length);
maxCount = TCL_SIZE_SMAX;
- }
- else if (unichar) {
+ } else if (unichar) {
/* Result will be pure Tcl_UniChar array. Pre-size it. */
(void)Tcl_GetUnicodeFromObj(objPtr, &length);
maxCount = TCL_SIZE_SMAX/sizeof(Tcl_UniChar);
- }
- else {
+ } else {
/* Result will be concat of string reps. Pre-size it. */
(void)Tcl_GetStringFromObj(objPtr, &length);
maxCount = TCL_SIZE_SMAX;
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 590b0c8..74fd620 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -2067,8 +2067,7 @@ static int UtfExtWrapper(
int flag;
if (Tcl_GetIntFromObj(NULL, flagObjs[i], &flag) == TCL_OK) {
flags |= flag;
- }
- else {
+ } else {
int idx;
if (Tcl_GetIndexFromObjStruct(interp,
flagObjs[i],
diff --git a/generic/tclTestObj.c b/generic/tclTestObj.c
index 6f919eb..42a96da 100644
--- a/generic/tclTestObj.c
+++ b/generic/tclTestObj.c
@@ -1105,8 +1105,7 @@ TestobjCmd(
if (objv[2]->typePtr == NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj("none", TCL_INDEX_NONE));
- }
- else {
+ } else {
typeName = objv[2]->typePtr->name;
if (!strcmp(typeName, "utf32string"))
typeName = "string";
diff --git a/generic/tclZlib.c b/generic/tclZlib.c
index 9f63d99..e016fd0 100644
--- a/generic/tclZlib.c
+++ b/generic/tclZlib.c
@@ -454,8 +454,7 @@ GenerateHeader(
if (result == TCL_CONVERT_UNKNOWN) {
Tcl_AppendResult(
interp, "Comment contains characters > 0xFF", NULL);
- }
- else {
+ } else {
Tcl_AppendResult(interp, "Comment too large for zip", NULL);
}
}
@@ -490,8 +489,7 @@ GenerateHeader(
if (result == TCL_CONVERT_UNKNOWN) {
Tcl_AppendResult(
interp, "Filename contains characters > 0xFF", NULL);
- }
- else {
+ } else {
Tcl_AppendResult(
interp, "Filename too large for zip", NULL);
}
generated by cgit v0.12 at 2024-11-16 15:38:31 (GMT)