R – /branches/R-groups/src/main/errors.c

Rev 80452 – ported r80398:80451 from main

murrell — Thu, 03 Jun 2021 23:48:10 +0000

murrell – 119 file(s) modified
ported r80398:80451 from main

~ /branches/R-groups
~ /branches/R-groups/configure.ac
~ /branches/R-groups/doc/COPYRIGHTS
~ /branches/R-groups/doc/CRAN_mirrors.csv
~ /branches/R-groups/doc/manual/R-admin.texi
~ /branches/R-groups/doc/manual/R-exts.texi
~ /branches/R-groups/doc/manual/R-FAQ.texi
~ /branches/R-groups/doc/manual/R-ints.texi
~ /branches/R-groups/doc/NEWS.Rd
~ /branches/R-groups/etc/Renviron.in
~ /branches/R-groups/po/POTFILES
~ /branches/R-groups/src/include/Defn.h
~ /branches/R-groups/src/library/base/man/capabilities.Rd
~ /branches/R-groups/src/library/base/man/connections.Rd
~ /branches/R-groups/src/library/base/man/libPaths.Rd
~ /branches/R-groups/src/library/base/man/readLines.Rd
~ /branches/R-groups/src/library/base/man/writeLines.Rd
~ /branches/R-groups/src/library/base/po/da.po
~ /branches/R-groups/src/library/base/po/de.po
~ /branches/R-groups/src/library/base/po/en.po
~ /branches/R-groups/src/library/base/po/en_GB.po
~ /branches/R-groups/src/library/base/po/es.po
~ /branches/R-groups/src/library/base/po/fa.po
~ /branches/R-groups/src/library/base/po/fr.po
~ /branches/R-groups/src/library/base/po/it.po
~ /branches/R-groups/src/library/base/po/ja.po
~ /branches/R-groups/src/library/base/po/ko.po
~ /branches/R-groups/src/library/base/po/lt.po
~ /branches/R-groups/src/library/base/po/nn.po
~ /branches/R-groups/src/library/base/po/pl.po
~ /branches/R-groups/src/library/base/po/pt_BR.po
~ /branches/R-groups/src/library/base/po/R.pot
~ /branches/R-groups/src/library/base/po/ru.po
~ /branches/R-groups/src/library/base/po/tr.po
~ /branches/R-groups/src/library/base/po/zh_CN.po
~ /branches/R-groups/src/library/base/po/zh_TW.po
~ /branches/R-groups/src/library/base/R/library.R
~ /branches/R-groups/src/library/grid/inst/doc/changes.txt
~ /branches/R-groups/src/library/grid/man/grid.grep.Rd
~ /branches/R-groups/src/library/grid/R/ls.R
+ /branches/R-groups/src/library/grid/tests/grep.R (copied from /trunk/src/library/grid/tests/grep.R@80451)
+ /branches/R-groups/src/library/grid/tests/grep.Rout.save (copied from /trunk/src/library/grid/tests/grep.Rout.save@80451)
~ /branches/R-groups/src/library/Makefile.in
~ /branches/R-groups/src/library/Makefile.win
~ /branches/R-groups/src/library/profile/Rprofile.unix
~ /branches/R-groups/src/library/profile/Rprofile.windows
~ /branches/R-groups/src/library/Recommended/Makefile.in
~ /branches/R-groups/src/library/Recommended/Makefile.win
~ /branches/R-groups/src/library/tools/po/da.po
~ /branches/R-groups/src/library/tools/po/de.po
~ /branches/R-groups/src/library/tools/po/fr.po
~ /branches/R-groups/src/library/tools/po/it.po
~ /branches/R-groups/src/library/tools/po/ja.po
~ /branches/R-groups/src/library/tools/po/ko.po
~ /branches/R-groups/src/library/tools/po/lt.po
~ /branches/R-groups/src/library/tools/po/pl.po
~ /branches/R-groups/src/library/tools/po/pt_BR.po
~ /branches/R-groups/src/library/tools/po/ru.po
~ /branches/R-groups/src/library/tools/po/tools.pot
~ /branches/R-groups/src/library/tools/po/zh_CN.po
~ /branches/R-groups/src/library/tools/po/zh_TW.po
~ /branches/R-groups/src/library/tools/R/check.R
~ /branches/R-groups/src/library/tools/R/Rd2pdf.R
~ /branches/R-groups/src/library/tools/R/utils.R
~ /branches/R-groups/src/library/tools/src/text.c
~ /branches/R-groups/src/library/translations/inst/de/LC_MESSAGES/R.mo
~ /branches/R-groups/src/library/translations/inst/en@quot/LC_MESSAGES/R.mo
~ /branches/R-groups/src/library/translations/inst/en@quot/LC_MESSAGES/tools.mo
~ /branches/R-groups/src/library/translations/inst/en@quot/LC_MESSAGES/utils.mo
~ /branches/R-groups/src/library/translations/inst/es/LC_MESSAGES/R.mo
~ /branches/R-groups/src/library/translations/inst/fr/LC_MESSAGES/R.mo
~ /branches/R-groups/src/library/translations/inst/it/LC_MESSAGES/R.mo
~ /branches/R-groups/src/library/translations/inst/ja/LC_MESSAGES/R.mo
~ /branches/R-groups/src/library/translations/inst/ko/LC_MESSAGES/R.mo
~ /branches/R-groups/src/library/translations/inst/lt/LC_MESSAGES/R.mo
~ /branches/R-groups/src/library/translations/inst/nn/LC_MESSAGES/R.mo
~ /branches/R-groups/src/library/translations/inst/pl/LC_MESSAGES/R.mo
~ /branches/R-groups/src/library/translations/inst/pt_BR/LC_MESSAGES/R.mo
~ /branches/R-groups/src/library/translations/inst/ru/LC_MESSAGES/R.mo
~ /branches/R-groups/src/library/translations/inst/tr/LC_MESSAGES/R.mo
~ /branches/R-groups/src/library/translations/inst/zh_CN/LC_MESSAGES/R.mo
~ /branches/R-groups/src/library/translations/inst/zh_TW/LC_MESSAGES/R.mo
~ /branches/R-groups/src/library/utils/po/de.po
~ /branches/R-groups/src/library/utils/po/fr.po
~ /branches/R-groups/src/library/utils/po/it.po
~ /branches/R-groups/src/library/utils/po/ko.po
~ /branches/R-groups/src/library/utils/po/lt.po
~ /branches/R-groups/src/library/utils/po/pl.po
~ /branches/R-groups/src/library/utils/po/ru.po
~ /branches/R-groups/src/library/utils/po/utils.pot
~ /branches/R-groups/src/library/utils/po/zh_TW.po
~ /branches/R-groups/src/library/utils/src/io.c
~ /branches/R-groups/src/library/utils/src/windows/dataentry.c
~ /branches/R-groups/src/main/character.c
~ /branches/R-groups/src/main/connections.c
~ /branches/R-groups/src/main/engine.c
~ /branches/R-groups/src/main/errors.c
~ /branches/R-groups/src/main/gram.c
~ /branches/R-groups/src/main/gram.y
~ /branches/R-groups/src/main/grep.c
~ /branches/R-groups/src/main/platform.c
~ /branches/R-groups/src/main/printutils.c
~ /branches/R-groups/src/main/scan.c
~ /branches/R-groups/src/main/subset.c
~ /branches/R-groups/src/main/sysutils.c
~ /branches/R-groups/src/main/util.c
~ /branches/R-groups/src/modules/internet/Makefile.in
x /branches/R-groups/src/modules/internet/nanohttp.c
~ /branches/R-groups/src/modules/internet/Rsock.c
~ /branches/R-groups/src/modules/internet/sockconn.c
~ /branches/R-groups/src/modules/X11/dataentry.c
~ /branches/R-groups/src/nmath/qDiscrete_search.h
~ /branches/R-groups/tests/Examples/graphics-Ex.Rout.save
~ /branches/R-groups/tests/Examples/grid-Ex.Rout.save
~ /branches/R-groups/tests/Examples/Makefile.in
~ /branches/R-groups/tests/Examples/Makefile.win
~ /branches/R-groups/tests/reg-tests-1d.R
~ /branches/R-groups/tests/reg-tests-2.R
~ /branches/R-groups/tests/reg-tests-2.Rout.save

