summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Mustacchi <rm@fingolfin.org>2020-12-12 12:31:22 -0800
committerRobert Mustacchi <rm@fingolfin.org>2021-02-04 06:39:17 -0800
commit6d177d7a4a2c4b126a6f5ecc7a226e1dcac383ed (patch)
tree36d356cd7034ab2b0be61b27b88d2de332e39bfc
parentf915e6d33fea11e547f382c9f44614aa99739ba5 (diff)
downloadillumos-joyent-6d177d7a4a2c4b126a6f5ecc7a226e1dcac383ed.tar.gz
13390 clean up libdlpi warning gags
Reviewed by: Yuri Pankov <ypankov@tintri.com> Reviewed by: Toomas Soome <tsoome@me.com> Reviewed by: Andy Fiddaman <andy@omnios.org> Approved by: Gordon Ross <gordon.w.ross@gmail.com>
-rw-r--r--usr/src/lib/libdlpi/Makefile.com1
-rw-r--r--usr/src/lib/libdlpi/common/libdlpi.c3
2 files changed, 1 insertions, 3 deletions
diff --git a/usr/src/lib/libdlpi/Makefile.com b/usr/src/lib/libdlpi/Makefile.com
index f51dd0d1b4..aa9452428e 100644
--- a/usr/src/lib/libdlpi/Makefile.com
+++ b/usr/src/lib/libdlpi/Makefile.com
@@ -39,7 +39,6 @@ LDLIBS += -lc -linetutil -ldladm
SRCDIR = ../common
CFLAGS += $(CCVERBOSE)
-CERRWARN += $(CNOWARN_UNINIT)
CPPFLAGS += -I$(SRCDIR) -D_REENTRANT
.KEEP_STATE:
diff --git a/usr/src/lib/libdlpi/common/libdlpi.c b/usr/src/lib/libdlpi/common/libdlpi.c
index 1a639a5db9..44045d0224 100644
--- a/usr/src/lib/libdlpi/common/libdlpi.c
+++ b/usr/src/lib/libdlpi/common/libdlpi.c
@@ -1338,8 +1338,7 @@ i_dlpi_strgetmsg(dlpi_impl_t *dip, int msec, dlpi_msg_t *dlreplyp,
data.maxlen = (databuf == NULL) ? sizeof (bufd): *datalenp;
for (;;) {
- if (!infinite)
- start = NSEC2MSEC(gethrtime());
+ start = NSEC2MSEC(gethrtime());
switch (poll(&pfd, 1, msec)) {
default: