diff options
29 files changed, 163 insertions, 160 deletions
diff --git a/usr/src/cmd/rcm_daemon/common/pool_rcm.c b/usr/src/cmd/rcm_daemon/common/pool_rcm.c index 16ac26e9f0..438ac736b0 100644 --- a/usr/src/cmd/rcm_daemon/common/pool_rcm.c +++ b/usr/src/cmd/rcm_daemon/common/pool_rcm.c @@ -18,13 +18,12 @@ * * CDDL HEADER END */ + /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <stdio.h> #include <stdlib.h> #include <sys/types.h> @@ -249,7 +248,7 @@ pset_validate_remove(nvlist_t *nvl, char **errorp) */ rcm_log_message(RCM_TRACE1, gettext("POOL: 'old_total' (%d) is less than 'new_total' " - "(%d)\n"), old_total, new_total); + "(%d)\n"), old_total, new_total); return (RCM_SUCCESS); } if ((removed_list = malloc((old_total - new_total + 1) * sizeof (int))) @@ -261,7 +260,7 @@ pset_validate_remove(nvlist_t *nvl, char **errorp) goto out; } if ((error = nvlist_lookup_int32_array(nvl, "old_cpu_list", - &old_cpu_list, &nelem)) != 0) { + &old_cpu_list, &nelem)) != 0) { rcm_log_message(RCM_ERROR, gettext("POOL: 'old_cpu_list' not found in nvlist: %s\n"), strerror(error)); @@ -276,7 +275,7 @@ pset_validate_remove(nvlist_t *nvl, char **errorp) goto out; } if ((error = nvlist_lookup_int32_array(nvl, "new_cpu_list", - &new_cpu_list, &nelem)) != 0) { + &new_cpu_list, &nelem)) != 0) { rcm_log_message(RCM_ERROR, gettext("POOL: 'new_cpu_list' not found in nvlist: %s\n"), strerror(error)); @@ -315,8 +314,8 @@ pset_validate_remove(nvlist_t *nvl, char **errorp) /* * Look for resources with "'type' = 'pset'" */ - pool_value_set_name(pvals[0], "type"); - pool_value_set_string(pvals[0], "pset"); + (void) pool_value_set_name(pvals[0], "type"); + (void) pool_value_set_string(pvals[0], "pset"); if ((res = pool_query_resources(conf, &nelem, pvals)) == NULL) { rcm_log_message(RCM_ERROR, gettext("POOL: No psets found in configuration\n")); @@ -402,12 +401,12 @@ pool_register(rcm_handle_t *hdl) registered++; for (i = 0; registrations[i].rsrc != NULL; i++) { if (rcm_register_capacity(hdl, (char *)registrations[i].rsrc, - 0, NULL) != RCM_SUCCESS) { - rcm_log_message(RCM_ERROR, - gettext("POOL: failed to register capacity " - "change for '%s'\n"), - registrations[i].rsrc); - } + 0, NULL) != RCM_SUCCESS) { + rcm_log_message(RCM_ERROR, + gettext("POOL: failed to register capacity " + "change for '%s'\n"), + registrations[i].rsrc); + } } return (RCM_SUCCESS); } diff --git a/usr/src/common/openssl/crypto/engine/hw_pk11.c b/usr/src/common/openssl/crypto/engine/hw_pk11.c index 50680ae18f..d833300e27 100644 --- a/usr/src/common/openssl/crypto/engine/hw_pk11.c +++ b/usr/src/common/openssl/crypto/engine/hw_pk11.c @@ -990,7 +990,7 @@ static ENGINE *engine_pk11(void) if (!bind_pk11(ret)) { - ENGINE_free(ret); + (void) ENGINE_free(ret); return (NULL); } @@ -1019,7 +1019,7 @@ ENGINE_load_pk11(void) e_pk11 = engine_pk11(); if (!e_pk11) { - DSO_free(pk11_dso); + (void) DSO_free(pk11_dso); pk11_dso = NULL; return; } @@ -1032,15 +1032,15 @@ ENGINE_load_pk11(void) */ if (!pk11_library_init(e_pk11)) { - DSO_free(pk11_dso); + (void) DSO_free(pk11_dso); pk11_dso = NULL; - ENGINE_free(e_pk11); + (void) ENGINE_free(e_pk11); return; } - ENGINE_add(e_pk11); + (void) ENGINE_add(e_pk11); - ENGINE_free(e_pk11); + (void) ENGINE_free(e_pk11); ERR_clear_error(); } #endif /* ENGINE_DYNAMIC_SUPPORT */ diff --git a/usr/src/common/openssl/crypto/engine/hw_pk11_pub.c b/usr/src/common/openssl/crypto/engine/hw_pk11_pub.c index 2487fef1a2..04126bada3 100644 --- a/usr/src/common/openssl/crypto/engine/hw_pk11_pub.c +++ b/usr/src/common/openssl/crypto/engine/hw_pk11_pub.c @@ -1,5 +1,5 @@ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -1350,7 +1350,7 @@ static CK_OBJECT_HANDLE pk11_get_public_rsa_key(RSA* rsa, goto malloc_err; } - BN_bn2bin(rsa->n, a_key_template[5].pValue); + (void) BN_bn2bin(rsa->n, a_key_template[5].pValue); a_key_template[6].ulValueLen = BN_num_bytes(rsa->e); a_key_template[6].pValue = (CK_VOID_PTR)OPENSSL_malloc( @@ -1361,7 +1361,7 @@ static CK_OBJECT_HANDLE pk11_get_public_rsa_key(RSA* rsa, goto malloc_err; } - BN_bn2bin(rsa->e, a_key_template[6].pValue); + (void) BN_bn2bin(rsa->e, a_key_template[6].pValue); /* see find_lock array definition for more info on object locking */ LOCK_OBJSTORE(OP_RSA); @@ -1853,8 +1853,9 @@ pk11_dsa_do_verify(const unsigned char *dgst, int dlen, DSA_SIG *sig, * to act accordingly and shift if necessary. */ (void) memset(sigbuf, 0, siglen); - BN_bn2bin(sig->r, sigbuf + siglen2 - BN_num_bytes(sig->r)); - BN_bn2bin(sig->s, &sigbuf[siglen2] + siglen2 - + (void) BN_bn2bin(sig->r, + sigbuf + siglen2 - BN_num_bytes(sig->r)); + (void) BN_bn2bin(sig->s, &sigbuf[siglen2] + siglen2 - BN_num_bytes(sig->s)); rv = pFuncList->C_Verify(sp->session, @@ -2495,7 +2496,7 @@ static int pk11_DH_compute_key(unsigned char *key, const BIGNUM *pub_key, PK11err(PK11_F_DH_COMP_KEY, PK11_R_MALLOC_FAILURE); goto err; } - BN_bn2bin(pub_key, mechanism.pParameter); + (void) BN_bn2bin(pub_key, mechanism.pParameter); (void) check_new_dh_key(sp, dh); @@ -2645,7 +2646,7 @@ static CK_OBJECT_HANDLE pk11_get_dh_key(DH* dh, goto malloc_err; } - BN_bn2bin(dh->p, key_template[4].pValue); + (void) BN_bn2bin(dh->p, key_template[4].pValue); key_template[5].ulValueLen = BN_num_bytes(dh->g); key_template[5].pValue = (CK_VOID_PTR)OPENSSL_malloc( @@ -2656,7 +2657,7 @@ static CK_OBJECT_HANDLE pk11_get_dh_key(DH* dh, goto malloc_err; } - BN_bn2bin(dh->g, key_template[5].pValue); + (void) BN_bn2bin(dh->g, key_template[5].pValue); key_template[6].ulValueLen = BN_num_bytes(dh->priv_key); key_template[6].pValue = (CK_VOID_PTR)OPENSSL_malloc( @@ -2667,7 +2668,7 @@ static CK_OBJECT_HANDLE pk11_get_dh_key(DH* dh, goto malloc_err; } - BN_bn2bin(dh->priv_key, key_template[6].pValue); + (void) BN_bn2bin(dh->priv_key, key_template[6].pValue); /* see find_lock array definition for more info on object locking */ LOCK_OBJSTORE(OP_DH); @@ -2796,7 +2797,7 @@ static int init_template_value(BIGNUM *bn, CK_VOID_PTR *p_value, if (*p_value == NULL) return (0); - BN_bn2bin(bn, *p_value); + (void) BN_bn2bin(bn, *p_value); return (1); } diff --git a/usr/src/lib/auditd_plugins/binfile/binfile.c b/usr/src/lib/auditd_plugins/binfile/binfile.c index 02960e89cb..f30f9871a1 100644 --- a/usr/src/lib/auditd_plugins/binfile/binfile.c +++ b/usr/src/lib/auditd_plugins/binfile/binfile.c @@ -18,13 +18,13 @@ * * CDDL HEADER END */ + /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. * * write binary audit records directly to a file. */ -#pragma ident "%Z%%M% %I% %E% SMI" #define DEBUG 0 @@ -643,7 +643,7 @@ open_log(dirlist_t *current_dir) */ binfile_cursize = 0; - __logpost(newname); + (void) __logpost(newname); DPRINT((dbfp, "binfile: Log opened: %s\n", newname)); return (1); @@ -940,7 +940,7 @@ auditd_plugin(const char *input, size_t in_len, uint32_t sequence, char **error) rc = AUDITD_RETRY; *error = strdup(gettext( "all partitions full\n")); - __logpost(""); + (void) __logpost(""); } } } @@ -1017,11 +1017,11 @@ auditd_plugin_open(const kva_t *kvlist, char **ret_list, char **error) status = loadauditlist(dirlist, minfree); if (status == -1) { - __logpost(""); + (void) __logpost(""); *error = strdup(gettext("no directories configured")); return (AUDITD_RETRY); } else if (status == AUDITD_NO_MEMORY) { - __logpost(""); + (void) __logpost(""); *error = strdup(gettext("no memory")); return (status); } else { /* status is 0 or -2 (no change or changed) */ diff --git a/usr/src/lib/libbrand/common/libbrand.c b/usr/src/lib/libbrand/common/libbrand.c index 3db4acc1e4..5614623c88 100644 --- a/usr/src/lib/libbrand/common/libbrand.c +++ b/usr/src/lib/libbrand/common/libbrand.c @@ -142,7 +142,7 @@ libbrand_initialize() * us, libzonecfg initializes libxml2 to essentially * the same defaults as we're using below. */ - xmlLineNumbersDefault(1); + (void) xmlLineNumbersDefault(1); xmlLoadExtDtdDefaultValue |= XML_DETECT_IDS; xmlDoValidityCheckingDefaultValue = 1; (void) xmlKeepBlanksDefault(0); diff --git a/usr/src/lib/libc/port/gen/attrat.c b/usr/src/lib/libc/port/gen/attrat.c index eab90989ef..725bdd9b12 100644 --- a/usr/src/lib/libc/port/gen/attrat.c +++ b/usr/src/lib/libc/port/gen/attrat.c @@ -19,12 +19,10 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include "lint.h" #include <string.h> #include <stdlib.h> @@ -75,7 +73,7 @@ attrat_init() (freer = dlsym(handle, "nvlist_free")) == NULL || (looker = dlsym(handle, "nvlist_lookup_uint64")) == NULL) { if (handle) - dlclose(handle); + (void) dlclose(handle); return (-1); } @@ -83,7 +81,7 @@ attrat_init() if (initialized != 0) { lmutex_unlock(&attrlock); - dlclose(handle); + (void) dlclose(handle); return (0); } diff --git a/usr/src/lib/libc/port/gen/crypt.c b/usr/src/lib/libc/port/gen/crypt.c index bfb859867e..3d3e369bab 100644 --- a/usr/src/lib/libc/port/gen/crypt.c +++ b/usr/src/lib/libc/port/gen/crypt.c @@ -20,12 +20,10 @@ */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #pragma weak _crypt = crypt #pragma weak _encrypt = encrypt #pragma weak _setkey = setkey @@ -791,7 +789,7 @@ _unix_crypt_gensalt(char *gsbuffer, "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; struct timeval tv; - gettimeofday(&tv, (void *) 0); + (void) gettimeofday(&tv, (void *) 0); srand48(tv.tv_sec ^ tv.tv_usec); gsbuffer[0] = saltchars[lrand48() % 64]; /* lrand48() is MT-SAFE */ gsbuffer[1] = saltchars[lrand48() % 64]; /* lrand48() is MT-SAFE */ diff --git a/usr/src/lib/libc/port/gen/hsearch.c b/usr/src/lib/libc/port/gen/hsearch.c index 6a04ae0743..433d8e6dd3 100644 --- a/usr/src/lib/libc/port/gen/hsearch.c +++ b/usr/src/lib/libc/port/gen/hsearch.c @@ -20,15 +20,13 @@ */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * Compile time switches: * @@ -179,7 +177,7 @@ start: fprintf(stderr, "Out of core \n"); exit(FAIL); } - strcpy(new->key, line); + (void) strcpy(new->key, line); new->data = malloc(sizeof (int)); if (new->data == NULL) { fprintf(stderr, "Out of core \n"); diff --git a/usr/src/lib/libc/port/gen/nss_common.c b/usr/src/lib/libc/port/gen/nss_common.c index 67228d6162..a24dbc9ba2 100644 --- a/usr/src/lib/libc/port/gen/nss_common.c +++ b/usr/src/lib/libc/port/gen/nss_common.c @@ -1896,7 +1896,7 @@ nss_unpack(void *buffer, size_t bufsize, nss_db_root_t *rootp, arg->numgids = i; gidp = arg->gid_array; gptr = (gid_t *)((void *)buf); - memcpy(gidp, gptr, len); + (void) memcpy(gidp, gptr, len); return (NSS_SUCCESS); } if (fmt_type == 2) { diff --git a/usr/src/lib/libc/port/gen/nss_dbdefs.c b/usr/src/lib/libc/port/gen/nss_dbdefs.c index ee526c5f3c..b914c1d313 100644 --- a/usr/src/lib/libc/port/gen/nss_dbdefs.c +++ b/usr/src/lib/libc/port/gen/nss_dbdefs.c @@ -1078,7 +1078,7 @@ nss_pinit_funcs(int index, nss_db_initf_t *initf, nss_str2ent_t *s2e) } lmutex_unlock(&handle_lock); if (htmp) - dlclose(htmp); + (void) dlclose(htmp); } membar_consumer(); diff --git a/usr/src/lib/libc/port/gen/walkstack.c b/usr/src/lib/libc/port/gen/walkstack.c index a4bcef258e..02afc8f214 100644 --- a/usr/src/lib/libc/port/gen/walkstack.c +++ b/usr/src/lib/libc/port/gen/walkstack.c @@ -18,12 +18,10 @@ * * CDDL HEADER END * - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * This file provides a general purpose mechanism * for a user thread to walk its own call stack, @@ -508,7 +506,7 @@ backtrace_symbols(void *const *array, int size) for (len = i = 0; i < size; i++) { ret[i] = (char *)ret + size * sizeof (char *) + len; - strcpy(ret[i], ret_buffer[i]); + (void) strcpy(ret[i], ret_buffer[i]); len += strlen(ret_buffer[i]) + 1; } diff --git a/usr/src/lib/libc/port/rt/clock_timer.c b/usr/src/lib/libc/port/rt/clock_timer.c index 2fbcc1a831..cf14c762eb 100644 --- a/usr/src/lib/libc/port/rt/clock_timer.c +++ b/usr/src/lib/libc/port/rt/clock_timer.c @@ -20,12 +20,10 @@ */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include "lint.h" #include <time.h> #include <sys/types.h> @@ -111,7 +109,7 @@ timer_create(clockid_t clock_id, struct sigevent *sigevp, timer_t *timerid) if (sigev_thread) { if (rc == 0) { if ((rc = launch_spawner(tcdp)) != 0) - __timer_delete(*timerid); + (void) __timer_delete(*timerid); else timer_tcd[*timerid] = tcdp; } diff --git a/usr/src/lib/libc/port/threads/cancel.c b/usr/src/lib/libc/port/threads/cancel.c index 8a77f42088..f9e5a3a07c 100644 --- a/usr/src/lib/libc/port/threads/cancel.c +++ b/usr/src/lib/libc/port/threads/cancel.c @@ -20,12 +20,10 @@ */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include "lint.h" #include "thr_uberdata.h" @@ -384,7 +382,7 @@ set_parking_flag(ulwp_t *self, int park) scp->sc_flgs |= SC_CANCEL_FLG; } } else if (park == 0) { /* schedctl failed, do it the long way */ - __lwp_unpark(self->ul_lwpid); + (void) __lwp_unpark(self->ul_lwpid); } exit_critical(self); } diff --git a/usr/src/lib/libkmf/libkmf/common/policy.c b/usr/src/lib/libkmf/libkmf/common/policy.c index 977b3ddaf7..1965d68bbc 100644 --- a/usr/src/lib/libkmf/libkmf/common/policy.c +++ b/usr/src/lib/libkmf/libkmf/common/policy.c @@ -17,8 +17,10 @@ * information: Portions Copyright [yyyy] [name of copyright owner] * * CDDL HEADER END - * - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + */ + +/* + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -66,7 +68,7 @@ addFormatting(xmlNodePtr parent, char *text) snode = xmlNewText((const xmlChar *)text); if (snode != NULL) { - xmlAddChild(parent, snode); + (void) xmlAddChild(parent, snode); } } @@ -1311,7 +1313,7 @@ kmf_add_policy_to_db(KMF_POLICY_RECORD *policy, char *dbfilename, root = xmlNewDocNode(doc, NULL, (const xmlChar *)KMF_POLICY_ROOT, NULL); if (root != NULL) { - xmlDocSetRootElement(doc, root); + (void) xmlDocSetRootElement(doc, root); } } diff --git a/usr/src/lib/libkmf/plugins/kmf_nss/common/nss_spi.c b/usr/src/lib/libkmf/plugins/kmf_nss/common/nss_spi.c index d68dabc71d..5fe4f0a766 100644 --- a/usr/src/lib/libkmf/plugins/kmf_nss/common/nss_spi.c +++ b/usr/src/lib/libkmf/plugins/kmf_nss/common/nss_spi.c @@ -18,6 +18,7 @@ * * CDDL HEADER END */ + /* * NSS keystore wrapper * @@ -172,13 +173,13 @@ typedef struct p12uContextStr { KMF_PLUGIN_FUNCLIST * KMF_Plugin_Initialize() { - SEC_PKCS12EnableCipher(PKCS12_RC4_40, 1); - SEC_PKCS12EnableCipher(PKCS12_RC4_128, 1); - SEC_PKCS12EnableCipher(PKCS12_RC2_CBC_40, 1); - SEC_PKCS12EnableCipher(PKCS12_RC2_CBC_128, 1); - SEC_PKCS12EnableCipher(PKCS12_DES_56, 1); - SEC_PKCS12EnableCipher(PKCS12_DES_EDE3_168, 1); - SEC_PKCS12SetPreferredCipher(PKCS12_DES_EDE3_168, 1); + (void) SEC_PKCS12EnableCipher(PKCS12_RC4_40, 1); + (void) SEC_PKCS12EnableCipher(PKCS12_RC4_128, 1); + (void) SEC_PKCS12EnableCipher(PKCS12_RC2_CBC_40, 1); + (void) SEC_PKCS12EnableCipher(PKCS12_RC2_CBC_128, 1); + (void) SEC_PKCS12EnableCipher(PKCS12_DES_56, 1); + (void) SEC_PKCS12EnableCipher(PKCS12_DES_EDE3_168, 1); + (void) SEC_PKCS12SetPreferredCipher(PKCS12_DES_EDE3_168, 1); return (&nss_plugin_table); } @@ -797,7 +798,7 @@ InitRandom(char *filename) count = read(fd, buf, sizeof (buf)); if (count > 0) { - PK11_RandomUpdate(buf, count); + (void) PK11_RandomUpdate(buf, count); } (void) close(fd); @@ -973,9 +974,9 @@ NSS_CreateKeypair(KMF_HANDLE_T handle, cleanup: if (rv != KMF_OK) { if (NSSpubkey) - PK11_DeleteTokenPublicKey(NSSpubkey); + (void) PK11_DeleteTokenPublicKey(NSSpubkey); if (NSSprivkey) - PK11_DeleteTokenPrivateKey(NSSprivkey, PR_TRUE); + (void) PK11_DeleteTokenPrivateKey(NSSprivkey, PR_TRUE); privkey->keyp = NULL; pubkey->keyp = NULL; @@ -1627,12 +1628,12 @@ p12u_DestroyContext(p12uContext **ppCtx, PRBool removeFile) } if ((*ppCtx)->file != NULL) { - PR_Close((*ppCtx)->file); + (void) PR_Close((*ppCtx)->file); } if ((*ppCtx)->filename != NULL) { if (removeFile) { - PR_Delete((*ppCtx)->filename); + (void) PR_Delete((*ppCtx)->filename); } free((*ppCtx)->filename); } @@ -1682,7 +1683,7 @@ p12u_WriteToExportFile(void *arg, const char *buf, unsigned long len) writeLen = PR_Write(p12cxt->file, (unsigned char *)buf, (int32)len); if (writeLen != (int)len) { - PR_Close(p12cxt->file); + (void) PR_Close(p12cxt->file); free(p12cxt->filename); p12cxt->filename = NULL; p12cxt->file = NULL; @@ -1978,7 +1979,7 @@ out: PK11_FreeSlot(nss_slot); if (rv != KMF_OK && nsskey != NULL) { - PK11_DeleteTokenSymKey(nsskey); + (void) PK11_DeleteTokenSymKey(nsskey); PK11_FreeSymKey(nsskey); } return (rv); @@ -2511,7 +2512,7 @@ out: } if (nss_crl != NULL) { - SEC_DestroyCrl(nss_crl); + (void) SEC_DestroyCrl(nss_crl); } return (ret); @@ -2671,7 +2672,7 @@ out: } if (crl != NULL) { - SEC_DestroyCrl(crl); + (void) SEC_DestroyCrl(crl); } return (rv); @@ -2886,7 +2887,7 @@ out: } if (crl != NULL) { - SEC_DestroyCrl(crl); + (void) SEC_DestroyCrl(crl); } return (rv); diff --git a/usr/src/lib/libnsl/rpc/netname.c b/usr/src/lib/libnsl/rpc/netname.c index 37fdd837ed..67f0fe5c76 100644 --- a/usr/src/lib/libnsl/rpc/netname.c +++ b/usr/src/lib/libnsl/rpc/netname.c @@ -37,7 +37,6 @@ * Well, at least the API doesn't involve pointers-to-static. */ - /* * netname utility routines (getnetname, user2netname, host2netname). * @@ -233,7 +232,7 @@ user2netname(char netname[MAXNETNAMELEN + 1], const uid_t uid, break; case __NSW_RETURN : if (needfree) - __nsw_freeconfig(conf); + (void) __nsw_freeconfig(conf); (void) mutex_unlock(&serialize_netname); return (res); default : @@ -243,7 +242,7 @@ user2netname(char netname[MAXNETNAMELEN + 1], const uid_t uid, } } if (needfree) - __nsw_freeconfig(conf); + (void) __nsw_freeconfig(conf); (void) mutex_unlock(&serialize_netname); return (0); } diff --git a/usr/src/lib/libnsl/rpc/netnamer.c b/usr/src/lib/libnsl/rpc/netnamer.c index 50323b08b9..80ce59c358 100644 --- a/usr/src/lib/libnsl/rpc/netnamer.c +++ b/usr/src/lib/libnsl/rpc/netnamer.c @@ -435,7 +435,7 @@ netname2user(const char netname[MAXNETNAMELEN + 1], uid_t *uidp, gid_t *gidp, break; case __NSW_RETURN : if (needfree) - __nsw_freeconfig(conf); + (void) __nsw_freeconfig(conf); (void) mutex_unlock(&serialize_netname_r); return (res); default : @@ -445,7 +445,7 @@ netname2user(const char netname[MAXNETNAMELEN + 1], uid_t *uidp, gid_t *gidp, } } if (needfree) - __nsw_freeconfig(conf); + (void) __nsw_freeconfig(conf); (void) mutex_unlock(&serialize_netname_r); return (0); } diff --git a/usr/src/lib/libpool/common/pool_kernel.c b/usr/src/lib/libpool/common/pool_kernel.c index 3da4f0263c..eeab60f312 100644 --- a/usr/src/lib/libpool/common/pool_kernel.c +++ b/usr/src/lib/libpool/common/pool_kernel.c @@ -18,13 +18,12 @@ * * CDDL HEADER END */ + /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <assert.h> #include <errno.h> #include <exacct.h> @@ -621,7 +620,7 @@ pool_knl_find_nvpair(nvlist_t *l, const char *name) nvpair_t *pair; for (pair = nvlist_next_nvpair(l, NULL); pair != NULL; - pair = nvlist_next_nvpair(l, pair)) { + pair = nvlist_next_nvpair(l, pair)) { if (strcmp(nvpair_name(pair), name) == 0) break; } @@ -878,7 +877,7 @@ prop_build_cb(pool_conf_t *UNUSED, pool_elem_t *pe, const char *name, struct knl_to_xml *info = (struct knl_to_xml *)user; return (pool_knl_put_xml_property((pool_elem_t *)pe, info->ktx_node, - name, pval)); + name, pval)); } /* @@ -937,7 +936,7 @@ pool_knl_export(const pool_conf_t *conf, const char *location, switch (fmt) { case POX_NATIVE: info.ktx_doc = xmlNewDoc(BAD_CAST "1.0"); - xmlCreateIntSubset(info.ktx_doc, BAD_CAST "system", + (void) xmlCreateIntSubset(info.ktx_doc, BAD_CAST "system", BAD_CAST "-//Sun Microsystems Inc//DTD Resource " "Management All//EN", BAD_CAST dtd_location); @@ -964,8 +963,9 @@ pool_knl_export(const pool_conf_t *conf, const char *location, system = info.ktx_node; info.ktx_doc->_private = (void *)conf; - xmlDocSetRootElement(info.ktx_doc, info.ktx_node); - xmlSetProp(info.ktx_node, BAD_CAST c_ref_id, BAD_CAST "dummy"); + (void) xmlDocSetRootElement(info.ktx_doc, info.ktx_node); + (void) xmlSetProp(info.ktx_node, BAD_CAST c_ref_id, + BAD_CAST "dummy"); if ((node_comment = xmlNewDocComment(info.ktx_doc, BAD_CAST "\nConfiguration for pools facility. Do NOT" " edit this file by hand - use poolcfg(1)" @@ -1053,7 +1053,7 @@ pool_knl_export(const pool_conf_t *conf, const char *location, sep = " "; } free(rs); - xmlSetProp(info.ktx_node, BAD_CAST "res", + (void) xmlSetProp(info.ktx_node, BAD_CAST "res", BAD_CAST cb->cb_buf); if (set_char_buf(cb, "%s_%d", pool_elem_class_string(elem), @@ -1063,7 +1063,8 @@ pool_knl_export(const pool_conf_t *conf, const char *location, xmlFreeDoc(info.ktx_doc); return (PO_FAIL); } - xmlSetProp(info.ktx_node, BAD_CAST c_ref_id, + (void) xmlSetProp(info.ktx_node, + BAD_CAST c_ref_id, BAD_CAST cb->cb_buf); } free(ps); @@ -1106,7 +1107,8 @@ pool_knl_export(const pool_conf_t *conf, const char *location, xmlFreeDoc(info.ktx_doc); return (PO_FAIL); } - xmlSetProp(info.ktx_node, BAD_CAST c_ref_id, + (void) xmlSetProp(info.ktx_node, + BAD_CAST c_ref_id, BAD_CAST cb->cb_buf); if ((cs = pool_query_resource_components(conf, rs[i], &ncompelem, NULL)) != NULL) { @@ -1153,7 +1155,7 @@ pool_knl_export(const pool_conf_t *conf, const char *location, ktx_doc); return (PO_FAIL); } - xmlSetProp(info.ktx_node, + (void) xmlSetProp(info.ktx_node, BAD_CAST c_ref_id, BAD_CAST cb->cb_buf); } @@ -1295,7 +1297,7 @@ build_result_set(const void *key, void **value, void *cl) } if (matched == PO_TRUE) (void) pool_knl_result_set_append(qo->rs, - (pool_knl_elem_t *)key); + (pool_knl_elem_t *)key); } else { (void) pool_knl_result_set_append(qo->rs, (pool_knl_elem_t *)key); @@ -1496,7 +1498,8 @@ pool_knl_set_binding(pool_conf_t *conf, const char *pool_name, idtype_t idtype, bind.pb_o_pool_id = elem_get_sysid(TO_ELEM(pool)); while ((ret = ioctl(prov->pkc_fd, POOL_BIND, &bind)) < 0 && - errno == EAGAIN); + errno == EAGAIN) + ; if (ret < 0) { pool_seterror(POE_SYSTEM); return (PO_FAIL); @@ -2553,7 +2556,7 @@ pool_knl_get_properties(const pool_elem_t *pe, uint_t *nprops) *nprops = 0; for (pair = nvlist_next_nvpair(pke->pke_properties, NULL); pair != NULL; - pair = nvlist_next_nvpair(pke->pke_properties, pair)) + pair = nvlist_next_nvpair(pke->pke_properties, pair)) (*nprops)++; if ((result = calloc(*nprops + 1, sizeof (pool_value_t *))) == NULL) { pool_seterror(POE_SYSTEM); @@ -2857,7 +2860,8 @@ log_item_commit(log_item_t *li) (void) dict_remove(prov->pkc_elements, (pool_knl_elem_t *)destroy->pdu_elem); while ((ret = ioctl(prov->pkc_fd, POOL_DESTROY, - &destroy->pdu_ioctl)) < 0 && errno == EAGAIN); + &destroy->pdu_ioctl)) < 0 && errno == EAGAIN) + ; if (ret < 0) { pool_seterror(POE_SYSTEM); return (PO_FAIL); @@ -2876,7 +2880,8 @@ log_item_commit(log_item_t *li) assoc->pau_ioctl.pa_o_res_id = elem_get_sysid(assoc->pau_newres); while ((ret = ioctl(prov->pkc_fd, POOL_ASSOC, - &assoc->pau_ioctl)) < 0 && errno == EAGAIN); + &assoc->pau_ioctl)) < 0 && errno == EAGAIN) + ; if (ret < 0) { pool_seterror(POE_SYSTEM); return (PO_FAIL); @@ -2890,7 +2895,8 @@ log_item_commit(log_item_t *li) elem_get_sysid(dissoc->pdu_dissoc); while ((ret = ioctl(prov->pkc_fd, POOL_DISSOC, - &dissoc->pdu_ioctl)) < 0 && errno == EAGAIN); + &dissoc->pdu_ioctl)) < 0 && errno == EAGAIN) + ; if (ret < 0) { pool_seterror(POE_SYSTEM); return (PO_FAIL); @@ -3148,7 +3154,8 @@ log_item_undo(log_item_t *li) u_destroy.pd_o_id = create->pcu_ioctl.pc_i_id; while ((ret = ioctl(prov->pkc_fd, POOL_DESTROY, - &u_destroy)) < 0 && errno == EAGAIN); + &u_destroy)) < 0 && errno == EAGAIN) + ; if (ret < 0) { pool_seterror(POE_SYSTEM); return (PO_FAIL); @@ -3197,7 +3204,7 @@ log_item_undo(log_item_t *li) * to restore the state of the newly created property */ (void) nvlist_dup(((pool_knl_elem_t *)destroy->pdu_elem)-> - pke_properties, &tmplist, 0); + pke_properties, &tmplist, 0); for (pair = nvlist_next_nvpair(tmplist, NULL); pair != NULL; pair = nvlist_next_nvpair(tmplist, pair)) { const pool_prop_t *prop; @@ -3250,7 +3257,8 @@ log_item_undo(log_item_t *li) u_assoc.pa_o_id_type = assoc->pau_ioctl.pa_o_id_type; while ((ret = ioctl(prov->pkc_fd, POOL_ASSOC, &u_assoc)) < 0 && - errno == EAGAIN); + errno == EAGAIN) + ; if (ret < 0) { pool_seterror(POE_SYSTEM); return (PO_FAIL); @@ -3265,7 +3273,8 @@ log_item_undo(log_item_t *li) u_assoc.pa_o_id_type = dissoc->pdu_ioctl.pd_o_id_type; while ((ret = ioctl(prov->pkc_fd, POOL_ASSOC, &u_assoc)) < 0 && - errno == EAGAIN); + errno == EAGAIN) + ; if (ret < 0) { pool_seterror(POE_SYSTEM); return (PO_FAIL); diff --git a/usr/src/lib/libpool/common/pool_xml.c b/usr/src/lib/libpool/common/pool_xml.c index 78ea8f5156..4f0b6df116 100644 --- a/usr/src/lib/libpool/common/pool_xml.c +++ b/usr/src/lib/libpool/common/pool_xml.c @@ -19,12 +19,10 @@ * CDDL HEADER END */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <errno.h> #include <fcntl.h> #include <limits.h> @@ -267,11 +265,11 @@ xml_init() /* * DTD validation, with line numbers. */ - xmlLineNumbersDefault(1); + (void) xmlLineNumbersDefault(1); xmlLoadExtDtdDefaultValue |= XML_DETECT_IDS; xmlDoValidityCheckingDefaultValue = 1; /* Try to improve indentation and readability */ - xmlKeepBlanksDefault(0); + (void) xmlKeepBlanksDefault(0); /* Send all XML errors to our debug handler */ xmlSetGenericErrorFunc(NULL, pool_error_func); /* Load up DTD element a-dtype data to improve performance */ @@ -1218,9 +1216,9 @@ pool_xml_validate(const pool_conf_t *conf, pool_valid_level_t level) * Note: This is resource specific. */ return (((pool_validate_resource(conf, "pset", c_min_prop, 0) == - PO_SUCCESS) && - (pool_validate_resource(conf, "pset", c_max_prop, 0) == - PO_SUCCESS)) ? PO_SUCCESS : PO_FAIL); + PO_SUCCESS) && + (pool_validate_resource(conf, "pset", c_max_prop, 0) == + PO_SUCCESS)) ? PO_SUCCESS : PO_FAIL); } return (PO_SUCCESS); } @@ -1539,7 +1537,7 @@ pool_xml_elem_create(pool_conf_t *conf, pool_elem_class_t class, (void) memset(elem, 0, sizeof (pool_xml_resource_t)); if ((elem->pxe_node = node_create_with_id (((pool_xml_elem_t *)parent)->pxe_node, - BAD_CAST element_class_tags[class])) == NULL) { + BAD_CAST element_class_tags[class])) == NULL) { pool_seterror(POE_DATASTORE); (void) pool_xml_elem_remove((pool_elem_t *)elem); return (NULL); @@ -1576,8 +1574,8 @@ pool_xml_elem_create(pool_conf_t *conf, pool_elem_class_t class, return (NULL); } if (xmlSetProp(elem->pxe_node, BAD_CAST c_type, - BAD_CAST pool_elem_class_string( - (pool_elem_t *)elem)) == NULL) { + BAD_CAST pool_elem_class_string( + (pool_elem_t *)elem)) == NULL) { pool_seterror(POE_DATASTORE); (void) pool_xml_elem_remove((pool_elem_t *)elem); return (NULL); @@ -1908,7 +1906,8 @@ pool_xml_set_container(pool_elem_t *pp, pool_elem_t *pc) xmlUnlinkNode(pxc->pxe_node); if (xmlAddChild(pxp->pxe_node, pxc->pxe_node) == NULL) { - xmlAddChild(parent, pxc->pxe_node); /* Try to move back */ + /* Try to move back */ + (void) xmlAddChild(parent, pxc->pxe_node); pool_seterror(POE_INVALID_CONF); return (PO_FAIL); } @@ -2326,7 +2325,7 @@ pool_build_xpath_buf(pool_xml_connection_t *prov, const pool_elem_t *src, prop_name = attr_name; if (class == PEC_RES_COMP || class == PEC_RES_AGG || - class == PEC_COMP) { + class == PEC_COMP) { if (type_prefix != NULL) free(type_prefix); type_prefix = strdup(prefix); @@ -2412,8 +2411,10 @@ pool_build_xpath_buf(pool_xml_connection_t *prov, const pool_elem_t *src, char *where = strrchr(cb->cb_buf, '['); if (is_attr != PO_TRUE) { /* repeat */ - while (*--where != '['); - while (*--where != '['); + while (*--where != '[') + ; + while (*--where != '[') + ; } *(where - 1) = 'o'; *where = 'r'; diff --git a/usr/src/lib/libshare/nfs/libshare_nfs.c b/usr/src/lib/libshare/nfs/libshare_nfs.c index 8007ab2466..6a9f7fafba 100644 --- a/usr/src/lib/libshare/nfs/libshare_nfs.c +++ b/usr/src/lib/libshare/nfs/libshare_nfs.c @@ -1921,7 +1921,7 @@ nfs_enable_share(sa_share_t share) ea.dname = path; ea.uex = &export; - sa_sharetab_fill_zfs(share, &sh, "nfs"); + (void) sa_sharetab_fill_zfs(share, &sh, "nfs"); err = sa_share_zfs(share, NULL, path, &sh, &ea, ZFS_SHARE_NFS); if (err != SA_OK) { diff --git a/usr/src/lib/libshare/smb/libshare_smb.c b/usr/src/lib/libshare/smb/libshare_smb.c index b6c5417c19..2ad4872253 100644 --- a/usr/src/lib/libshare/smb/libshare_smb.c +++ b/usr/src/lib/libshare/smb/libshare_smb.c @@ -476,7 +476,7 @@ smb_enable_share(sa_share_t share) } else { share_t sh; - sa_sharetab_fill_zfs(share, &sh, "smb"); + (void) sa_sharetab_fill_zfs(share, &sh, "smb"); err = sa_share_zfs(share, resource, (char *)path, &sh, &si, ZFS_SHARE_SMB); if (err != SA_OK) { @@ -703,7 +703,7 @@ smb_disable_share(sa_share_t share, char *path) } else { share_t sh; - sa_sharetab_fill_zfs(share, &sh, "smb"); + (void) sa_sharetab_fill_zfs(share, &sh, "smb"); err = sa_share_zfs(share, resource, (char *)path, &sh, rname, ZFS_UNSHARE_SMB); if (err != SA_OK) { diff --git a/usr/src/lib/libsldap/common/ns_connect.c b/usr/src/lib/libsldap/common/ns_connect.c index 5be22acc27..5e3ad10bf7 100644 --- a/usr/src/lib/libsldap/common/ns_connect.c +++ b/usr/src/lib/libsldap/common/ns_connect.c @@ -18,6 +18,7 @@ * * CDDL HEADER END */ + /* * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. @@ -1334,7 +1335,7 @@ ldap_in_nss_switch(char *db) break; } } - __nsw_freeconfig(conf); + (void) __nsw_freeconfig(conf); return (found); } diff --git a/usr/src/lib/lvm/libsvm/common/debug.c b/usr/src/lib/lvm/libsvm/common/debug.c index 38f7ae56cc..e9e22a46d1 100644 --- a/usr/src/lib/lvm/libsvm/common/debug.c +++ b/usr/src/lib/lvm/libsvm/common/debug.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,13 +18,12 @@ * * CDDL HEADER END */ + /* - * Copyright 2003 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <stdio.h> #include <stdarg.h> #include <stdlib.h> @@ -67,8 +65,8 @@ debug_printf(char *fmt, ...) cp = buf + (libsvm_len - 1); va_start(ap, fmt); if (vsnprintf(cp, (PATH_MAX - (libsvm_len - 1)), - fmt, ap) >= 0) { - write_status(LOGSCR, LEVEL0, buf); + fmt, ap) >= 0) { + (void) write_status(LOGSCR, LEVEL0, buf); } free(buf); va_end(ap); diff --git a/usr/src/lib/mms/dm/libdefault/common/dm_default.c b/usr/src/lib/mms/dm/libdefault/common/dm_default.c index d975e30dcb..6f03c906e8 100644 --- a/usr/src/lib/mms/dm/libdefault/common/dm_default.c +++ b/usr/src/lib/mms/dm/libdefault/common/dm_default.c @@ -871,7 +871,7 @@ drv_set_blksize(uint64_t size) * Supresse SILI */ if (size == 0) { - dm_ioctl(MTIOCREADIGNOREILI, &one); + (void) dm_ioctl(MTIOCREADIGNOREILI, &one); } return (0); @@ -2068,7 +2068,7 @@ drv_proc_error(void) serr->se_senkey = SUN_KEY_BOT; break; case DRV_EC_NEEDS_CLEANING : - dm_send_clean_request(); + (void) dm_send_clean_request(); break; case DRV_EC_FORMAT : break; @@ -2130,9 +2130,9 @@ drv_get_statistics(void) sizeof (dumpbuf)); TRACE((MMS_DEBUG, "log sense page 0x02:\n%s", dumpbuf)); - dm_get_log_sense_parm(buf, 0x0003, &val); + (void) dm_get_log_sense_parm(buf, 0x0003, &val); dca->dca_rcvd_write_err = val; - dm_get_log_sense_parm(buf, 0x0006, &val); + (void) dm_get_log_sense_parm(buf, 0x0006, &val); dca->dca_write_err = val; DRV_CALL(drv_log_sense, (buf, 80, 1, 0x03)); @@ -2140,9 +2140,9 @@ drv_get_statistics(void) sizeof (dumpbuf)); TRACE((MMS_DEBUG, "log sense page 0x03:\n%s", dumpbuf)); - dm_get_log_sense_parm(buf, 0x0003, &val); + (void) dm_get_log_sense_parm(buf, 0x0003, &val); dca->dca_rcvd_read_err = val; - dm_get_log_sense_parm(buf, 0x0006, &val); + (void) dm_get_log_sense_parm(buf, 0x0006, &val); dca->dca_read_err = val; DRV_CALL(drv_log_sense, (buf, 80, 1, 0x0c)); @@ -2150,14 +2150,14 @@ drv_get_statistics(void) sizeof (dumpbuf)); TRACE((MMS_DEBUG, "log sense page 0x0c:\n%s", dumpbuf)); - dm_get_log_sense_parm(buf, 0x0000, &val); + (void) dm_get_log_sense_parm(buf, 0x0000, &val); dca->dca_bytes_written = val; - dm_get_log_sense_parm(buf, 0x0001, &val); + (void) dm_get_log_sense_parm(buf, 0x0001, &val); dca->dca_bytes_written_med = val; - dm_get_log_sense_parm(buf, 0x0003, &val); + (void) dm_get_log_sense_parm(buf, 0x0003, &val); dca->dca_bytes_read = val; - dm_get_log_sense_parm(buf, 0x0002, &val); + (void) dm_get_log_sense_parm(buf, 0x0002, &val); dca->dca_bytes_read_med = val; return (0); diff --git a/usr/src/lib/pam_modules/krb5/krb5_authenticate.c b/usr/src/lib/pam_modules/krb5/krb5_authenticate.c index 385de329f1..4f136321a2 100644 --- a/usr/src/lib/pam_modules/krb5/krb5_authenticate.c +++ b/usr/src/lib/pam_modules/krb5/krb5_authenticate.c @@ -18,6 +18,7 @@ * * CDDL HEADER END */ + /* * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. @@ -737,7 +738,7 @@ krb5_cleanup(pam_handle_t *pamh, void *data, int pam_status) * up regardless of success or failure here. */ if (kmd->ccache) - krb5_cc_close(kmd->kcontext, kmd->ccache); + (void) krb5_cc_close(kmd->kcontext, kmd->ccache); if (kmd->password) { (void) memset(kmd->password, 0, strlen(kmd->password)); diff --git a/usr/src/lib/pam_modules/krb5/krb5_setcred.c b/usr/src/lib/pam_modules/krb5/krb5_setcred.c index e89cbbb53f..c4c1bf736e 100644 --- a/usr/src/lib/pam_modules/krb5/krb5_setcred.c +++ b/usr/src/lib/pam_modules/krb5/krb5_setcred.c @@ -18,6 +18,7 @@ * * CDDL HEADER END */ + /* * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. @@ -564,7 +565,7 @@ error: __pam_log(LOG_AUTH | LOG_DEBUG, "PAM-KRB5 (setcred): delete/add warning"); - kwarn_del_warning(client_name); + (void) kwarn_del_warning(client_name); if (kwarn_add_warning(client_name, endtime) != 0) { __pam_log(LOG_AUTH | LOG_NOTICE, "PAM-KRB5 (setcred): kwarn_add_warning" diff --git a/usr/src/lib/passwdutil/switch_utils.c b/usr/src/lib/passwdutil/switch_utils.c index 28cf6b6a74..b2106bceed 100644 --- a/usr/src/lib/passwdutil/switch_utils.c +++ b/usr/src/lib/passwdutil/switch_utils.c @@ -18,6 +18,7 @@ * * CDDL HEADER END */ + /* * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. @@ -70,7 +71,7 @@ name_to_int(char *rep_name) result = REP_FILES | REP_LDAP; else result = REP_ERANGE; - __nsw_freeconfig(cfg); + (void) __nsw_freeconfig(cfg); } } @@ -91,7 +92,7 @@ get_compat_mode(void) if (strcmp(cfg->lookups->service_name, "ldap") == 0) result = REP_COMPAT_LDAP; } - __nsw_freeconfig(cfg); + (void) __nsw_freeconfig(cfg); return (result); } @@ -214,7 +215,7 @@ get_ns(pwu_repository_t *rep, int accesstype) result = REP_NSS; } - __nsw_freeconfig(conf); + (void) __nsw_freeconfig(conf); return (result); } diff --git a/usr/src/lib/smbsrv/libsmbns/common/smbns_krb.c b/usr/src/lib/smbsrv/libsmbns/common/smbns_krb.c index 5afd6f3258..ec9f2777a4 100644 --- a/usr/src/lib/smbsrv/libsmbns/common/smbns_krb.c +++ b/usr/src/lib/smbsrv/libsmbns/common/smbns_krb.c @@ -18,6 +18,7 @@ * * CDDL HEADER END */ + /* * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. @@ -140,7 +141,7 @@ cleanup: if (me) krb5_free_principal(ctx, me); if (cc) - krb5_cc_close(ctx, cc); + (void) krb5_cc_close(ctx, cc); if (ctx) krb5_free_context(ctx); diff --git a/usr/src/lib/smbsrv/libsmbns/common/smbns_ksetpwd.c b/usr/src/lib/smbsrv/libsmbns/common/smbns_ksetpwd.c index 304b1292ee..5381eddb18 100644 --- a/usr/src/lib/smbsrv/libsmbns/common/smbns_ksetpwd.c +++ b/usr/src/lib/smbsrv/libsmbns/common/smbns_ksetpwd.c @@ -249,7 +249,7 @@ smb_krb5_setpwd(krb5_context ctx, krb5_principal princ, char *passwd) code = krb5_set_password_using_ccache(ctx, cc, passwd, princ, &result_code, &result_code_string, &result_string); - krb5_cc_close(ctx, cc); + (void) krb5_cc_close(ctx, cc); if (code != 0) (void) syslog(LOG_ERR, @@ -317,13 +317,13 @@ smb_krb5_add_keytab_entries(krb5_context ctx, krb5_principal *princs, for (i = 0; i < enctype_count; i++) { if (smb_krb5_ktadd(ctx, kt, princs[j], enctypes[i], kvno, passwd) != 0) { - krb5_kt_close(ctx, kt); + (void) krb5_kt_close(ctx, kt); return (-1); } } } - krb5_kt_close(ctx, kt); + (void) krb5_kt_close(ctx, kt); return (0); } @@ -360,10 +360,10 @@ smb_krb5_find_keytab_entries(const char *fqhn, char *fname) if (krb5_kt_resolve(ctx, ktname, &kt) == 0) { if (krb5_kt_get_entry(ctx, kt, princ, 0, 0, &entry) == 0) { found = B_TRUE; - krb5_kt_free_entry(ctx, &entry); + (void) krb5_kt_free_entry(ctx, &entry); } - krb5_kt_close(ctx, kt); + (void) krb5_kt_close(ctx, kt); } krb5_free_principal(ctx, princ); |