Rev 80166 – create R-groups

murrell — Thu, 15 Apr 2021 02:13:13 +0000

murrell – 1 file(s) modified
create R-groups

+ /branches/R-groups (copied from /trunk@80165)

Rev 79995 – comment

kalibera — Fri, 12 Feb 2021 11:07:03 +0000

kalibera – 1 file(s) modified
comment

~ /trunk/src/main/errors.c

Rev 79969 – Improve detection of translation domain (protect fix, avoid unnecessary copy).

kalibera — Mon, 08 Feb 2021 15:51:06 +0000

kalibera – 1 file(s) modified
Improve detection of translation domain (protect fix, avoid unnecessary
copy).

~ /trunk/src/main/errors.c

Rev 79945 – improve, using R_alloc()

maechler — Fri, 05 Feb 2021 10:43:15 +0000

maechler – 1 file(s) modified
improve, using R_alloc()

~ /trunk/src/main/errors.c

Rev 79942 – the code for 79936: detect translation domain (PR17998)

maechler — Fri, 05 Feb 2021 07:57:52 +0000

maechler – 1 file(s) modified
the *code* for 79936: detect translation domain (PR17998)

~ /trunk/src/main/errors.c

Rev 79776 – make replacing wc[s]width optional (but still the default)

ripley — Sun, 03 Jan 2021 13:11:47 +0000

