summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/lib/libadm/common/ckdate.c5
-rw-r--r--usr/src/lib/libast/Makefile.com2
-rw-r--r--usr/src/lib/libdll/common/dlfcn.c2
-rw-r--r--usr/src/lib/libima/Makefile2
-rw-r--r--usr/src/lib/libima/common/ima-lib.c39
-rw-r--r--usr/src/lib/libima/common/sunima-lib.c16
-rw-r--r--usr/src/lib/libmail/common/s_string.c2
-rw-r--r--usr/src/lib/libmail/inc/s_string.h45
-rw-r--r--usr/src/lib/libnsl/key/publickey.c37
-rw-r--r--usr/src/lib/libpp/common/ppproto.c2
-rw-r--r--usr/src/lib/librdc/common/rdcconfig.c17
-rw-r--r--usr/src/lib/libsmedia/plugins/scsi/common/s_generic.c88
-rw-r--r--usr/src/lib/libsum/common/sumlib.c2
-rw-r--r--usr/src/lib/libtnfctl/comb.c136
-rw-r--r--usr/src/lib/mpapi/libmpapi/common/mpapi.c3
15 files changed, 177 insertions, 221 deletions
diff --git a/usr/src/lib/libadm/common/ckdate.c b/usr/src/lib/libadm/common/ckdate.c
index 7c0db59beb..9ae38509e1 100644
--- a/usr/src/lib/libadm/common/ckdate.c
+++ b/usr/src/lib/libadm/common/ckdate.c
@@ -115,22 +115,19 @@ static char *
p_eday(char *string, int llim, int ulim)
{
char *ptr, *copy;
- char daynum[3];
int begin = -1;
int iday = 0;
int idaymax = 2;
- daynum[0] = '\0';
if (*string == BLANK) {
string++;
idaymax--;
}
copy = string;
while (isdigit((unsigned char)*copy) && (iday < idaymax)) {
- daynum[iday] = *copy++;
+ copy++;
iday++;
}
- daynum[iday] = '\0';
if (iday == 1) {
llim = 1;
ulim = 9;
diff --git a/usr/src/lib/libast/Makefile.com b/usr/src/lib/libast/Makefile.com
index 91c6388ed8..3ec9d8313e 100644
--- a/usr/src/lib/libast/Makefile.com
+++ b/usr/src/lib/libast/Makefile.com
@@ -728,6 +728,8 @@ CERRWARN += -_gcc=-Wno-uninitialized
CERRWARN += -_gcc=-Wno-char-subscripts
CERRWARN += -_gcc=-Wno-clobbered
CERRWARN += -_gcc=-Wno-unused-variable
+CERRWARN += -_gcc=-Wno-unused-but-set-variable
+CERRWARN += -_gcc=-Wno-unused-but-set-parameter
CERRWARN += -_gcc=-Wno-unused-value
CERRWARN += -_gcc=-Wno-unused-function
CERRWARN += -_gcc=-Wno-unused-label
diff --git a/usr/src/lib/libdll/common/dlfcn.c b/usr/src/lib/libdll/common/dlfcn.c
index 9707eb6b80..f4238c6861 100644
--- a/usr/src/lib/libdll/common/dlfcn.c
+++ b/usr/src/lib/libdll/common/dlfcn.c
@@ -26,8 +26,6 @@
* AT&T Research
*/
-static const char id[] = "\n@(#)$Id: dll library (AT&T Research) 2009-04-15 $\0\n";
-
#include <ast.h>
#include <dlldefs.h>
#include <error.h>
diff --git a/usr/src/lib/libima/Makefile b/usr/src/lib/libima/Makefile
index 49f69232f7..1f1e96f466 100644
--- a/usr/src/lib/libima/Makefile
+++ b/usr/src/lib/libima/Makefile
@@ -39,8 +39,6 @@ lint := TARGET = lint
.KEEP_STATE:
-install_h: $(ROOTHDRS)
-
all clean clobber install lint: $(SUBDIRS)
install_h: $(ROOTHDRS)
diff --git a/usr/src/lib/libima/common/ima-lib.c b/usr/src/lib/libima/common/ima-lib.c
index 3ba2df6a93..2c8c70576d 100644
--- a/usr/src/lib/libima/common/ima-lib.c
+++ b/usr/src/lib/libima/common/ima-lib.c
@@ -278,11 +278,13 @@ static IMA_STATUS setSolarisSharedNodeAlias(const IMA_NODE_ALIAS alias) {
* "__attribute__ ((constructor))" and "__attribute__ ((destructor))"
* are used with gcc
*/
-__attribute__((constructor)) void init() {
+__attribute__((constructor)) void init()
+{
InitLibrary();
}
-__attribute__((destructor)) void fini() {
+__attribute__((destructor)) void fini()
+{
ExitLibrary();
}
@@ -352,35 +354,35 @@ static int os_createmutex(int *semid) {
return (1);
}
-static void os_obtainmutex(int semid) {
- int retVal;
+static void
+os_obtainmutex(int semid)
+{
struct sembuf sem_b;
sem_b.sem_num = 0;
sem_b.sem_op = -1;
sem_b.sem_flg = SEM_UNDO;
- retVal = semop(semid, &sem_b, 1);
-
+ (void) semop(semid, &sem_b, 1);
}
-static void os_releasemutex(int semid) {
- int retVal;
+static void
+os_releasemutex(int semid)
+{
struct sembuf sem_b;
sem_b.sem_num = 0;
sem_b.sem_op = 1;
sem_b.sem_flg = SEM_UNDO;
- retVal = semop(semid, &sem_b, 1);
-
+ (void) semop(semid, &sem_b, 1);
}
/* Destroy the SNMP semaphore. */
-static void os_destroymutex(int semid) {
- int retVal;
+static void
+os_destroymutex(int semid)
+{
union semun sem_union;
- retVal = semctl(semid, 0, IPC_RMID, sem_union);
-
+ (void) semctl(semid, 0, IPC_RMID, sem_union);
}
#endif
@@ -394,8 +396,6 @@ void InitLibrary() {
char imaConfFilePath[256];
char systemPath[256];
char *charPtr;
- IMA_UINT dwStrLength;
-
IMA_UINT i = 0;
if (number_of_plugins != -1)
@@ -409,9 +409,6 @@ void InitLibrary() {
os_obtainmutex(libMutex);
sharedNodeAlias[0] = 0;
- dwStrLength = 255;
-
-
/* Open configuration file from known location */
#ifdef WIN32
@@ -475,7 +472,6 @@ void InitLibrary() {
if (plugintable[i].hPlugin != NULL) {
typedef int (*InitializeFn)();
InitializeFn PassFunc;
- IMA_STATUS status;
memcpy((char *)&plugintable[i].PluginName,
(char *)&pluginname, 64);
@@ -494,8 +490,7 @@ void InitLibrary() {
plugintable[i].hPlugin, "Initialize");
#endif
if (PassFunc != NULL) {
- status =
- PassFunc(plugintable[i].ownerId);
+ (void) PassFunc(plugintable[i].ownerId);
}
plugintable[i].number_of_vbcallbacks = 0;
diff --git a/usr/src/lib/libima/common/sunima-lib.c b/usr/src/lib/libima/common/sunima-lib.c
index 6a233eaec1..1f96695085 100644
--- a/usr/src/lib/libima/common/sunima-lib.c
+++ b/usr/src/lib/libima/common/sunima-lib.c
@@ -125,24 +125,24 @@ IMA_API IMA_STATUS SUN_IMA_GetTunableProperties(
return (status);
}
-static void os_obtainmutex(int semid) {
- int retVal;
+static void
+os_obtainmutex(int semid)
+{
struct sembuf sem_b;
sem_b.sem_num = 0;
sem_b.sem_op = -1;
sem_b.sem_flg = SEM_UNDO;
- retVal = semop(semid, &sem_b, 1);
-
+ (void) semop(semid, &sem_b, 1);
}
-static void os_releasemutex(int semid) {
- int retVal;
+static void
+os_releasemutex(int semid)
+{
struct sembuf sem_b;
sem_b.sem_num = 0;
sem_b.sem_op = 1;
sem_b.sem_flg = SEM_UNDO;
- retVal = semop(semid, &sem_b, 1);
-
+ (void) semop(semid, &sem_b, 1);
}
diff --git a/usr/src/lib/libmail/common/s_string.c b/usr/src/lib/libmail/common/s_string.c
index a57889d96a..e20c297651 100644
--- a/usr/src/lib/libmail/common/s_string.c
+++ b/usr/src/lib/libmail/common/s_string.c
@@ -27,8 +27,6 @@
/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
/* All Rights Reserved */
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include <sys/types.h>
#include <stdio.h>
#include <ctype.h>
diff --git a/usr/src/lib/libmail/inc/s_string.h b/usr/src/lib/libmail/inc/s_string.h
index 2153a54e02..c188189d09 100644
--- a/usr/src/lib/libmail/inc/s_string.h
+++ b/usr/src/lib/libmail/inc/s_string.h
@@ -30,11 +30,10 @@
/* This is a private header file. */
-#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.4 */
/* extensible strings */
#ifndef _S_STRING_H
-#define _S_STRING_H
+#define _S_STRING_H
#include <string.h>
@@ -50,25 +49,27 @@ typedef struct string {
* to lint, but causes the last expression to be evaluated as an int (didn't
* change this).
*/
-#define s_clone(s) s_copy((s)->ptr)
-#define s_curlen(s) ((s)->ptr - (s)->base)
-#define s_dup(s) s_copy((s)->base)
-#define s_getc(s) (*((s)->ptr++))
-#define s_peek(s) (*((s)->ptr))
-#define s_putc(s,c) (((s)->ptr < (s)->end) ? (*((s)->ptr)++ = (char)(c)) : s_grow((s),(c)))
-#define s_reset(s) ((s) ? (*((s)->ptr = (s)->base) = '\0' , (s)) : s_new())
-#define s_restart(s) ((s)->ptr = (s)->base , (s))
-#define s_skipc(s) ((s)->ptr++)
-#define s_space(s) ((s)->end - (s)->base)
-#define s_terminate(s) (((s)->ptr < (s)->end) ? (*(s)->ptr = 0) : (s_grow((s),0), (s)->ptr--, 0))
-#define s_to_c(s) ((s)->base)
-#define s_ptr_to_c(s) ((s)->ptr)
+#define s_clone(s) s_copy((s)->ptr)
+#define s_curlen(s) ((s)->ptr - (s)->base)
+#define s_dup(s) s_copy((s)->base)
+#define s_getc(s) (*((s)->ptr++))
+#define s_peek(s) (*((s)->ptr))
+#define s_putc(s, c) (((s)->ptr < (s)->end) ? \
+ (*((s)->ptr)++ = (char)(c)) : s_grow((s), (c)))
+#define s_reset(s) ((s) ? (*((s)->ptr = (s)->base) = '\0', (s)) : s_new())
+#define s_restart(s) ((s)->ptr = (s)->base)
+#define s_skipc(s) ((s)->ptr++)
+#define s_space(s) ((s)->end - (s)->base)
+#define s_terminate(s) (((s)->ptr < (s)->end) ? \
+ (*(s)->ptr = 0) : (s_grow((s), 0), (s)->ptr--, 0))
+#define s_to_c(s) ((s)->base)
+#define s_ptr_to_c(s) ((s)->ptr)
#ifdef __STDC__
extern string *s_append(string *to, char *from);
extern string *s_array(char *, size_t len);
extern string *s_copy(char *);
-extern void s_free(string*);
+extern void s_free(string *);
extern int s_grow(string *sp, int c);
extern string *s_new(void);
extern string *s_parse(string *from, string *to);
@@ -76,8 +77,8 @@ extern char *s_read_line(FILE *fp, string *to);
extern size_t s_read_to_eof(FILE *fp, string *to);
extern string *s_seq_read(FILE *fp, string *to, int lineortoken);
extern void s_skipwhite(string *from);
-extern string *s_tok(string*, char*);
-extern void s_tolower(string*);
+extern string *s_tok(string *, char *);
+extern void s_tolower(string *);
#else
extern string *s_append();
extern string *s_array();
@@ -95,9 +96,9 @@ extern void s_tolower();
#endif
/* controlling the action of s_seq_read */
-#define TOKEN 0 /* read the next whitespace delimited token */
-#define LINE 1 /* read the next logical input line */
-#define s_getline(a,b) s_seq_read(a,b,LINE)
-#define s_gettoken(a,b) s_seq_read(a,b,TOKEN)
+#define TOKEN 0 /* read the next whitespace delimited token */
+#define LINE 1 /* read the next logical input line */
+#define s_getline(a, b) s_seq_read(a, b, LINE)
+#define s_gettoken(a, b) s_seq_read(a, b, TOKEN)
#endif /* _S_STRING_H */
diff --git a/usr/src/lib/libnsl/key/publickey.c b/usr/src/lib/libnsl/key/publickey.c
index 7796883fd0..c08233253f 100644
--- a/usr/src/lib/libnsl/key/publickey.c
+++ b/usr/src/lib/libnsl/key/publickey.c
@@ -116,8 +116,8 @@ static DEFINE_NSS_DB_ROOT(db_root);
*/
/* ARGSUSED */
static int
-str2key(const char *instr, int lenstr,
- void *ent, char *buffer, int buflen) {
+str2key(const char *instr, int lenstr, void *ent, char *buffer, int buflen)
+{
if (lenstr + 1 > buflen)
return (NSS_STR_PARSE_ERANGE);
/*
@@ -342,20 +342,19 @@ getsecretkey(const char *netname, char *skey, const char *passwd)
*/
static int
extract_secret_g(
- char *raw, /* in */
- char *private, /* out */
- int prilen, /* in */
- char *passwd, /* in */
- char *netname, /* in */
- keylen_t keylen, /* in */
- algtype_t algtype) /* in */
-
+ char *raw, /* in */
+ char *private, /* out */
+ int prilen, /* in */
+ char *passwd, /* in */
+ char *netname, /* in */
+ keylen_t keylen, /* in */
+ algtype_t algtype) /* in */
{
char *buf = malloc(strlen(raw) + 1); /* private tmp buf */
char *p;
if (!buf || !passwd || !raw || !private || !prilen ||
- !VALID_KEYALG(keylen, algtype)) {
+ !VALID_KEYALG(keylen, algtype)) {
if (private)
*private = NUL;
if (buf)
@@ -535,8 +534,10 @@ netname2hashname(
void
__getpublickey_flush_g(const char *netname, keylen_t keylen, algtype_t algtype)
{
- char *p, hashname[MAXNETNAMELEN+1];
- p = netname2hashname(netname, hashname, MAXNETNAMELEN, keylen, algtype);
+ char hashname[MAXNETNAMELEN+1];
+
+ (void) netname2hashname(netname, hashname, MAXNETNAMELEN, keylen,
+ algtype);
}
/*
@@ -544,11 +545,11 @@ __getpublickey_flush_g(const char *netname, keylen_t keylen, algtype_t algtype)
*/
int
__getpublickey_cached_g(const char netname[], /* in */
- keylen_t keylen, /* in */
- algtype_t algtype, /* in */
- char *pkey, /* out */
- size_t pkeylen, /* in */
- int *from_cache) /* in/out */
+ keylen_t keylen, /* in */
+ algtype_t algtype, /* in */
+ char *pkey, /* out */
+ size_t pkeylen, /* in */
+ int *from_cache) /* in/out */
{
int needfree = 1, res, err;
struct __nsw_switchconfig *conf;
diff --git a/usr/src/lib/libpp/common/ppproto.c b/usr/src/lib/libpp/common/ppproto.c
index 147aecf87c..2a197b231a 100644
--- a/usr/src/lib/libpp/common/ppproto.c
+++ b/usr/src/lib/libpp/common/ppproto.c
@@ -29,8 +29,6 @@
* PROTOMAIN is coded for minimal library support
*/
-static const char id[] = "\n@(#)$Id: proto (AT&T Research) 2008-05-11 $\0\n";
-
#if PROTOMAIN
#include "ppfsm.c"
diff --git a/usr/src/lib/librdc/common/rdcconfig.c b/usr/src/lib/librdc/common/rdcconfig.c
index 92e735d66e..b8fc2ade37 100644
--- a/usr/src/lib/librdc/common/rdcconfig.c
+++ b/usr/src/lib/librdc/common/rdcconfig.c
@@ -244,7 +244,7 @@ populate_addrs(rdc_set_t *urdc, int isenable)
if ((fromname[0] == '\0') || (fromname[0] == '\0')) {
rdc_set_error(NULL, RDC_INTERNAL, RDC_FATAL,
"NULL hostname recieved");
- return (-1);
+ return (-1);
}
hp = gethost_byname(fromname);
@@ -313,7 +313,8 @@ rdc_free_config(rdcconfig_t *rdc, int all)
}
void
-rdc_free_rclist(rdc_rc_t *rc) {
+rdc_free_rclist(rdc_rc_t *rc)
+{
rdc_rc_t *rcp, *rcq;
rcp = rc;
@@ -635,7 +636,6 @@ rdc_usync(rdcconfig_t *rdc)
rdc_rc_t *rc = NULL;
rdc_rc_t *rcp = NULL;
rdc_rc_t *tmprc;
- int trc;
rdcp = rdc;
@@ -646,7 +646,7 @@ rdc_usync(rdcconfig_t *rdc)
rdccfg->command = RDC_CMD_COPY;
rdccfg->options = RDC_OPT_UPDATE|RDC_OPT_FORWARD;
populate_addrs(&rdccfg->rdc_set[0], 0);
- trc = thr_create(NULL, 0, rdc_mtconfig,
+ (void) thr_create(NULL, 0, rdc_mtconfig,
(void **) rdccfg, THR_BOUND, NULL);
rdcp = rdcp->next;
if (!rdcp)
@@ -679,7 +679,6 @@ rdc_fsync(rdcconfig_t *rdc)
rdc_rc_t *rc = NULL;
rdc_rc_t *rcp = NULL;
rdc_rc_t *tmprc = NULL;
- int trc;
rdcp = rdc;
rc = new_rc();
@@ -695,7 +694,7 @@ rdc_fsync(rdcconfig_t *rdc)
rdccfg->command = RDC_CMD_COPY;
rdccfg->options = RDC_OPT_FULL|RDC_OPT_FORWARD;
populate_addrs(&rdccfg->rdc_set[0], 0);
- trc = thr_create(NULL, 0, rdc_mtconfig,
+ (void) thr_create(NULL, 0, rdc_mtconfig,
(void **) rdccfg, THR_BOUND, NULL);
rdcp = rdcp->next;
if (!rdcp)
@@ -728,7 +727,6 @@ rdc_rsync(rdcconfig_t *rdc)
rdc_rc_t *rc = NULL;
rdc_rc_t *rcp = NULL;
rdc_rc_t *tmprc = NULL;
- int trc;
rdcp = rdc;
rc = new_rc();
@@ -755,7 +753,7 @@ rdc_rsync(rdcconfig_t *rdc)
rdccfg->command = RDC_CMD_COPY;
rdccfg->options = RDC_OPT_REVERSE|RDC_OPT_FULL;
populate_addrs(&rdccfg->rdc_set[0], 0);
- trc = thr_create(NULL, 0, rdc_mtconfig,
+ (void) thr_create(NULL, 0, rdc_mtconfig,
(void **) rdccfg, THR_BOUND, NULL);
next:
rdcp = rdcp->next;
@@ -788,7 +786,6 @@ rdc_ursync(rdcconfig_t *rdc)
rdc_rc_t *rc = NULL;
rdc_rc_t *rcp = NULL;
rdc_rc_t *tmprc = NULL;
- int trc;
rdcp = rdc;
@@ -810,7 +807,7 @@ rdc_ursync(rdcconfig_t *rdc)
rdccfg->command = RDC_CMD_COPY;
rdccfg->options = RDC_OPT_REVERSE | RDC_OPT_UPDATE;
populate_addrs(&rdccfg->rdc_set[0], 0);
- trc = thr_create(NULL, 0, rdc_mtconfig,
+ (void) thr_create(NULL, 0, rdc_mtconfig,
(void **) rdccfg, THR_BOUND, NULL);
next:
rdcp = rdcp->next;
diff --git a/usr/src/lib/libsmedia/plugins/scsi/common/s_generic.c b/usr/src/lib/libsmedia/plugins/scsi/common/s_generic.c
index cee5a3bf23..3f48895f78 100644
--- a/usr/src/lib/libsmedia/plugins/scsi/common/s_generic.c
+++ b/usr/src/lib/libsmedia/plugins/scsi/common/s_generic.c
@@ -24,8 +24,6 @@
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
/*
* s_generic.c :
* This file contains generic SCSI related functions for scsi plug-in
@@ -74,9 +72,8 @@ _m_get_media_info(rmedia_handle_t *handle, void *ip)
}
if (handle->sm_signature != (int32_t)LIBSMEDIA_SIGNATURE) {
DPRINTF("Invalid signature in handle.\n");
- DPRINTF2(
- "Signature expected=0x%x, found=0x%x\n",
- LIBSMEDIA_SIGNATURE, handle->sm_signature);
+ DPRINTF2("Signature expected=0x%x, found=0x%x\n",
+ LIBSMEDIA_SIGNATURE, handle->sm_signature);
DPRINTF1("fd=%d\n", handle->sm_fd);
errno = EINVAL;
return (-1);
@@ -97,7 +94,7 @@ _m_get_media_info(rmedia_handle_t *handle, void *ip)
return (-1);
}
retget_medium_property =
- (smedia_retget_medium_property_t *)((void *)door_args.data_ptr);
+ (smedia_retget_medium_property_t *)((void *)door_args.data_ptr);
reterror = (smedia_reterror_t *)((void *)door_args.data_ptr);
if (reterror->cnum == SMEDIA_CNUM_ERROR) {
DPRINTF1(
@@ -174,11 +171,11 @@ _m_get_device_info(rmedia_handle_t *handle, void *ip)
return (-1);
}
retget_device_info = (smedia_retget_device_info_t *)
- ((void *)door_args.data_ptr);
+ ((void *)door_args.data_ptr);
reterror = (smedia_reterror_t *)((void *)door_args.data_ptr);
if (reterror->cnum == SMEDIA_CNUM_ERROR) {
- DPRINTF1(
- "Error in get_device_info. errnum = 0x%x \n", reterror->errnum);
+ DPRINTF1("Error in get_device_info. errnum = 0x%x \n",
+ reterror->errnum);
errno = reterror->errnum;
free(vendor_name);
free(product_name);
@@ -192,13 +189,13 @@ _m_get_device_info(rmedia_handle_t *handle, void *ip)
(void) strlcpy(dev_info->sm_vendor_name,
- retget_device_info->sm_vendor_name, 8);
+ retget_device_info->sm_vendor_name, 8);
dev_info->sm_vendor_name[8] = 0;
(void) strlcpy(dev_info->sm_product_name,
- retget_device_info->sm_product_name, 16);
+ retget_device_info->sm_product_name, 16);
dev_info->sm_product_name[16] = 0;
(void) strlcpy(dev_info->sm_firmware_version,
- retget_device_info->sm_firmware_version, 17);
+ retget_device_info->sm_firmware_version, 17);
dev_info->sm_firmware_version[17] = 0;
dev_info->sm_interface_type = retget_device_info->sm_interface_type;
@@ -279,9 +276,9 @@ _m_raw_write(rmedia_handle_t *handle, void *i_p)
retraw_write = (smedia_retraw_write_t *)((void *)door_args.data_ptr);
reterror = (smedia_reterror_t *)((void *)door_args.data_ptr);
if (reterror->cnum == SMEDIA_CNUM_ERROR) {
- DPRINTF3(
- "Error in raw write. errnum = 0x%x blk_num = 0x%x(%d)\n",
- reterror->errnum, r_p->offset, r_p->offset);
+ DPRINTF3("Error in raw write. errnum = 0x%x "
+ "blk_num = 0x%x(%d)\n", reterror->errnum, r_p->offset,
+ r_p->offset);
errno = reterror->errnum;
goto error;
}
@@ -343,9 +340,9 @@ _m_raw_read(rmedia_handle_t *handle, void *i_p)
/*
* free(rbuf);
*/
- DPRINTF3(
- "Error in raw read. errnum = 0x%x blk_num = 0x%x(%d)\n",
- reterror->errnum, r_p->offset, r_p->offset);
+ DPRINTF3("Error in raw read. errnum = 0x%x "
+ "blk_num = 0x%x(%d)\n", reterror->errnum, r_p->offset,
+ r_p->offset);
errno = reterror->errnum;
goto error;
}
@@ -366,7 +363,6 @@ _m_media_format(rmedia_handle_t *handle, void *ip)
int32_t ret_val;
struct format_flags *ffl = (struct format_flags *)ip;
smedia_reqformat_t reqformat;
- smedia_retformat_t *retformat;
smedia_reterror_t *reterror;
door_arg_t door_args;
char rbuf[sizeof (smedia_services_t) + sizeof (door_desc_t)];
@@ -397,10 +393,6 @@ _m_media_format(rmedia_handle_t *handle, void *ip)
perror("door_call");
return (size_t)(-1);
}
- retformat = (smedia_retformat_t *)((void *)door_args.data_ptr);
-#ifdef lint
- retformat = retformat;
-#endif
reterror = (smedia_reterror_t *)((void *)door_args.data_ptr);
if (reterror->cnum == SMEDIA_CNUM_ERROR) {
DPRINTF1("Error in format. errnum = 0x%x \n", reterror->errnum);
@@ -445,23 +437,23 @@ _m_get_media_status(rmedia_handle_t *handle, void *ip)
perror("door_call");
return (-1);
}
- retget_protection_status =
- (smedia_retget_protection_status_t *)
- ((void *)door_args.data_ptr);
+ retget_protection_status = (smedia_retget_protection_status_t *)
+ ((void *)door_args.data_ptr);
reterror = (smedia_reterror_t *)((void *)door_args.data_ptr);
if (reterror->cnum == SMEDIA_CNUM_ERROR) {
- DPRINTF1(
- "Error in get_protection-status. errnum = 0x%x \n", reterror->errnum);
+ DPRINTF1("Error in get_protection-status. errnum = 0x%x \n",
+ reterror->errnum);
errno = reterror->errnum;
return (-1);
}
(void) memcpy((char *)wp, (char *)&retget_protection_status->prot_state,
- sizeof (smwp_state_t));
+ sizeof (smwp_state_t));
return (0);
}
int32_t
-_m_set_media_status(rmedia_handle_t *handle, void *ip) {
+_m_set_media_status(rmedia_handle_t *handle, void *ip)
+{
smwp_state_t *wp = ip;
int32_t ret_val;
@@ -545,9 +537,8 @@ _m_reassign_block(rmedia_handle_t *handle, void *ip)
}
reterror = (smedia_reterror_t *)((void *)door_args.data_ptr);
if (reterror->cnum == SMEDIA_CNUM_ERROR) {
- DPRINTF2(
- "Error in reassign_block. block = 0x%x errnum = 0x%x \n",
- block, reterror->errnum);
+ DPRINTF2("Error in reassign_block. block = 0x%x "
+ "errnum = 0x%x \n", block, reterror->errnum);
errno = reterror->errnum;
return (-1);
}
@@ -579,8 +570,8 @@ int32_t
_m_device_type(ushort_t ctype, ushort_t mtype)
{
if ((ctype == DKC_SCSI_CCS) ||
- (ctype == DKC_MD21) ||
- (ctype == DKC_CDROM)) {
+ (ctype == DKC_MD21) ||
+ (ctype == DKC_CDROM)) {
if (mtype == 0)
return (0);
}
@@ -631,11 +622,11 @@ _m_check_format_status(rmedia_handle_t *handle, void *ip)
return (-1);
}
retcheck_format_status =
- (smedia_retcheck_format_status_t *)((void *)door_args.data_ptr);
+ (smedia_retcheck_format_status_t *)((void *)door_args.data_ptr);
reterror = (smedia_reterror_t *)((void *)door_args.data_ptr);
if (reterror->cnum == SMEDIA_CNUM_ERROR) {
- DPRINTF1(
- "Error in check_format_status. errnum = 0x%x \n", reterror->errnum);
+ DPRINTF1("Error in check_format_status. errnum = 0x%x \n",
+ reterror->errnum);
errno = reterror->errnum;
return (-1);
}
@@ -700,7 +691,7 @@ _m_uscsi_cmd(rmedia_handle_t *handle, struct uscsi_cmd *ucmd)
*/
(void) mutex_lock(&handle->sm_bufmutex);
ret_val = remap_shared_buf(handle, ucmd->uscsi_buflen,
- ucmd->uscsi_bufaddr);
+ ucmd->uscsi_bufaddr);
if (ret_val != 0) {
DPRINTF("remap of shared buf failed.\n");
goto error;
@@ -749,9 +740,9 @@ _m_uscsi_cmd(rmedia_handle_t *handle, struct uscsi_cmd *ucmd)
ucmd->uscsi_rqstatus = retuscsi_cmd->uscsi_rqstatus;
ucmd->uscsi_rqresid = retuscsi_cmd->uscsi_rqresid;
if ((ucmd->uscsi_flags & USCSI_RQENABLE) &&
- (ucmd->uscsi_rqbuf != NULL)) {
- bcopy(retuscsi_cmd->uscsi_rqbuf,
- ucmd->uscsi_rqbuf, ucmd->uscsi_rqlen);
+ (ucmd->uscsi_rqbuf != NULL)) {
+ bcopy(retuscsi_cmd->uscsi_rqbuf, ucmd->uscsi_rqbuf,
+ ucmd->uscsi_rqlen);
}
errno = retuscsi_cmd->uscsi_errno;
if (errno) {
@@ -767,14 +758,13 @@ _m_uscsi_cmd(rmedia_handle_t *handle, struct uscsi_cmd *ucmd)
}
if (ucmd->uscsi_flags & USCSI_READ) {
(void) memcpy(ucmd->uscsi_bufaddr,
- handle->sm_buf,
- ucmd->uscsi_buflen - ucmd->uscsi_resid);
+ handle->sm_buf, ucmd->uscsi_buflen - ucmd->uscsi_resid);
}
(void) mutex_unlock(&handle->sm_bufmutex);
#ifdef DEBUG
if (retuscsi_cmd->uscsi_retval || ucmd->uscsi_status)
DPRINTF2("Error in uscsi_cmd: retval=0x%x uscsi_status=0x%x\n",
- retuscsi_cmd->uscsi_retval, ucmd->uscsi_status);
+ retuscsi_cmd->uscsi_retval, ucmd->uscsi_status);
#endif
return (retuscsi_cmd->uscsi_retval);
error:
@@ -799,7 +789,7 @@ remap_shared_buf(rmedia_handle_t *handle, size_t buf_size, char *buffer)
if (handle->sm_bufsize >= buf_size)
return (0);
shared_bufsize = ((buf_size + BUF_SIZE_MULTIPLE - 1)/BUF_SIZE_MULTIPLE)
- * BUF_SIZE_MULTIPLE;
+ * BUF_SIZE_MULTIPLE;
if (handle->sm_buffd != -1) {
/* extend the file and re-map */
fd = handle->sm_buffd;
@@ -851,8 +841,8 @@ remap_shared_buf(rmedia_handle_t *handle, size_t buf_size, char *buffer)
}
file_size += buf_size;
}
- fbuf = (char *)mmap(0, shared_bufsize, PROT_READ | PROT_WRITE,
- MAP_SHARED, fd, 0);
+ fbuf = mmap(NULL, shared_bufsize, PROT_READ | PROT_WRITE,
+ MAP_SHARED, fd, 0);
if (fbuf == (char *)-1) {
perror("mmap failed");
(void) close(fd);
@@ -879,7 +869,7 @@ remap_shared_buf(rmedia_handle_t *handle, size_t buf_size, char *buffer)
reterror = (smedia_reterror_t *)((void *)door_args.data_ptr);
if (reterror->cnum == SMEDIA_CNUM_ERROR) {
DPRINTF1("Error in set shfd. errnum = 0x%x\n",
- reterror->errnum);
+ reterror->errnum);
errno = reterror->errnum;
(void) close(fd);
return (errno);
diff --git a/usr/src/lib/libsum/common/sumlib.c b/usr/src/lib/libsum/common/sumlib.c
index cbffca92fa..7b87c93986 100644
--- a/usr/src/lib/libsum/common/sumlib.c
+++ b/usr/src/lib/libsum/common/sumlib.c
@@ -25,8 +25,6 @@
* man this is sum library
*/
-static const char id[] = "\n@(#)$Id: sumlib (AT&T Research) 2009-09-28 $\0\n";
-
#define _SUM_PRIVATE_ \
struct Method_s* method; \
uintmax_t total_count; \
diff --git a/usr/src/lib/libtnfctl/comb.c b/usr/src/lib/libtnfctl/comb.c
index a67863e4f2..447745d4d7 100644
--- a/usr/src/lib/libtnfctl/comb.c
+++ b/usr/src/lib/libtnfctl/comb.c
@@ -23,8 +23,6 @@
* Copyright (c) 1994, by Sun Microsytems, Inc.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
/*
* Functions that know how to create and decode combinations that are
* used for connecting probe functions.
@@ -90,10 +88,10 @@ extern void prb_chain_end(void);
static comb_calltmpl_t calltmpl[PRB_COMB_COUNT] = {
{
- (uintptr_t) prb_chain_entry,
- (uintptr_t) prb_chain_down,
- (uintptr_t) prb_chain_next,
- (uintptr_t) prb_chain_end}
+ (uintptr_t)prb_chain_entry,
+ (uintptr_t)prb_chain_down,
+ (uintptr_t)prb_chain_next,
+ (uintptr_t)prb_chain_end}
};
/*
@@ -103,9 +101,9 @@ static comb_calltmpl_t calltmpl[PRB_COMB_COUNT] = {
static tnfctl_errcode_t decode(tnfctl_handle_t *hndl, uintptr_t addr,
char ***func_names, uintptr_t **func_addrs);
static boolean_t find(tnfctl_handle_t *hndl, comb_op_t op, uintptr_t down,
- uintptr_t next, uintptr_t * comb_p);
+ uintptr_t next, uintptr_t *comb_p);
static tnfctl_errcode_t build(tnfctl_handle_t *hndl, comb_op_t op,
- uintptr_t down, uintptr_t next, uintptr_t * comb_p);
+ uintptr_t down, uintptr_t next, uintptr_t *comb_p);
static tnfctl_errcode_t add(tnfctl_handle_t *hndl, comb_op_t op, uintptr_t down,
uintptr_t next, uintptr_t comb);
static int comb_compare(const void *a, const void *b);
@@ -126,28 +124,28 @@ static tnfctl_errcode_t findname(tnfctl_handle_t *hndl, uintptr_t addr,
*/
tnfctl_errcode_t
_tnfctl_comb_build(tnfctl_handle_t *hndl, comb_op_t op,
- uintptr_t down, uintptr_t next, uintptr_t *comb_p)
+ uintptr_t down, uintptr_t next, uintptr_t *comb_p)
{
tnfctl_errcode_t prexstat;
*comb_p = NULL;
DBG_TNF_PROBE_0(_tnfctl_comb_build_start, "libtnfctl",
- "start _tnfctl_comb_build; sunw%verbosity 1");
+ "start _tnfctl_comb_build; sunw%verbosity 1");
if (find(hndl, op, down, next, comb_p)) {
DBG_TNF_PROBE_1(_tnfctl_comb_build_end, "libtnfctl",
- "end _tnfctl_comb_build; sunw%verbosity 1",
- tnf_opaque, found_comb_at, *comb_p);
+ "end _tnfctl_comb_build; sunw%verbosity 1",
+ tnf_opaque, found_comb_at, *comb_p);
return (TNFCTL_ERR_NONE);
}
prexstat = build(hndl, op, down, next, comb_p);
DBG_TNF_PROBE_1(_tnfctl_comb_build_end, "libtnfctl",
- "end _tnfctl_comb_build; sunw%verbosity 1",
- tnf_opaque, built_comb_at, *comb_p);
+ "end _tnfctl_comb_build; sunw%verbosity 1",
+ tnf_opaque, built_comb_at, *comb_p);
return (prexstat);
}
@@ -160,17 +158,17 @@ _tnfctl_comb_build(tnfctl_handle_t *hndl, comb_op_t op,
*/
tnfctl_errcode_t
_tnfctl_comb_decode(tnfctl_handle_t *hndl, uintptr_t addr, char ***func_names,
- uintptr_t **func_addrs)
+ uintptr_t **func_addrs)
{
tnfctl_errcode_t prexstat;
DBG_TNF_PROBE_0(_tnfctl_comb_decode_start, "libtnfctl",
- "start _tnfctl_comb_decode; sunw%verbosity 2");
+ "start _tnfctl_comb_decode; sunw%verbosity 2");
prexstat = decode(hndl, addr, func_names, func_addrs);
DBG_TNF_PROBE_0(_tnfctl_comb_decode_end, "libtnfctl",
- "end _tnfctl_comb_decode; sunw%verbosity 2");
+ "end _tnfctl_comb_decode; sunw%verbosity 2");
return (prexstat);
}
@@ -186,7 +184,7 @@ _tnfctl_comb_decode(tnfctl_handle_t *hndl, uintptr_t addr, char ***func_names,
*/
static tnfctl_errcode_t
decode(tnfctl_handle_t *hndl, uintptr_t addr, char ***func_names,
- uintptr_t **func_addrs)
+ uintptr_t **func_addrs)
{
tnfctl_errcode_t prexstat = TNFCTL_ERR_NONE;
decode_key_t key;
@@ -199,17 +197,17 @@ decode(tnfctl_handle_t *hndl, uintptr_t addr, char ***func_names,
/* see if we can find the previously decoded answer */
key.addr = addr;
- find_pp = (decode_key_t **) tfind(&key, &hndl->decoderoot,
- decode_compare);
+ find_pp = (decode_key_t **)tfind(&key, &hndl->decoderoot,
+ decode_compare);
if (find_pp) {
DBG_TNF_PROBE_0(decode_1, "libtnfctl",
- "sunw%verbosity 2; sunw%debug 'found existing'");
+ "sunw%verbosity 2; sunw%debug 'found existing'");
*func_names = (*find_pp)->name_ptrs;
*func_addrs = (*find_pp)->func_addrs;
return (TNFCTL_ERR_NONE);
}
- new_p = (decode_key_t *) calloc(1, sizeof (decode_key_t));
+ new_p = calloc(1, sizeof (decode_key_t));
if (!new_p)
return (TNFCTL_ERR_ALLOCFAIL);
new_p->addr = addr;
@@ -226,8 +224,7 @@ decode(tnfctl_handle_t *hndl, uintptr_t addr, char ***func_names,
int count, j;
DBG_TNF_PROBE_2(decode_2, "libtnfctl", "sunw%verbosity 2;",
- tnf_opaque, down, down,
- tnf_opaque, next, next);
+ tnf_opaque, down, down, tnf_opaque, next, next);
prexstat = findname(hndl, down, &thisname);
if (prexstat == TNFCTL_ERR_USR1) {
@@ -245,18 +242,19 @@ decode(tnfctl_handle_t *hndl, uintptr_t addr, char ***func_names,
goto Error;
/* count number of elements - caution: empty 'for' loop */
- for (count = 0; nextnames[count]; count++);
+ for (count = 0; nextnames[count]; count++)
+ ;
count++; /* since it was 0 based */
/* allocate one more for new function name */
new_p->name_ptrs = malloc((count + 1) *
- sizeof (new_p->name_ptrs[0]));
+ sizeof (new_p->name_ptrs[0]));
if (new_p->name_ptrs == NULL) {
prexstat = TNFCTL_ERR_ALLOCFAIL;
goto Error;
}
new_p->func_addrs = malloc((count + 1) *
- sizeof (new_p->func_addrs[0]));
+ sizeof (new_p->func_addrs[0]));
if (new_p->func_addrs == NULL) {
prexstat = TNFCTL_ERR_ALLOCFAIL;
goto Error;
@@ -295,12 +293,11 @@ decode(tnfctl_handle_t *hndl, uintptr_t addr, char ***func_names,
}
DBG_TNF_PROBE_1(decode_3, "libtnfctl",
- "sunw%verbosity 2; sunw%debug 'decode built'",
- tnf_string, func_name,
- (thisname) ? (thisname) : "end_func");
+ "sunw%verbosity 2; sunw%debug 'decode built'",
+ tnf_string, func_name, (thisname) ? (thisname) : "end_func");
- find_pp = (decode_key_t **) tsearch(new_p,
- &hndl->decoderoot, decode_compare);
+ find_pp = (decode_key_t **)tsearch(new_p, &hndl->decoderoot,
+ decode_compare);
assert(*find_pp == new_p);
*func_names = new_p->name_ptrs;
*func_addrs = new_p->func_addrs;
@@ -323,9 +320,8 @@ Error:
* it is, return the down and next pointers
*/
static tnfctl_errcode_t
-iscomb(tnfctl_handle_t *hndl,
- uintptr_t addr, uintptr_t *down_p, uintptr_t *next_p,
- boolean_t *ret_val)
+iscomb(tnfctl_handle_t *hndl, uintptr_t addr, uintptr_t *down_p,
+ uintptr_t *next_p, boolean_t *ret_val)
{
int type;
boolean_t matched = B_FALSE;
@@ -342,8 +338,8 @@ iscomb(tnfctl_handle_t *hndl,
int tmp_bits = prb_callinfo.mask;
/* allocate room to copy the target code */
- size = (size_t) (calltmpl[type].end - calltmpl[type].entry);
- targ_p = (char *) malloc(size);
+ size = (size_t)(calltmpl[type].end - calltmpl[type].entry);
+ targ_p = malloc(size);
if (!targ_p)
return (TNFCTL_ERR_ALLOCFAIL);
@@ -361,20 +357,20 @@ iscomb(tnfctl_handle_t *hndl,
}
/* loop over all the words */
- tptr = (char *) calltmpl[type].entry;
+ tptr = (char *)calltmpl[type].entry;
for (ptr = targ_p; ptr < (targ_p + size); ptr++, tptr++) {
int downbits;
int nextbits;
/* LINTED pointer cast may result in improper alignment */
- int *uptr = (int *) ptr;
+ int *uptr = (int *)ptr;
/*
* If we are pointing at one of the words that we
* patch, * (down or next displ) then read that value
* in. * Otherwise make sure the words match.
*/
- if ((uintptr_t) tptr == calltmpl[type].down +
- prb_callinfo.offset) {
+ if ((uintptr_t)tptr == calltmpl[type].down +
+ prb_callinfo.offset) {
downbits = *uptr;
downbits &= prb_callinfo.mask;
/* sign extend */
@@ -388,8 +384,8 @@ iscomb(tnfctl_handle_t *hndl,
ptr += 3;
tptr += 3;
- } else if ((uintptr_t) tptr == calltmpl[type].next +
- prb_callinfo.offset) {
+ } else if ((uintptr_t)tptr == calltmpl[type].next +
+ prb_callinfo.offset) {
nextbits = *uptr;
nextbits &= prb_callinfo.mask;
/* sign extend */
@@ -478,7 +474,7 @@ findname(tnfctl_handle_t *hndl, uintptr_t addr, char **ret_name)
*/
static boolean_t
find(tnfctl_handle_t *hndl, comb_op_t op, uintptr_t down, uintptr_t next,
- uintptr_t * comb_p)
+ uintptr_t *comb_p)
{
comb_key_t key;
comb_key_t **find_pp;
@@ -488,7 +484,7 @@ find(tnfctl_handle_t *hndl, comb_op_t op, uintptr_t down, uintptr_t next,
key.next = next;
key.comb = NULL;
- find_pp = (comb_key_t **) tfind(&key, &hndl->buildroot, comb_compare);
+ find_pp = (comb_key_t **)tfind(&key, &hndl->buildroot, comb_compare);
if (find_pp) {
*comb_p = (*find_pp)->comb;
return (B_TRUE);
@@ -502,13 +498,13 @@ find(tnfctl_handle_t *hndl, comb_op_t op, uintptr_t down, uintptr_t next,
*/
static tnfctl_errcode_t
add(tnfctl_handle_t *hndl, comb_op_t op, uintptr_t down, uintptr_t next,
- uintptr_t comb)
+ uintptr_t comb)
{
comb_key_t *new_p;
/* LINTED set but not used in function */
- comb_key_t **ret_pp;
+ comb_key_t **ret_pp __unused;
- new_p = (comb_key_t *) malloc(sizeof (comb_key_t));
+ new_p = malloc(sizeof (comb_key_t));
if (!new_p)
return (TNFCTL_ERR_ALLOCFAIL);
@@ -517,8 +513,8 @@ add(tnfctl_handle_t *hndl, comb_op_t op, uintptr_t down, uintptr_t next,
new_p->next = next;
new_p->comb = comb;
- ret_pp = (comb_key_t **) tsearch(new_p, &hndl->buildroot,
- comb_compare);
+ ret_pp = (comb_key_t **)tsearch(new_p, &hndl->buildroot,
+ comb_compare);
assert(*ret_pp == new_p);
return (TNFCTL_ERR_NONE);
}
@@ -531,10 +527,10 @@ add(tnfctl_handle_t *hndl, comb_op_t op, uintptr_t down, uintptr_t next,
static int
decode_compare(const void *v0p, const void *v1p)
{
- decode_key_t *k0p = (decode_key_t *) v0p;
- decode_key_t *k1p = (decode_key_t *) v1p;
+ const decode_key_t *k0p = v0p;
+ const decode_key_t *k1p = v1p;
- return (int) ((uintptr_t) k1p->addr - (uintptr_t) k0p->addr);
+ return (int)((uintptr_t)k1p->addr - (uintptr_t)k0p->addr);
} /* end decode_compare */
@@ -544,8 +540,8 @@ decode_compare(const void *v0p, const void *v1p)
static int
comb_compare(const void *v0p, const void *v1p)
{
- comb_key_t *k0p = (comb_key_t *) v0p;
- comb_key_t *k1p = (comb_key_t *) v1p;
+ const comb_key_t *k0p = v0p;
+ const comb_key_t *k1p = v1p;
if (k0p->op != k1p->op)
return ((k0p->op < k1p->op) ? -1 : 1);
@@ -565,7 +561,7 @@ comb_compare(const void *v0p, const void *v1p)
*/
static tnfctl_errcode_t
build(tnfctl_handle_t *hndl, comb_op_t op, uintptr_t down, uintptr_t next,
- uintptr_t *comb_p)
+ uintptr_t *comb_p)
{
size_t size;
uintptr_t addr;
@@ -576,14 +572,6 @@ build(tnfctl_handle_t *hndl, comb_op_t op, uintptr_t down, uintptr_t next,
int miscstat;
tnfctl_errcode_t prexstat;
-#if 0
- (void) fprintf(stderr, "off=0x%x shift=0x%x mask=0x%x size=%d\n",
- prb_callinfo.offset,
- prb_callinfo.shift,
- prb_callinfo.mask,
- calltmpl[op].end - calltmpl[op].entry);
-#endif
-
*comb_p = NULL;
size = calltmpl[op].end - calltmpl[op].entry;
@@ -591,7 +579,7 @@ build(tnfctl_handle_t *hndl, comb_op_t op, uintptr_t down, uintptr_t next,
prexstat = _tnfctl_targmem_alloc(hndl, size, &addr);
if (prexstat) {
DBG((void) fprintf(stderr,
- "build: trouble allocating target memory:\n"));
+ "build: trouble allocating target memory:\n"));
goto Error;
}
@@ -607,17 +595,15 @@ build(tnfctl_handle_t *hndl, comb_op_t op, uintptr_t down, uintptr_t next,
/* poke the down address */
offset = calltmpl[op].down - calltmpl[op].entry;
/*LINTED pointer cast may result in improper alignment*/
- word_p = (unsigned *) (buffer_p + offset + prb_callinfo.offset);
+ word_p = (unsigned *)(buffer_p + offset + prb_callinfo.offset);
contents = down - (addr + offset);
#if defined(i386)
contents -= 5; /* intel offset is relative to *next* instr */
#endif
DBG_TNF_PROBE_4(build_1, "libtnfctl", "sunw%verbosity 3",
- tnf_opaque, down, down,
- tnf_opaque, contents, contents,
- tnf_opaque, word_p, word_p,
- tnf_long, offset, offset);
+ tnf_opaque, down, down, tnf_opaque, contents, contents,
+ tnf_opaque, word_p, word_p, tnf_long, offset, offset);
*word_p &= ~prb_callinfo.mask; /* clear the relevant field */
*word_p |= ((contents >> prb_callinfo.shift) & prb_callinfo.mask);
@@ -625,17 +611,15 @@ build(tnfctl_handle_t *hndl, comb_op_t op, uintptr_t down, uintptr_t next,
/* poke the next address */
offset = calltmpl[op].next - calltmpl[op].entry;
/*LINTED pointer cast may result in improper alignment*/
- word_p = (unsigned *) (buffer_p + offset + prb_callinfo.offset);
+ word_p = (unsigned *)(buffer_p + offset + prb_callinfo.offset);
contents = next - (addr + offset);
#if defined(i386)
contents -= 5; /* intel offset is relative to *next* instr */
#endif
DBG_TNF_PROBE_4(build_2, "libtnfctl", "sunw%verbosity 3",
- tnf_opaque, next, next,
- tnf_opaque, contents, contents,
- tnf_opaque, word_p, word_p,
- tnf_long, offset, offset);
+ tnf_opaque, next, next, tnf_opaque, contents, contents,
+ tnf_opaque, word_p, word_p, tnf_long, offset, offset);
*word_p &= ~prb_callinfo.mask; /* clear the relevant field */
*word_p |= ((contents >> prb_callinfo.shift) & prb_callinfo.mask);
@@ -644,7 +628,7 @@ build(tnfctl_handle_t *hndl, comb_op_t op, uintptr_t down, uintptr_t next,
miscstat = hndl->p_write(hndl->proc_p, addr, buffer_p, size);
if (miscstat) {
DBG((void) fprintf(stderr,
- "build: trouble writing combination: \n"));
+ "build: trouble writing combination: \n"));
prexstat = TNFCTL_ERR_INTERNAL;
goto Error;
}
diff --git a/usr/src/lib/mpapi/libmpapi/common/mpapi.c b/usr/src/lib/mpapi/libmpapi/common/mpapi.c
index 466b911884..afbfb148fb 100644
--- a/usr/src/lib/mpapi/libmpapi/common/mpapi.c
+++ b/usr/src/lib/mpapi/libmpapi/common/mpapi.c
@@ -261,7 +261,6 @@ void InitLibrary()
if (plugintable[i].hdlPlugin != NULL) {
InitializeFn PassFunc;
- MP_STATUS status;
wcsncpy(plugintable[i].pluginName,
name, MAX_NAME_SIZE);
@@ -273,7 +272,7 @@ void InitLibrary()
PassFunc = (InitializeFn)
dlsym(plugintable[i].hdlPlugin, "Initialize");
if (PassFunc != NULL) {
- status = PassFunc(plugintable[i].ownerId);
+ (void) PassFunc(plugintable[i].ownerId);
}
i++;
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-31 05:32:52 +0000