diff options
| author | Toomas Soome <tsoome@me.com> | 2020-05-18 08:53:19 +0300 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2021-03-12 08:44:43 +0200 |
| commit | 518a3de174fca27c87a655a6dab31dc0d75a66a9 (patch) | |
| tree | 755090913e92f1c92197bb0a35746557eebacfd6 | |
| parent | 288166677c0b62978c976160131a2cc1cf4176b4 (diff) | |
| download | illumos-joyent-518a3de174fca27c87a655a6dab31dc0d75a66a9.tar.gz | |
13517 libeti: multiply-defined symbols
Reviewed by: C Fraire <cfraire@me.com>
Approved by: Dan McDonald <danmcd@joyent.com>
| -rw-r--r-- | usr/src/lib/libeti/form/common/regcmp.c | 18 | ||||
| -rw-r--r-- | usr/src/lib/libeti/form/common/regex.c | 6 |
2 files changed, 10 insertions, 14 deletions
diff --git a/usr/src/lib/libeti/form/common/regcmp.c b/usr/src/lib/libeti/form/common/regcmp.c index b41e491b50..147ac0faec 100644 --- a/usr/src/lib/libeti/form/common/regcmp.c +++ b/usr/src/lib/libeti/form/common/regcmp.c @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ +/* All Rights Reserved */ /* @@ -32,8 +32,6 @@ * Copyright (c) 2018, Joyent, Inc. */ -/*LINTLIBRARY*/ - #include <sys/types.h> #include <stdlib.h> #include "utility.h" @@ -71,7 +69,7 @@ intptr_t *__sp_; intptr_t *__stmax; -int __i_size; +extern int __i_size; /*ARGSUSED2*/ char * @@ -116,7 +114,7 @@ libform_regcmp(char *cs1, char *cs2) *ep++ = FCEOF; if (--nbra > NBRA || *__sp_ != -1) goto cerror; - __i_size = (int) (ep - sep); + __i_size = (int)(ep - sep); return (sep); } if ((c != '*') && (c != '{') && (c != '+')) @@ -155,12 +153,12 @@ libform_regcmp(char *cs1, char *cs2) *eptr = GRP; continue; } - i = (int) (ep - eptr - 2); + i = (int)(ep - eptr - 2); for (cclcnt = 0; i >= 256; cclcnt++) i -= 256; if (cclcnt > 3) goto cerror; *eptr |= cclcnt; - *++eptr = (char) i; + *++eptr = (char)i; continue; case '\\': @@ -182,7 +180,7 @@ libform_regcmp(char *cs1, char *cs2) else goto cerror; } while (((c = *sp++) != '}') && (c != ',')); if (i > 255) goto cerror; - *ep++ = (char) i; + *ep++ = (char)i; if (c == ',') { if (cflg++) goto cerror; if ((c = *sp++) == '}') { @@ -194,7 +192,7 @@ libform_regcmp(char *cs1, char *cs2) } } if (!cflg) - *ep++ = (char) i; + *ep++ = (char)i; else if ((ep[-1]&0377) < (ep[-2]&0377)) goto cerror; continue; @@ -243,7 +241,7 @@ libform_regcmp(char *cs1, char *cs2) *ep++ = c; cclcnt++; } while ((c = *sp++) != ']'); - lastep[1] = (char) cclcnt; + lastep[1] = (char)cclcnt; continue; defchar: diff --git a/usr/src/lib/libeti/form/common/regex.c b/usr/src/lib/libeti/form/common/regex.c index 171916d7f4..3993c286a7 100644 --- a/usr/src/lib/libeti/form/common/regex.c +++ b/usr/src/lib/libeti/form/common/regex.c @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ +/* All Rights Reserved */ /* @@ -32,8 +32,6 @@ * Copyright (c) 2018, Joyent, Inc. */ -/*LINTLIBRARY*/ - #include <sys/types.h> #include <stdlib.h> #include <unistd.h> @@ -74,7 +72,7 @@ char *__braslist[NBRA]; char *__braelist[NBRA]; -char *__loc1; +extern char *__loc1; intptr_t __bravar[NBRA]; intptr_t *__st[SSIZE + 1]; intptr_t *__eptr_, *__lptr_; |