ripley – 15 file(s) modified
make replacing wc[s]width optional (but still the default)

~ /trunk/configure
~ /trunk/configure.ac
~ /trunk/doc/manual/R-admin.texi
~ /trunk/doc/NEWS.Rd
~ /trunk/src/gnuwin32/fixed/h/config.h
~ /trunk/src/include/config.h.in
~ /trunk/src/include/rlocale.h
~ /trunk/src/library/grDevices/src/devPicTeX.c
~ /trunk/src/library/grDevices/src/devPS.c
~ /trunk/src/library/utils/R/packages2.R
~ /trunk/src/main/character.c
~ /trunk/src/main/errors.c
~ /trunk/src/main/printutils.c
~ /trunk/src/main/rlocale.c
~ /trunk/src/main/rlocale_widths.h

Rev 79725 – enhance Ri18n_wcwidth to handle surrogate pairs

ripley — Tue, 29 Dec 2020 13:03:42 +0000

ripley – 2 file(s) modified
enhance Ri18n_wcwidth to handle surrogate pairs

~ /trunk/src/main/character.c
~ /trunk/src/main/errors.c

Rev 79693 – add comments

ripley — Sat, 26 Dec 2020 12:24:16 +0000

ripley – 4 file(s) modified
add comments

~ /trunk/src/library/base/man/nchar.Rd
~ /trunk/src/main/character.c
~ /trunk/src/main/errors.c
~ /trunk/src/main/rlocale.c

Rev 79543 – Make sure target is on the handler stack before unwinding.

luke — Thu, 03 Dec 2020 00:34:35 +0000

luke – 1 file(s) modified
Make sure target is on the handler stack before unwinding.

~ /trunk/src/main/errors.c

Rev 79542 – Drop rference counts when unwinding handler stack in endcontext.

luke — Wed, 02 Dec 2020 23:38:48 +0000

luke – 2 file(s) modified
Drop rference counts when unwinding handler stack in endcontext.

~ /trunk/src/main/context.c
~ /trunk/src/main/errors.c

Rev 79305 – .traceback() again keeps "srcref"

maechler — Wed, 07 Oct 2020 08:56:33 +0000

maechler – 3 file(s) modified
.traceback(<n>) again keeps "srcref"

~ /trunk/doc/NEWS.Rd
~ /trunk/src/main/errors.c
~ /trunk/tests/reg-tests-1d.R

Rev 79248 – More truncation fixes from Brodie Gaslam.

kalibera — Wed, 23 Sep 2020 17:44:06 +0000

kalibera – 4 file(s) modified
More truncation fixes from Brodie Gaslam.

~ /trunk/src/gnuwin32/run.c
~ /trunk/src/main/errors.c
~ /trunk/src/main/printutils.c
~ /trunk/src/main/util.c

Rev 79216 – More truncation fixes from Brodie Gaslam.

kalibera — Wed, 16 Sep 2020 11:28:25 +0000

kalibera – 4 file(s) modified
More truncation fixes from Brodie Gaslam.

~ /trunk/src/include/Defn.h
~ /trunk/src/main/errors.c
~ /trunk/src/main/print.c
~ /trunk/tests/reg-tests-1d.R

