diff options
| author | Dan McDonald <danmcd@joyent.com> | 2021-05-14 12:00:48 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2021-05-14 12:00:48 -0400 |
| commit | 1a25930b922d3fede4a252f4f2e0ecb8de2656cb (patch) | |
| tree | a2ff441f85489691a94f13a644cb7cfe10b81f9e /usr/src/lib/libdemangle/common/demangle.c | |
| parent | 3aa01401155d92a38a0d4e107043c130432e4a43 (diff) | |
| parent | 1cd083931cfd3fb8617c1178f62bce417cfa6af2 (diff) | |
| download | illumos-joyent-1a25930b922d3fede4a252f4f2e0ecb8de2656cb.tar.gz | |
[illumos-gate merge]
commit 1cd083931cfd3fb8617c1178f62bce417cfa6af2
13780 Add support for rust v0 mangling format
commit 4fe48c6ec9f06cbcce19c4cf97f662b64efde582
13798 loader: Update the EFI timer to be called once a second
commit 9e3493cb8a0cfe96c9aef9b7da42c6c9b5c24b43
13374 Port L2ARC Improvements from OpenZFS
Diffstat (limited to 'usr/src/lib/libdemangle/common/demangle.c')
| -rw-r--r-- | usr/src/lib/libdemangle/common/demangle.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr/src/lib/libdemangle/common/demangle.c b/usr/src/lib/libdemangle/common/demangle.c index bf7c9ab8c7..f8f322757a 100644 --- a/usr/src/lib/libdemangle/common/demangle.c +++ b/usr/src/lib/libdemangle/common/demangle.c @@ -11,7 +11,7 @@ /* * Copyright 2021 Jason King - * Copyright 2019, Joyent, Inc. + * Copyright 2019 Joyent, Inc. */ #include <stdlib.h> @@ -86,6 +86,8 @@ is_mangled(const char *str, size_t n) (void) sv_consume_if_c(&sv, '_'); if (sv_consume_if_c(&sv, 'Z')) return (B_TRUE); + if (sv_consume_if_c(&sv, 'R')) + return (B_TRUE); return (B_FALSE); } @@ -101,6 +103,7 @@ char * sysdemangle(const char *str, sysdem_lang_t lang, sysdem_ops_t *ops) { char *res = NULL; + /* * While the language specific demangler code can handle non-NUL * terminated strings, we currently don't expose this to consumers. |