diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2021-03-28 00:36:44 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2021-04-03 15:12:09 +0000 |
| commit | e3b1b9d625ca6e816b91e0e58142cfc7743cacb8 (patch) | |
| tree | 243319cb437620c97ef437e3901f45f7706936bd | |
| parent | cbadf77834e145d42ff9805694c4fccd44df7f8b (diff) | |
| download | src-e3b1b9d625ca6e816b91e0e58142cfc7743cacb8.tar.gz src-e3b1b9d625ca6e816b91e0e58142cfc7743cacb8.zip | |
libctf: Adjust logic to match upstream after 410556f1f
No functional change intended.
Suggested by: jrtc27
(cherry picked from commit 3c065eeaa7a5ebb56991f5c8123e343a83bf0f0d)
| -rw-r--r-- | cddl/contrib/opensolaris/common/ctf/ctf_lookup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cddl/contrib/opensolaris/common/ctf/ctf_lookup.c b/cddl/contrib/opensolaris/common/ctf/ctf_lookup.c index 5912cc1a36e8..cd9c71436938 100644 --- a/cddl/contrib/opensolaris/common/ctf/ctf_lookup.c +++ b/cddl/contrib/opensolaris/common/ctf/ctf_lookup.c @@ -132,9 +132,9 @@ ctf_lookup_by_name(ctf_file_t *fp, const char *name) continue; /* skip qualifier keyword */ for (lp = fp->ctf_lookups; lp->ctl_prefix != NULL; lp++) { - if ((size_t)(q - p) >= lp->ctl_len && - (lp->ctl_prefix[0] == '\0' || - strncmp(p, lp->ctl_prefix, (size_t)(q - p)) == 0)) { + if (lp->ctl_prefix[0] == '\0' || + ((size_t)(q - p) >= lp->ctl_len && strncmp(p, + lp->ctl_prefix, (size_t)(q - p)) == 0)) { for (p += lp->ctl_len; isspace(*p); p++) continue; /* skip prefix and next ws */ |