Rev 79163 – More truncation fixes, comments fix. From Brodie Gaslam.

kalibera — Tue, 08 Sep 2020 15:21:24 +0000

kalibera – 2 file(s) modified
More truncation fixes, comments fix. From Brodie Gaslam.

~ /trunk/src/main/errors.c
~ /trunk/src/main/util.c

Rev 79159 – Prevent creation of partial characters in multi-byte string truncation. Fix ...

kalibera — Tue, 08 Sep 2020 13:54:10 +0000

kalibera – 4 file(s) modified
Prevent creation of partial characters in multi-byte string truncation. Fix error handling with
vsnprintf. From Brodie Gaslam.

~ /trunk/src/include/Defn.h
~ /trunk/src/main/connections.c
~ /trunk/src/main/errors.c
~ /trunk/src/main/printutils.c

Rev 79125 – Prevent memory corruption when truncating error messages in some non-English ...

kalibera — Thu, 03 Sep 2020 17:12:32 +0000

kalibera – 1 file(s) modified
Prevent memory corruption when truncating error messages in some non-English
languages (reported by Brodie Gaslam).

~ /trunk/src/main/errors.c

Rev 79123 – Improve handling of multi-byte characters in truncation of error messages ...

kalibera — Thu, 03 Sep 2020 13:36:54 +0000

kalibera – 3 file(s) modified
Improve handling of multi-byte characters in truncation of error messages
and warnings. From Brodie Gaslam.

~ /trunk/src/library/base/man/options.Rd
~ /trunk/src/main/errors.c
~ /trunk/tests/reg-tests-1d.R

Rev 78125 – Protect fixes.

kalibera — Wed, 01 Apr 2020 12:51:05 +0000

kalibera – 1 file(s) modified
Protect fixes.

~ /trunk/src/main/errors.c

Rev 78073 – Added R_withCallingErrorHandler.

luke — Thu, 26 Mar 2020 18:34:14 +0000

luke – 4 file(s) modified
Added R_withCallingErrorHandler.

~ /trunk/doc/manual/R-exts.texi
~ /trunk/doc/NEWS.Rd
~ /trunk/src/include/Rinternals.h
~ /trunk/src/main/errors.c

Rev 78071 – Save/restore R_Visible around some eval() calls.

luke — Thu, 26 Mar 2020 16:33:14 +0000

luke – 1 file(s) modified
Save/restore R_Visible around some eval() calls.

~ /trunk/src/main/errors.c

Rev 78002 – Fix to return value for do_addGlobHands; from Lionel Henry.

luke — Wed, 18 Mar 2020 20:21:05 +0000

luke – 1 file(s) modified
Fix to return value for do_addGlobHands; from Lionel Henry.

~ /trunk/src/main/errors.c

Rev 77712 – Print something useful before jumping on recursive errors.

luke — Sat, 25 Jan 2020 05:25:45 +0000

luke – 1 file(s) modified
Print something useful before jumping on recursive errors.

~ /trunk/src/main/errors.c

Rev 77242 – Merged r77241 (PR17617 fix) from R-3-6-branch.

luke — Tue, 01 Oct 2019 14:53:50 +0000

luke – 3 file(s) modified
Merged r77241 (PR17617 fix) from R-3-6-branch.

~ /trunk
~ /trunk/doc/NEWS.Rd
~ /trunk/src/main/errors.c

Rev 77188 – Added .Internal(.addGlobHands()) for esmerimenting with global calling handlers.

luke — Sat, 14 Sep 2019 20:04:03 +0000

luke – 3 file(s) modified
Added .Internal(.addGlobHands()) for esmerimenting with global calling handlers.

~ /trunk/src/include/Internal.h
~ /trunk/src/main/errors.c
~ /trunk/src/main/names.c

Rev 76872 – .Traceback w/o deparse()ing

maechler — Tue, 23 Jul 2019 20:31:10 +0000

maechler – 8 file(s) modified
.Traceback w/o deparse()ing

~ /trunk/doc/NEWS.Rd
~ /trunk/src/gnuwin32/Rdll.hide
~ /trunk/src/include/Defn.h
~ /trunk/src/library/base/man/options.Rd
~ /trunk/src/library/base/man/traceback.Rd
~ /trunk/src/library/base/R/traceback.R
~ /trunk/src/main/errors.c
~ /trunk/tests/reg-tests-2.Rout.save

