diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-05-04 13:27:36 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-05-04 13:27:36 (GMT) |
| commit | 4ae09b65725a646ac0ecde14e3972a5af3eb132a (patch) | |
| tree | 2bbfe9f59f737c427c949c9cd9d762bb10625ca8 | |
| parent | cb008d57c8b1bfad27632a42f91a37637030ad96 (diff) | |
| parent | 3f2bb8a02927f794f32b98f7be6f643d0c57b6bb (diff) | |
| download | tcl-4ae09b65725a646ac0ecde14e3972a5af3eb132a.zip tcl-4ae09b65725a646ac0ecde14e3972a5af3eb132a.tar.gz tcl-4ae09b65725a646ac0ecde14e3972a5af3eb132a.tar.bz2 | |
Merge 9.0
| -rw-r--r-- | .github/workflows/linux-build.yml | 9 | ||||
| -rw-r--r-- | .github/workflows/mac-build.yml | 9 | ||||
| -rw-r--r-- | .github/workflows/onefiledist.yml | 9 | ||||
| -rw-r--r-- | .github/workflows/win-build.yml | 9 | ||||
| -rw-r--r-- | generic/tclStringObj.c | 9 |
5 files changed, 38 insertions, 7 deletions
diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index 7ba9e89..52cec15 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -1,5 +1,12 @@ name: Linux -on: [push] +on: + push: + branches: + - "main" + - "trunk" + - "core-8-branch" + tags: + - "core-**" permissions: contents: read jobs: diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml index a9345a1..c576390 100644 --- a/.github/workflows/mac-build.yml +++ b/.github/workflows/mac-build.yml @@ -1,5 +1,12 @@ name: macOS -on: [push] +on: + push: + branches: + - "main" + - "trunk" + - "core-8-branch" + tags: + - "core-**" permissions: contents: read jobs: diff --git a/.github/workflows/onefiledist.yml b/.github/workflows/onefiledist.yml index 1f75762..f1cee16 100644 --- a/.github/workflows/onefiledist.yml +++ b/.github/workflows/onefiledist.yml @@ -1,5 +1,12 @@ name: Build Binaries -on: [push] +on: + push: + branches: + - "main" + - "trunk" + - "core-8-branch" + tags: + - "core-**" permissions: contents: read jobs: diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml index ba4e5ba..a7ce43b 100644 --- a/.github/workflows/win-build.yml +++ b/.github/workflows/win-build.yml @@ -1,5 +1,12 @@ name: Windows -on: [push] +on: + push: + branches: + - "main" + - "trunk" + - "core-8-branch" + tags: + - "core-**" permissions: contents: read env: diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c index d2bc1b2..d0703b3 100644 --- a/generic/tclStringObj.c +++ b/generic/tclStringObj.c @@ -2751,12 +2751,16 @@ AppendPrintfToObjVA( break; } + case 'p': + if (sizeof(size_t) == sizeof(Tcl_WideInt)) { + size = 2; + } + /* FALLTHRU */ case 'c': case 'i': case 'u': case 'd': case 'o': - case 'p': case 'x': case 'X': seekingConversion = 0; @@ -3137,8 +3141,7 @@ TclStringCat( { Tcl_Obj *objResultPtr, * const *ov; int binary = 1; - Tcl_Size oc; - Tcl_Size length = 0; + Tcl_Size oc, length = 0; int allowUniChar = 1, requestUniChar = 0, forceUniChar = 0; Tcl_Size first = objc - 1; /* Index of first value possibly not empty */ Tcl_Size last = 0; /* Index of last value possibly not empty */ |