summaryrefslogtreecommitdiff
path: root/usr/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/lib')
-rw-r--r--usr/src/lib/libnvpair/Makefile.com3
-rw-r--r--usr/src/lib/libnvpair/nvpair_json.c25
-rw-r--r--usr/src/lib/libshare/autofs/libshare_autofs.c4
-rw-r--r--usr/src/lib/libshare/nfs/libshare_nfs.c4
-rw-r--r--usr/src/lib/libshare/smb/libshare_smb.c4
-rw-r--r--usr/src/lib/libshare/smbfs/libshare_smbfs.c4
-rw-r--r--usr/src/lib/libuuid/common/uuid.c14
7 files changed, 27 insertions, 31 deletions
diff --git a/usr/src/lib/libnvpair/Makefile.com b/usr/src/lib/libnvpair/Makefile.com
index 056d967554..1e5d247371 100644
--- a/usr/src/lib/libnvpair/Makefile.com
+++ b/usr/src/lib/libnvpair/Makefile.com
@@ -72,6 +72,9 @@ CERRWARN += -_gcc=-Wno-uninitialized
CFLAGS += $(CCVERBOSE)
CPPFLAGS += -D_REENTRANT
+C99MODE= -xc99=%all
+C99LMODE= -Xc99=%all
+
$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC)
.KEEP_STATE:
diff --git a/usr/src/lib/libnvpair/nvpair_json.c b/usr/src/lib/libnvpair/nvpair_json.c
index 77348041ab..39f036fbc3 100644
--- a/usr/src/lib/libnvpair/nvpair_json.c
+++ b/usr/src/lib/libnvpair/nvpair_json.c
@@ -20,11 +20,9 @@
#include "libnvpair.h"
-#define FPRINTF(fp, ...) \
- do { \
- if (fprintf(fp, __VA_ARGS__) < 0) \
- return (-1); \
- } while (0)
+#define FPRINTF(fp, ...) \
+ if (fprintf(fp, __VA_ARGS__) < 0) \
+ return (-1) \
/*
* When formatting a string for JSON output we must escape certain characters,
@@ -83,13 +81,13 @@ nvlist_print_json_string(FILE *fp, const char *input)
* characters in the Basic Multilingual Plane
* as JSON-escaped multibyte characters.
*/
- FPRINTF(fp, "\\u%04x", 0xffff & c);
+ FPRINTF(fp, "\\u%04x", (int)(0xffff & c));
} else if (c >= 0x20 && c <= 0x7f) {
/*
* Render other 7-bit ASCII characters directly
* and drop other, unrepresentable characters.
*/
- FPRINTF(fp, "%c", 0xff & c);
+ FPRINTF(fp, "%c", (int)(0xff & c));
}
break;
}
@@ -189,19 +187,21 @@ nvlist_print_json(FILE *fp, nvlist_t *nvl)
}
case DATA_TYPE_INT64: {
- FPRINTF(fp, "%lld", fnvpair_value_int64(curr));
+ FPRINTF(fp, "%lld",
+ (long long)fnvpair_value_int64(curr));
break;
}
case DATA_TYPE_UINT64: {
- FPRINTF(fp, "%llu", fnvpair_value_uint64(curr));
+ FPRINTF(fp, "%llu",
+ (unsigned long long)fnvpair_value_uint64(curr));
break;
}
case DATA_TYPE_HRTIME: {
hrtime_t val;
VERIFY0(nvpair_value_hrtime(curr, &val));
- FPRINTF(fp, "%llu", val);
+ FPRINTF(fp, "%llu", (unsigned long long)val);
break;
}
@@ -370,7 +370,8 @@ nvlist_print_json(FILE *fp, nvlist_t *nvl)
for (i = 0; i < valsz; i++) {
if (i > 0)
FPRINTF(fp, ",");
- FPRINTF(fp, "%llu", val[i]);
+ FPRINTF(fp, "%llu",
+ (unsigned long long)val[i]);
}
FPRINTF(fp, "]");
break;
@@ -384,7 +385,7 @@ nvlist_print_json(FILE *fp, nvlist_t *nvl)
for (i = 0; i < valsz; i++) {
if (i > 0)
FPRINTF(fp, ",");
- FPRINTF(fp, "%lld", val[i]);
+ FPRINTF(fp, "%lld", (long long)val[i]);
}
FPRINTF(fp, "]");
break;
diff --git a/usr/src/lib/libshare/autofs/libshare_autofs.c b/usr/src/lib/libshare/autofs/libshare_autofs.c
index 2e0e7b85d7..8098a6e36e 100644
--- a/usr/src/lib/libshare/autofs/libshare_autofs.c
+++ b/usr/src/lib/libshare/autofs/libshare_autofs.c
@@ -594,7 +594,5 @@ autofs_features(void)
static char *
autofs_get_status(void)
{
- char *state = NULL;
- state = smf_get_state(AUTOFS_DEFAULT_FMRI);
- return (state != NULL ? state : strdup("-"));
+ return (smf_get_state(AUTOFS_DEFAULT_FMRI));
}
diff --git a/usr/src/lib/libshare/nfs/libshare_nfs.c b/usr/src/lib/libshare/nfs/libshare_nfs.c
index 0cf69a241a..3b8fddd327 100644
--- a/usr/src/lib/libshare/nfs/libshare_nfs.c
+++ b/usr/src/lib/libshare/nfs/libshare_nfs.c
@@ -3017,9 +3017,7 @@ nfs_set_proto_prop(sa_property_t prop)
static char *
nfs_get_status()
{
- char *state;
- state = smf_get_state(NFSD);
- return (state != NULL ? state : strdup("-"));
+ return (smf_get_state(NFSD));
}
/*
diff --git a/usr/src/lib/libshare/smb/libshare_smb.c b/usr/src/lib/libshare/smb/libshare_smb.c
index 2c6509f06b..86fd29bada 100644
--- a/usr/src/lib/libshare/smb/libshare_smb.c
+++ b/usr/src/lib/libshare/smb/libshare_smb.c
@@ -1579,9 +1579,7 @@ smb_set_proto_prop(sa_property_t prop)
static char *
smb_get_status(void)
{
- char *state = NULL;
- state = smf_get_state(SMBD_DEFAULT_INSTANCE_FMRI);
- return (state != NULL ? state : strdup("-"));
+ return (smf_get_state(SMBD_DEFAULT_INSTANCE_FMRI));
}
/*
diff --git a/usr/src/lib/libshare/smbfs/libshare_smbfs.c b/usr/src/lib/libshare/smbfs/libshare_smbfs.c
index 1d81fadfbe..b1f19f917d 100644
--- a/usr/src/lib/libshare/smbfs/libshare_smbfs.c
+++ b/usr/src/lib/libshare/smbfs/libshare_smbfs.c
@@ -683,9 +683,7 @@ smbfs_set_proto_prop(sa_property_t prop)
static char *
smbfs_get_status()
{
- char *state = "enabled";
- state = smf_get_state(SMBC_DEFAULT_INSTANCE_FMRI);
- return (state != NULL ? state : strdup("-"));
+ return (smf_get_state(SMBC_DEFAULT_INSTANCE_FMRI));
}
/*
diff --git a/usr/src/lib/libuuid/common/uuid.c b/usr/src/lib/libuuid/common/uuid.c
index 7369a56894..d0601e4fbf 100644
--- a/usr/src/lib/libuuid/common/uuid.c
+++ b/usr/src/lib/libuuid/common/uuid.c
@@ -368,18 +368,18 @@ fill_random_bytes(uchar_t *buf, int nbytes)
int i;
if (fd_urand == -1) {
- mutex_lock(&urandmtx);
+ (void) mutex_lock(&urandmtx);
/* check again now that we have the mutex */
if (fd_urand == -1) {
if ((fd_urand = open(URANDOM_PATH, O_RDONLY)) >= 0)
load_cache();
}
- mutex_unlock(&urandmtx);
+ (void) mutex_unlock(&urandmtx);
}
if (fd_urand >= 0 && rcachep != NULL) {
int cnt;
- mutex_lock(&urandmtx);
+ (void) mutex_lock(&urandmtx);
if (rcachep != NULL &&
(rcachep + nbytes) >= (rcache + RCACHE_SIZE))
load_cache();
@@ -387,10 +387,10 @@ fill_random_bytes(uchar_t *buf, int nbytes)
if (rcachep != NULL) {
for (cnt = 0; cnt < nbytes; cnt++)
*buf++ = *rcachep++;
- mutex_unlock(&urandmtx);
+ (void) mutex_unlock(&urandmtx);
return;
}
- mutex_unlock(&urandmtx);
+ (void) mutex_unlock(&urandmtx);
}
for (i = 0; i < nbytes; i++) {
*buf++ = get_random() & 0xFF;
@@ -540,13 +540,13 @@ uuid_generate(uuid_t uu)
return;
}
if (fd_urand == -1) {
- mutex_lock(&urandmtx);
+ (void) mutex_lock(&urandmtx);
/* check again now that we have the mutex */
if (fd_urand == -1) {
if ((fd_urand = open(URANDOM_PATH, O_RDONLY)) >= 0)
load_cache();
}
- mutex_unlock(&urandmtx);
+ (void) mutex_unlock(&urandmtx);
}
if (fd_urand >= 0) {
uuid_generate_random(uu);
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-21 06:06:34 +0000