Rev 76844 – Avoid buffer overflow for null byte.

luke — Tue, 16 Jul 2019 16:57:15 +0000

luke – 1 file(s) modified
Avoid buffer overflow for null byte.

~ /trunk/src/main/errors.c

Rev 76840 – Ported r76839 (buffer overflow fix) from R-patched.

luke — Mon, 15 Jul 2019 20:42:16 +0000

luke – 3 file(s) modified
Ported r76839 (buffer overflow fix) from R-patched.

~ /trunk
~ /trunk/doc/NEWS.Rd
~ /trunk/src/main/errors.c

Rev 75618 – Adjusted thread checking to use func; added more checks (from ...

luke — Fri, 16 Nov 2018 16:24:56 +0000

luke – 5 file(s) modified
Adjusted thread checking to use __func__; added more checks (from
Winston Chang via Kevin Ushey).

~ /trunk/src/include/Rinlinedfuns.h
~ /trunk/src/include/Rinternals.h
~ /trunk/src/main/altrep.c
~ /trunk/src/main/errors.c
~ /trunk/src/main/memory.c

Rev 75611 – If THREADCHECK is defined, check in some places to make ...

luke — Thu, 15 Nov 2018 17:33:09 +0000

luke – 4 file(s) modified
If THREADCHECK is defined, check in some places to make sure they are
called from a consistent thread. Defined by default when strict
barrier checking is used.

~ /trunk/src/include/Rinternals.h
~ /trunk/src/main/altrep.c
~ /trunk/src/main/errors.c
~ /trunk/src/main/memory.c

Rev 75601 – Avoid incomplete multi-byte characters when truncating error and warning messages.

kalibera — Tue, 13 Nov 2018 20:51:41 +0000

kalibera – 3 file(s) modified
Avoid incomplete multi-byte characters when truncating error and warning
messages.

~ /trunk/src/include/Defn.h
~ /trunk/src/main/errors.c
~ /trunk/src/main/util.c

Rev 75533 – Temporarily disable GC when checking logical conditions (to prevent PROTECT ...

kalibera — Thu, 01 Nov 2018 13:57:28 +0000

kalibera – 1 file(s) modified
Temporarily disable GC when checking logical conditions (to prevent PROTECT
bugs).

~ /trunk/src/main/errors.c

Rev 75532 – Protect fixes.

kalibera — Thu, 01 Nov 2018 12:36:35 +0000

kalibera – 13 file(s) modified
Protect fixes.

~ /trunk/src/main/apply.c
~ /trunk/src/main/builtin.c
~ /trunk/src/main/dotcode.c
~ /trunk/src/main/envir.c
~ /trunk/src/main/errors.c
~ /trunk/src/main/eval.c
~ /trunk/src/main/gram.c
~ /trunk/src/main/gram.y
~ /trunk/src/main/logic.c
~ /trunk/src/main/objects.c
~ /trunk/src/main/print.c
~ /trunk/src/main/subscript.c
~ /trunk/src/main/util.c

Rev 75529 – Make sure to use quote() from base (also fixes PR#17442).

kalibera — Wed, 31 Oct 2018 17:46:20 +0000

kalibera – 3 file(s) modified
Make sure to use quote() from base (also fixes PR#17442).

~ /trunk/src/main/envir.c
~ /trunk/src/main/errors.c
~ /trunk/src/main/main.c

Rev 75446 – Allow diagnostics and checked-package selection with _R_CHECK_LENGTH_1_LOGIC2_ the same way ...

kalibera — Tue, 16 Oct 2018 13:41:52 +0000

kalibera – 7 file(s) modified
Allow diagnostics and checked-package selection with _R_CHECK_LENGTH_1_LOGIC2_
the same way as with _R_CHECK_LENGTH_1_CONDITION_.

~ /trunk/doc/manual/R-ints.texi
~ /trunk/src/include/Rinternals.h
~ /trunk/src/main/coerce.c
~ /trunk/src/main/errors.c
~ /trunk/src/main/eval.c
~ /trunk/src/main/logic.c
~ /trunk/tests/reg-tests-1d.R

Rev 74974 – work around some gcc8 warnings

ripley — Wed, 18 Jul 2018 13:24:56 +0000

ripley – 1 file(s) modified
work around some gcc8 warnings

~ /trunk/src/main/errors.c

Rev 74951 – add comments about gcc 8 warnings

ripley — Thu, 12 Jul 2018 08:27:18 +0000

ripley – 2 file(s) modified
add comments about gcc 8 warnings

~ /trunk/src/main/errors.c
~ /trunk/src/main/eval.c

Rev 74860 – Fix typo.

kalibera — Thu, 07 Jun 2018 09:43:24 +0000

kalibera – 1 file(s) modified
Fix typo.

~ /trunk/src/main/errors.c

Rev 74589 – dput() & dump() must not truncate when "deparse.max.lines" is set

maechler — Thu, 12 Apr 2018 21:46:42 +0000

maechler – 6 file(s) modified
dput() & dump() must not truncate when "deparse.max.lines" is set

~ /trunk/doc/NEWS.Rd
~ /trunk/src/include/Defn.h
~ /trunk/src/main/deparse.c
~ /trunk/src/main/errors.c
~ /trunk/src/main/print.c
~ /trunk/tests/reg-tests-1d.R

Rev 74566 – Suspend interrupts around R_TriCatch infrastucture.

luke — Mon, 09 Apr 2018 19:53:43 +0000

luke – 1 file(s) modified
Suspend interrupts around R_TriCatch infrastucture.

~ /trunk/src/main/errors.c

R – /branches/R-groups/src/main/errors.c

Rev 80452 – ported r80398:80451 from main

Rev 80166 – create R-groups

Rev 79995 – comment

Rev 79969 – Improve detection of translation domain (protect fix, avoid unnecessary copy).

Rev 79945 – improve, using R_alloc()

Rev 79942 – the *code* for 79936: detect translation domain (PR17998)

Rev 79776 – make replacing wc[s]width optional (but still the default)

Rev 79725 – enhance Ri18n_wcwidth to handle surrogate pairs

Rev 79693 – add comments

Rev 79543 – Make sure target is on the handler stack before unwinding.

Rev 79542 – Drop rference counts when unwinding handler stack in endcontext.

Rev 79305 – .traceback() again keeps "srcref"

Rev 79248 – More truncation fixes from Brodie Gaslam.

Rev 79216 – More truncation fixes from Brodie Gaslam.

Rev 79163 – More truncation fixes, comments fix. From Brodie Gaslam.

Rev 79159 – Prevent creation of partial characters in multi-byte string truncation. Fix ...

Rev 79125 – Prevent memory corruption when truncating error messages in some non-English ...

Rev 79123 – Improve handling of multi-byte characters in truncation of error messages ...

Rev 78125 – Protect fixes.

Rev 78073 – Added R_withCallingErrorHandler.

Rev 78071 – Save/restore R_Visible around some eval() calls.

Rev 78002 – Fix to return value for do_addGlobHands; from Lionel Henry.

Rev 77712 – Print something useful before jumping on recursive errors.

Rev 77242 – Merged r77241 (PR17617 fix) from R-3-6-branch.

Rev 77188 – Added .Internal(.addGlobHands()) for esmerimenting with global calling handlers.

Rev 76872 – .Traceback w/o deparse()ing

Rev 76844 – Avoid buffer overflow for null byte.

Rev 76840 – Ported r76839 (buffer overflow fix) from R-patched.

Rev 75618 – Adjusted thread checking to use __func__; added more checks (from ...

Rev 75611 – If THREADCHECK is defined, check in some places to make ...

Rev 75601 – Avoid incomplete multi-byte characters when truncating error and warning messages.

Rev 75533 – Temporarily disable GC when checking logical conditions (to prevent PROTECT ...

Rev 75532 – Protect fixes.

Rev 75529 – Make sure to use quote() from base (also fixes PR#17442).

Rev 75446 – Allow diagnostics and checked-package selection with _R_CHECK_LENGTH_1_LOGIC2_ the same way ...

Rev 74974 – work around some gcc8 warnings

Rev 74951 – add comments about gcc 8 warnings

Rev 74860 – Fix typo.

Rev 74589 – dput() & dump() must not truncate when "deparse.max.lines" is set

Rev 74566 – Suspend interrupts around R_TriCatch infrastucture.

Rev 79942 – the code for 79936: detect translation domain (PR17998)

Rev 75618 – Adjusted thread checking to use func; added more checks (from ...