diff options
25 files changed, 64 insertions, 178 deletions
diff --git a/usr/src/cmd/bnu/uuglist.c b/usr/src/cmd/bnu/uuglist.c index 7524860c32..3b2f56ebf6 100644 --- a/usr/src/cmd/bnu/uuglist.c +++ b/usr/src/cmd/bnu/uuglist.c @@ -20,6 +20,7 @@ * CDDL HEADER END */ /* + * Copyright 2017 Gary Mills * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -28,8 +29,6 @@ /* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include "uucp.h" #define MAXLENGTH 256 @@ -129,13 +128,12 @@ rproc() FILE *cfd; char line[BUFSIZ]; char *carray[C_MAX]; - int na; cfd = fopen(GRADES, "r"); while (rdfulline(cfd, line, BUFSIZ) != 0) { - na = getargs(line, carray, C_MAX); + (void) getargs(line, carray, C_MAX); insert(carray[0]); } diff --git a/usr/src/cmd/bnu/uustat.c b/usr/src/cmd/bnu/uustat.c index 67031d6866..992f68c5da 100644 --- a/usr/src/cmd/bnu/uustat.c +++ b/usr/src/cmd/bnu/uustat.c @@ -20,6 +20,7 @@ * CDDL HEADER END */ /* + * Copyright 2017 Gary Mills * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -27,7 +28,6 @@ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" #include <time.h> #include "uucp.h" @@ -1542,9 +1542,6 @@ friendlytime(uplimit, lolimit) char *uplimit, *lolimit; { - char c; - - c = *(uplimit+6); friendlyptr->uhour[0] = *(uplimit+6); friendlyptr->uhour[1] = *(uplimit+7); friendlyptr->lhour[0] = *(lolimit+6); diff --git a/usr/src/cmd/cmd-inet/usr.bin/talk/get_names.c b/usr/src/cmd/cmd-inet/usr.bin/talk/get_names.c index 3370976811..78d07186b0 100644 --- a/usr/src/cmd/cmd-inet/usr.bin/talk/get_names.c +++ b/usr/src/cmd/cmd-inet/usr.bin/talk/get_names.c @@ -20,6 +20,7 @@ * CDDL HEADER END */ /* + * Copyright 2017 Gary Mills * Copyright 1997 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -37,8 +38,6 @@ * contributors. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include "talk.h" #include "ctl.h" #include <locale.h> @@ -65,7 +64,6 @@ char *argv[]; char *my_name; char *my_machine_name; char *rem_machine_name; - char *my_tty; char *rem_tty; char *ptr; int name_length; @@ -102,8 +100,6 @@ char *argv[]; (void) sysinfo(SI_HOSTNAME, hostname, name_length); my_machine_name = hostname; - my_tty = strrchr(ttyname(0), '/') + 1; - /* * check for, and strip out, the machine name of the target */ diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ipadm/ipadm.c b/usr/src/cmd/cmd-inet/usr.sbin/ipadm/ipadm.c index c4b7fd225f..4e32ac67e0 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/ipadm/ipadm.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/ipadm/ipadm.c @@ -22,6 +22,7 @@ /* * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2017 Nexenta Systems, Inc. + * Copyright 2017 Gary Mills */ #include <arpa/inet.h> @@ -507,21 +508,17 @@ print_prop(show_prop_state_t *statep, uint_t flags, char *buf, size_t bufsize) char *propval = statep->sps_propval; uint_t proto = statep->sps_proto; size_t propsize = MAXPROPVALLEN; - char *object; ipadm_status_t status; if (statep->sps_ifprop) { status = ipadm_get_ifprop(iph, ifname, prop_name, propval, &propsize, proto, flags); - object = ifname; } else if (statep->sps_modprop) { status = ipadm_get_prop(iph, prop_name, propval, &propsize, proto, flags); - object = ipadm_proto2str(proto); } else { status = ipadm_get_addrprop(iph, prop_name, propval, &propsize, statep->sps_aobjname, flags); - object = statep->sps_aobjname; } if (status != IPADM_SUCCESS) { diff --git a/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_dhcpv6.c b/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_dhcpv6.c index 0e7c1bee96..f340320835 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_dhcpv6.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_dhcpv6.c @@ -20,6 +20,7 @@ */ /* + * Copyright 2017 Gary Mills * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -584,7 +585,7 @@ static void show_options(const uint8_t *data, int len) { dhcpv6_option_t d6o; - uint_t olen, retlen; + uint_t olen; uint16_t val16; uint16_t type; uint32_t val32; @@ -766,7 +767,7 @@ show_options(const uint8_t *data, int len) if (olen > 0) { oldnest = prot_nest_prefix; prot_nest_prefix = prot_prefix; - retlen = interpret_dhcpv6(F_DTAIL, data, olen); + (void) interpret_dhcpv6(F_DTAIL, data, olen); prot_prefix = prot_nest_prefix; prot_nest_prefix = oldnest; } diff --git a/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_rpcsec.c b/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_rpcsec.c index e3579dc4f4..63abff8488 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_rpcsec.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_rpcsec.c @@ -23,6 +23,7 @@ * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. * Copyright 2012 Milan Jurik. All rights reserved. + * Copyright 2017 Gary Mills */ #include <sys/types.h> @@ -293,22 +294,20 @@ rpcsec_gss_control_proc(int type, int flags, int xid) void extract_rpcsec_gss_cred_info(int xid) { - unsigned int seq_num; unsigned int handle_len; - unsigned int flavor_len; unsigned int rpcsec_gss_ver; rpc_gss_service_t rpcsec_gss_service; unsigned int rpcsec_gss_proc; struct cache_struct *x; - flavor_len = getxdr_u_long(); + (void) getxdr_u_long(); rpcsec_gss_ver = getxdr_u_long(); /* see if we know this version or not */ if (rpcsec_gss_ver != 1) { longjmp(xdr_err, 1); } rpcsec_gss_proc = getxdr_u_long(); - seq_num = getxdr_u_long(); + (void) getxdr_u_long(); rpcsec_gss_service = getxdr_enum(); /* skip the handle */ xdr_skip(RNDUP(getxdr_u_long())); @@ -327,7 +326,7 @@ static void print_rpc_gss_init_arg(int flags, struct cache_struct *x) { - char *token, *line; + char *line; unsigned int token_len; int pos = 0; @@ -348,7 +347,7 @@ print_rpc_gss_init_arg(int flags, struct cache_struct *x) pos = getxdr_pos(); token_len = getxdr_u_long(); - token = getxdr_hex(token_len); + (void) getxdr_hex(token_len); line = get_line(pos, getxdr_pos()); sprintf(line, " gss token: length = %d, data = [%d bytes]", token_len, token_len); @@ -363,7 +362,7 @@ void print_rpc_gss_init_res(int flags) { - char *handle, *token, *line; + char *handle, *line; unsigned int token_len, handle_len; unsigned int major, minor, seq_window; @@ -395,7 +394,7 @@ print_rpc_gss_init_res(int flags) " sequence window = %u", seq_window); pos = getxdr_pos(); token_len = getxdr_u_long(); - token = getxdr_hex(token_len); + (void) getxdr_hex(token_len); line = get_line(pos, getxdr_pos()); sprintf(line, " gss token: length = %d, data = [%d bytes]", token_len, token_len); diff --git a/usr/src/cmd/gss/gssd/gssdtest.c b/usr/src/cmd/gss/gssd/gssdtest.c index d4f68fca14..ea8e3735d0 100644 --- a/usr/src/cmd/gss/gssd/gssdtest.c +++ b/usr/src/cmd/gss/gssd/gssdtest.c @@ -20,6 +20,7 @@ * CDDL HEADER END */ /* + * Copyright 2017 Gary Mills * Copyright 2003 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -1294,9 +1295,7 @@ char **argv; OM_UINT32 status; gss_ctx_id_t *context_handle; OM_uint32 minor_status; - uid_t uid; - uid = (uid_t) getuid(); /* parse the command line to determine the variable input argument */ diff --git a/usr/src/cmd/hal/addons/network-devices/common.c b/usr/src/cmd/hal/addons/network-devices/common.c index 258165e810..785464f592 100644 --- a/usr/src/cmd/hal/addons/network-devices/common.c +++ b/usr/src/cmd/hal/addons/network-devices/common.c @@ -1,4 +1,5 @@ /* + * Copyright 2017 Gary Mills * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. * * Licensed under the Academic Free License version 2.1 @@ -113,7 +114,7 @@ addr_to_string(char *prefix, uchar_t *mac, int mac_len, char *buf, int buf_len) static char * pseudo_serialno_from_addr(char *name) { - int sd, rc, errnum; + int sd, errnum; char buf[128]; struct hostent *hp; struct xarpreq ar; @@ -140,7 +141,7 @@ pseudo_serialno_from_addr(char *name) sd = socket(AF_INET, SOCK_DGRAM, 0); ar.xarp_ha.sdl_family = AF_LINK; - rc = ioctl(sd, SIOCGXARP, (caddr_t)&ar); + (void) ioctl(sd, SIOCGXARP, (caddr_t)&ar); close(sd); diff --git a/usr/src/cmd/hal/addons/storage/addon-storage.c b/usr/src/cmd/hal/addons/storage/addon-storage.c index c8eeae61cc..087b7c2097 100644 --- a/usr/src/cmd/hal/addons/storage/addon-storage.c +++ b/usr/src/cmd/hal/addons/storage/addon-storage.c @@ -2,6 +2,7 @@ * * addon-storage.c : watch removable media state changes * + * Copyright 2017 Gary Mills * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. * @@ -318,8 +319,6 @@ main (int argc, char *argv[]) char *bus; char *drive_type; int state, last_state; - char *support_media_changed_str; - int support_media_changed; int fd = -1; if ((udi = getenv ("UDI")) == NULL) @@ -341,12 +340,6 @@ main (int argc, char *argv[]) sysevent_init (); - support_media_changed_str = getenv ("HAL_PROP_STORAGE_CDROM_SUPPORT_MEDIA_CHANGED"); - if (support_media_changed_str != NULL && strcmp (support_media_changed_str, "true") == 0) - support_media_changed = TRUE; - else - support_media_changed = FALSE; - dbus_error_init (&error); if ((ctx = libhal_ctx_init_direct (&error)) == NULL) { diff --git a/usr/src/cmd/ipf/tools/ipfcomp.c b/usr/src/cmd/ipf/tools/ipfcomp.c index 15405c1cd3..b8ed7bee01 100644 --- a/usr/src/cmd/ipf/tools/ipfcomp.c +++ b/usr/src/cmd/ipf/tools/ipfcomp.c @@ -5,6 +5,7 @@ * * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright 2017 Gary Mills */ #include "ipf.h" @@ -62,7 +63,6 @@ static FILE *cfile = NULL; void printc(fr) frentry_t *fr; { - fripf_t *ipf; u_long *ulp; char *and; FILE *fp; @@ -75,7 +75,6 @@ frentry_t *fr; if ((fr->fr_type == FR_T_IPF) && ((fr->fr_datype != FRI_NORMAL) || (fr->fr_satype != FRI_NORMAL))) return; - ipf = fr->fr_ipf; if (cfile == NULL) cfile = fopen("ip_rules.c", "w"); diff --git a/usr/src/cmd/ipf/tools/ippool.c b/usr/src/cmd/ipf/tools/ippool.c index d0296139a8..f506834d07 100644 --- a/usr/src/cmd/ipf/tools/ippool.c +++ b/usr/src/cmd/ipf/tools/ippool.c @@ -7,6 +7,7 @@ * Use is subject to license terms. * * Copyright (c) 2014, Joyent, Inc. All rights reserved. + * Copyright 2017 Gary Mills */ #include <sys/types.h> @@ -382,8 +383,8 @@ char *argv[]; { char *kernel, *core, *poolname; int c, role, type, live_kernel; - ip_pool_stat_t *plstp, plstat; - iphtstat_t *htstp, htstat; + ip_pool_stat_t plstat; + iphtstat_t htstat; iphtable_t *hptr; iplookupop_t op; ip_pool_t *ptr; @@ -469,7 +470,6 @@ char *argv[]; } if (type == IPLT_ALL || type == IPLT_POOL) { - plstp = &plstat; op.iplo_type = IPLT_POOL; op.iplo_size = sizeof(plstat); op.iplo_struct = &plstat; @@ -503,7 +503,6 @@ char *argv[]; } } if (type == IPLT_ALL || type == IPLT_HASH) { - htstp = &htstat; op.iplo_type = IPLT_HASH; op.iplo_size = sizeof(htstat); op.iplo_struct = &htstat; @@ -642,15 +641,11 @@ int poolstats(argc, argv) int argc; char *argv[]; { - int c, type, role, live_kernel; + int c, type, role; ip_pool_stat_t plstat; - char *kernel, *core; iphtstat_t htstat; iplookupop_t op; - core = NULL; - kernel = NULL; - live_kernel = 1; type = IPLT_ALL; role = IPL_LOGALL; @@ -666,12 +661,8 @@ char *argv[]; setzonename_global(optarg); break; case 'M' : - live_kernel = 0; - core = optarg; break; case 'N' : - live_kernel = 0; - kernel = optarg; break; case 'o' : role = getrole(optarg); diff --git a/usr/src/cmd/krb5/ldap_util/kdb5_ldap_list.c b/usr/src/cmd/krb5/ldap_util/kdb5_ldap_list.c index eb78af63c3..a3ba98745a 100644 --- a/usr/src/cmd/krb5/ldap_util/kdb5_ldap_list.c +++ b/usr/src/cmd/krb5/ldap_util/kdb5_ldap_list.c @@ -1,5 +1,3 @@ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * kadmin/ldap_util/kdb5_ldap_list.c */ @@ -164,7 +162,6 @@ void list_modify_str_array(destlist, sourcelist, mode) char **dlist = NULL, **tmplist = NULL; const char **slist = NULL; int dcount = 0, scount = 0, copycount = 0; - int found = 0; if ((destlist == NULL) || (*destlist == NULL) || (sourcelist == NULL)) return; @@ -200,10 +197,8 @@ void list_modify_str_array(destlist, sourcelist, mode) * from the destination list */ for (slist = sourcelist; *slist != NULL; slist++) { for (dlist = *destlist; *dlist != NULL; dlist++) { - found = 0; /* value not found */ /* DN is case insensitive string */ if (strcasecmp(*dlist, *slist) == 0) { - found = 1; free(*dlist); /* Advance the rest of the entries by one */ for (tmplist = dlist; *tmplist != NULL; tmplist++) { diff --git a/usr/src/cmd/krb5/ldap_util/kdb5_ldap_realm.c b/usr/src/cmd/krb5/ldap_util/kdb5_ldap_realm.c index b3e0292a51..3c74af1eb3 100644 --- a/usr/src/cmd/krb5/ldap_util/kdb5_ldap_realm.c +++ b/usr/src/cmd/krb5/ldap_util/kdb5_ldap_realm.c @@ -1,4 +1,5 @@ /* + * Copyright 2017 Gary Mills * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -156,21 +157,19 @@ static int get_ticket_policy(rparams,i,argv,argc) time_t now; int mask = 0; krb5_error_code retval = 0; - krb5_boolean no_msg = FALSE; - krb5_boolean print_usage = FALSE; /* Solaris Kerberos */ char *me = progname; time(&now); if (!strcmp(argv[*i], "-maxtktlife")) { if (++(*i) > argc-1) - goto err_usage; + goto err; date = get_date(argv[*i]); if (date == (time_t)(-1)) { retval = EINVAL; com_err (me, retval, gettext("while providing time specification")); - goto err_nomsg; + goto err; } rparams->max_life = date-now; mask |= LDAP_REALM_MAXTICKETLIFE; @@ -179,13 +178,13 @@ static int get_ticket_policy(rparams,i,argv,argc) else if (!strcmp(argv[*i], "-maxrenewlife")) { if (++(*i) > argc-1) - goto err_usage; + goto err; date = get_date(argv[*i]); if (date == (time_t)(-1)) { retval = EINVAL; com_err (me, retval, gettext("while providing time specification")); - goto err_nomsg; + goto err; } rparams->max_renewable_life = date-now; mask |= LDAP_REALM_MAXRENEWLIFE; @@ -195,7 +194,7 @@ static int get_ticket_policy(rparams,i,argv,argc) else if (*(argv[*i]) == '-') rparams->tktflags |= KRB5_KDB_DISALLOW_POSTDATED; else - goto err_usage; + goto err; mask |= LDAP_REALM_KRBTICKETFLAGS; } else if (!strcmp((argv[*i] + 1), "allow_forwardable")) { @@ -205,7 +204,7 @@ static int get_ticket_policy(rparams,i,argv,argc) else if (*(argv[*i]) == '-') rparams->tktflags |= KRB5_KDB_DISALLOW_FORWARDABLE; else - goto err_usage; + goto err; mask |= LDAP_REALM_KRBTICKETFLAGS; } else if (!strcmp((argv[*i] + 1), "allow_renewable")) { @@ -214,7 +213,7 @@ static int get_ticket_policy(rparams,i,argv,argc) else if (*(argv[*i]) == '-') rparams->tktflags |= KRB5_KDB_DISALLOW_RENEWABLE; else - goto err_usage; + goto err; mask |= LDAP_REALM_KRBTICKETFLAGS; } else if (!strcmp((argv[*i] + 1), "allow_proxiable")) { @@ -223,7 +222,7 @@ static int get_ticket_policy(rparams,i,argv,argc) else if (*(argv[*i]) == '-') rparams->tktflags |= KRB5_KDB_DISALLOW_PROXIABLE; else - goto err_usage; + goto err; mask |= LDAP_REALM_KRBTICKETFLAGS; } else if (!strcmp((argv[*i] + 1), "allow_dup_skey")) { @@ -232,7 +231,7 @@ static int get_ticket_policy(rparams,i,argv,argc) else if (*(argv[*i]) == '-') rparams->tktflags |= KRB5_KDB_DISALLOW_DUP_SKEY; else - goto err_usage; + goto err; mask |= LDAP_REALM_KRBTICKETFLAGS; } @@ -243,7 +242,7 @@ static int get_ticket_policy(rparams,i,argv,argc) else if (*(argv[*i]) == '-') rparams->tktflags &= (int)(~KRB5_KDB_REQUIRES_PRE_AUTH); else - goto err_usage; + goto err; mask |= LDAP_REALM_KRBTICKETFLAGS; } else if (!strcmp((argv[*i] + 1), "requires_hwauth")) { @@ -252,7 +251,7 @@ static int get_ticket_policy(rparams,i,argv,argc) else if (*(argv[*i]) == '-') rparams->tktflags &= (int)(~KRB5_KDB_REQUIRES_HW_AUTH); else - goto err_usage; + goto err; mask |= LDAP_REALM_KRBTICKETFLAGS; } else if (!strcmp((argv[*i] + 1), "allow_svr")) { @@ -261,7 +260,7 @@ static int get_ticket_policy(rparams,i,argv,argc) else if (*(argv[*i]) == '-') rparams->tktflags |= KRB5_KDB_DISALLOW_SVR; else - goto err_usage; + goto err; mask |= LDAP_REALM_KRBTICKETFLAGS; } else if (!strcmp((argv[*i] + 1), "allow_tgs_req")) { @@ -270,7 +269,7 @@ static int get_ticket_policy(rparams,i,argv,argc) else if (*(argv[*i]) == '-') rparams->tktflags |= KRB5_KDB_DISALLOW_TGT_BASED; else - goto err_usage; + goto err; mask |= LDAP_REALM_KRBTICKETFLAGS; } else if (!strcmp((argv[*i] + 1), "allow_tix")) { @@ -279,7 +278,7 @@ static int get_ticket_policy(rparams,i,argv,argc) else if (*(argv[*i]) == '-') rparams->tktflags |= KRB5_KDB_DISALLOW_ALL_TIX; else - goto err_usage; + goto err; mask |= LDAP_REALM_KRBTICKETFLAGS; } else if (!strcmp((argv[*i] + 1), "needchange")) { @@ -288,7 +287,7 @@ static int get_ticket_policy(rparams,i,argv,argc) else if (*(argv[*i]) == '-') rparams->tktflags &= (int)(~KRB5_KDB_REQUIRES_PWCHANGE); else - goto err_usage; + goto err; mask |= LDAP_REALM_KRBTICKETFLAGS; } else if (!strcmp((argv[*i] + 1), "password_changing_service")) { @@ -297,15 +296,12 @@ static int get_ticket_policy(rparams,i,argv,argc) else if (*(argv[*i]) == '-') rparams->tktflags &= (int)(~KRB5_KDB_PWCHANGE_SERVICE); else - goto err_usage; + goto err; mask |=LDAP_REALM_KRBTICKETFLAGS; } -err_usage: - print_usage = TRUE; -err_nomsg: - no_msg = TRUE; +err: return mask; } diff --git a/usr/src/cmd/ldap/common/fileurl.c b/usr/src/cmd/ldap/common/fileurl.c index 8d9d2519e6..fc8d4d0192 100644 --- a/usr/src/cmd/ldap/common/fileurl.c +++ b/usr/src/cmd/ldap/common/fileurl.c @@ -1,4 +1,5 @@ /* + * Copyright 2017 Gary Mills * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -360,7 +361,6 @@ berval_from_file( const char *path, struct berval *bvp, int reporterrs ) { FILE *fp; long rlen; - int eof; #if defined( XP_WIN32 ) char mode[20] = "r+b"; #else @@ -397,7 +397,6 @@ berval_from_file( const char *path, struct berval *bvp, int reporterrs ) } rlen = fread( bvp->bv_val, 1, bvp->bv_len, fp ); - eof = feof( fp ); fclose( fp ); if ( rlen != (long)bvp->bv_len ) { diff --git a/usr/src/cmd/lp/lib/papi/ppd.c b/usr/src/cmd/lp/lib/papi/ppd.c index 5facf902be..57d42c8841 100644 --- a/usr/src/cmd/lp/lib/papi/ppd.c +++ b/usr/src/cmd/lp/lib/papi/ppd.c @@ -19,12 +19,11 @@ * CDDL HEADER END */ /* + * Copyright 2017 Gary Mills * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * This file contains an extremely rudimentary implementation of PPD file * parsing support. The parsing done here converts the contents of a PPD @@ -90,7 +89,6 @@ PPDFileToAttributesList(papi_attribute_t ***attributes, char *filename) char capability[256]; char def[256]; char supported[256]; - char *current_group_name = NULL; int ui = 0; @@ -120,7 +118,6 @@ PPDFileToAttributesList(papi_attribute_t ***attributes, char *filename) if (strcasecmp(key, "OpenGroup") == 0) { if (value == NULL) value = "unknown"; - current_group_name = strdup(value); } else if (strcasecmp(key, "OpenUI") == 0) { if ((strcasecmp(value, "PageSize") == 0) || (strcasecmp(value, "InputSlot") == 0)) diff --git a/usr/src/cmd/mail/copylet.c b/usr/src/cmd/mail/copylet.c index 63e02034b4..ca86fdab24 100644 --- a/usr/src/cmd/mail/copylet.c +++ b/usr/src/cmd/mail/copylet.c @@ -20,6 +20,7 @@ * CDDL HEADER END */ /* + * Copyright 2017 Gary Mills * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -27,8 +28,6 @@ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include "mail.h" /* @@ -90,7 +89,6 @@ xxxcopylet(int letnum, FILE *f, int type) /* H_RECEIVED lines? */ long clen = -1L; int htype; /* header type */ - int sav_htype; /* Header type of last non-H_CONT header line */ struct hdrs *hptr; if (!sending) { @@ -296,7 +294,6 @@ xxxcopylet(int letnum, FILE *f, int type) sav_suppress = suppress; suppress = FALSE; print_from_struct = FALSE; - sav_htype = htype; htype = isheader (buf, &ctf); Dout(pn, 5, "loop 2: buf = %s, htype= %d/%s\n", buf, htype, header[htype].tag); /* The following order is defined in the MTA documents. */ diff --git a/usr/src/cmd/print/bsd-sysv-commands/disable.c b/usr/src/cmd/print/bsd-sysv-commands/disable.c index 0b3cb71f0c..523eece7aa 100644 --- a/usr/src/cmd/print/bsd-sysv-commands/disable.c +++ b/usr/src/cmd/print/bsd-sysv-commands/disable.c @@ -21,6 +21,7 @@ */ /* + * Copyright 2017 Gary Mills * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. * @@ -92,7 +93,6 @@ main(int ac, char *av[]) papi_encryption_t encryption = PAPI_ENCRYPT_NEVER; int exit_status = 0; int cancel = 0; - int pending = 0; /* not implemented */ char *reason = NULL; int c; @@ -105,7 +105,6 @@ main(int ac, char *av[]) cancel = 1; break; case 'W': /* wait for active request, not implemented */ - pending = 1; break; case 'r': /* reason */ reason = optarg; diff --git a/usr/src/cmd/print/bsd-sysv-commands/lpr.c b/usr/src/cmd/print/bsd-sysv-commands/lpr.c index 547e0df36f..b3a95a6c03 100644 --- a/usr/src/cmd/print/bsd-sysv-commands/lpr.c +++ b/usr/src/cmd/print/bsd-sysv-commands/lpr.c @@ -20,6 +20,7 @@ */ /* + * Copyright 2017 Gary Mills * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. * @@ -27,8 +28,6 @@ /* $Id: lpr.c 146 2006-03-24 00:26:54Z njacobs $ */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <stdio.h> #include <stdlib.h> #include <unistd.h> @@ -75,7 +74,6 @@ main(int ac, char *av[]) papi_encryption_t encryption = PAPI_ENCRYPT_NEVER; int dump = 0; int validate = 0; - int remove = 0; int copy = 1; /* default is to copy the data */ char *document_format = "text/plain"; int c; @@ -170,7 +168,6 @@ main(int ac, char *av[]) "rfc-1179-mail", 1); break; case 'r': - remove = 1; break; case 's': copy = 0; diff --git a/usr/src/cmd/refer/glue4.c b/usr/src/cmd/refer/glue4.c index 798d0b2819..0cf034fcc6 100644 --- a/usr/src/cmd/refer/glue4.c +++ b/usr/src/cmd/refer/glue4.c @@ -1,4 +1,5 @@ /* + * Copyright 2017 Gary Mills * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -12,8 +13,6 @@ * specifies the terms and conditions for redistribution. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <stdio.h> #include <ctype.h> @@ -26,17 +25,13 @@ grepcall(char *in, char *out, char *arg) char line[200], *s, argig[100], *cv[50]; char *inp, inb[500]; FILE *qf, *gf; - int c, oldc = 0, alph = 0, nv = 0; + int c, alph = 0, nv = 0; int sv0, sv1; strcpy(argig, arg); strcat(argig, ".ig"); strcpy(inp = inb, in); if (gfile[0] == 0) sprintf(gfile, "/tmp/rj%dg", getpid()); -#if D1 - fprintf(stderr, "in grepcall, gfile %s in %o out %o\n", - gfile, in, out); -#endif for (cv[nv++] = "fgrep"; c = *inp; inp++) { if (c == ' ') c = *inp = 0; @@ -47,11 +42,7 @@ grepcall(char *in, char *out, char *arg) cv[nv++] = inp; if (alph > 6) *inp = 0; - oldc = c; } -#if D1 - fprintf(stderr, "%d args set up\n", nv); -#endif { sv0 = dup(0); close(0); @@ -62,9 +53,6 @@ grepcall(char *in, char *out, char *arg) if (creat(gfile, 0666) != 1) err("Can't write fgrep output %s", gfile); fgrep(nv, cv); -#if D1 - fprintf(stderr, "fgrep returned, output is..\n"); -#endif close(0); dup(sv0); close(sv0); @@ -73,17 +61,11 @@ grepcall(char *in, char *out, char *arg) close(sv1); } -#if D1 - fprintf(stderr, "back from fgrep\n"); -#endif gf = fopen(gfile, "r"); if (gf == NULL) err("can't read fgrep output %s", gfile); while (fgets(line, 100, gf) == line) { line[100] = 0; -#if D1 - fprintf(stderr, "read line as //%s//\n", line); -#endif for (s = line; *s && (*s != '\t'); s++) ; if (*s == '\t') { @@ -92,23 +74,13 @@ grepcall(char *in, char *out, char *arg) } if (line[0]) strcat(out, line); -#if D1 - fprintf(stderr, "out now /%s/\n", out); -#endif while (*s) s++; -#if D1 - fprintf(stderr, "line %o s %o s-1 %o\n", line, s, s[-1]); -#endif if (s[-1] != '\n') while (!feof(gf) && getc(gf) != '\n') ; } fclose(gf); -#if D1 - fprintf(stderr, "back from reading %, out %s\n", out); -#else unlink(gfile); -#endif } void diff --git a/usr/src/cmd/refer/hunt7.c b/usr/src/cmd/refer/hunt7.c index 7720c0f089..da6c570ff9 100644 --- a/usr/src/cmd/refer/hunt7.c +++ b/usr/src/cmd/refer/hunt7.c @@ -1,4 +1,5 @@ /* + * Copyright 2017 Gary Mills * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -12,8 +13,6 @@ * specifies the terms and conditions for redistribution. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <stdio.h> #include <locale.h> #include <assert.h> @@ -37,11 +36,8 @@ findline(char *in, char **out, int outlen, long indexdate) extern long gdate(); static FILE *fa = NULL; long lp, llen; - int len, k, nofil; + int k, nofil; -#if D1 - fprintf(stderr, "findline: %s\n", in); -#endif if (mindex(in, '!')) return (0); @@ -51,38 +47,18 @@ findline(char *in, char **out, int outlen, long indexdate) if (*p) *p++ = 0; else p = in; k = sscanf(p, "%ld,%ld", &lp, &llen); -#ifdef D1 - fprintf(stderr, "p %s k %d lp %ld llen %ld\n", p, k, lp, llen); -#endif if (k < 2) { lp = 0; llen = outlen; } -#ifdef D1 - fprintf(stderr, "lp %ld llen %ld\n", lp, llen); -#endif -#ifdef D1 - fprintf(stderr, "fa now %o, p %o in %o %s\n", fa, p, in, in); -#endif if (nofil) { -#if D1 - fprintf(stderr, "set fa to stdin\n"); -#endif fa = stdin; } else if (strcmp(name, in) != 0 || 1) { -#if D1 - fprintf(stderr, "old: %s new %s not equal\n", name, in); -#endif if (fa != NULL) fa = freopen(in, "r", fa); else fa = fopen(in, "r"); -#if D1 - if (fa == NULL) - fprintf(stderr, "failed to (re)open *%s*\n", - in); -#endif if (fa == NULL) return (0); /* err("Can't open %s", in); */ @@ -105,22 +81,14 @@ findline(char *in, char **out, int outlen, long indexdate) name); } } -#if D1 - else - fprintf(stderr, "old %s new %s same fa %o\n", - name, in, fa); -#endif if (fa != NULL) { fseek(fa, lp, 0); *out = (char *)malloc(llen + 1); if (*out == NULL) { return (0); } - len = fread(*out, 1, llen, fa); + (void) fread(*out, 1, llen, fa); *(*out + llen) = 0; -#ifdef D1 - fprintf(stderr, "length as read is %d\n", len); -#endif } return (llen); } diff --git a/usr/src/cmd/sh/xec.c b/usr/src/cmd/sh/xec.c index 2d3d6ebaf3..50b7cd7b05 100644 --- a/usr/src/cmd/sh/xec.c +++ b/usr/src/cmd/sh/xec.c @@ -20,6 +20,7 @@ */ /* + * Copyright 2017 Gary Mills * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -124,7 +125,7 @@ int *pf1, *pf2; case TCOM: { - unsigned char *a1, *name; + unsigned char *name; int argn, internal; struct argnod *schain = gchain; struct ionod *io = t->treio; @@ -136,7 +137,6 @@ int *pf1, *pf2; gchain = 0; argn = getarg(t); com = scan(argn); - a1 = com[1]; gchain = schain; if (argn != 0) diff --git a/usr/src/cmd/svr4pkg/pkgremove/special.c b/usr/src/cmd/svr4pkg/pkgremove/special.c index ea08003cc9..2412386c44 100644 --- a/usr/src/cmd/svr4pkg/pkgremove/special.c +++ b/usr/src/cmd/svr4pkg/pkgremove/special.c @@ -20,6 +20,7 @@ */ /* + * Copyright 2017 Gary Mills * Copyright 2003 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -499,7 +500,7 @@ special_contents_remove(int ient, struct cfent **ppcfent, const char *pcroot) { int result = 0; /* Assume we will succeed. Return result. */ char **ppcSC = NULL; /* The special contents rules, sorted. */ - int i, j; /* Indexes into contents & special contents */ + int i; /* Index into contents & special contents */ FILE *fpi = NULL, /* Input of contents file */ *fpo = NULL; /* Output to temp contents file */ char cpath[PATH_MAX], /* Contents file path */ @@ -599,7 +600,7 @@ special_contents_remove(int ient, struct cfent **ppcfent, const char *pcroot) */ (void) memset(line, 0, LINESZ); - for (i = 0, j = 0; fgets(line, LINESZ, fpi) != NULL; ) { + for (i = 0; fgets(line, LINESZ, fpi) != NULL; ) { char *pcpath = NULL; diff --git a/usr/src/cmd/troff/nroff.d/n6.c b/usr/src/cmd/troff/nroff.d/n6.c index 4098b23d69..4c66852c66 100644 --- a/usr/src/cmd/troff/nroff.d/n6.c +++ b/usr/src/cmd/troff/nroff.d/n6.c @@ -20,6 +20,7 @@ * CDDL HEADER END */ /* + * Copyright 2017 Gary Mills * Copyright 2003 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -201,11 +202,10 @@ setps() tchar setht() /* set character height from \H'...' */ { - int n; tchar c; getch(); - n = inumb(&apts); + (void) inumb(&apts); getch(); return(0); } diff --git a/usr/src/cmd/volcheck/volcheck.c b/usr/src/cmd/volcheck/volcheck.c index f53b5375a7..157a9ee6c6 100644 --- a/usr/src/cmd/volcheck/volcheck.c +++ b/usr/src/cmd/volcheck/volcheck.c @@ -19,6 +19,7 @@ * CDDL HEADER END */ /* + * Copyright 2017 Gary Mills * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -54,9 +55,6 @@ main(int argc, char **argv) { const char *opts = "itv"; int c; - boolean_t opt_i = B_FALSE; - boolean_t opt_t = B_FALSE; - boolean_t opt_v = B_FALSE; LibHalContext *hal_ctx; DBusError error; rmm_error_t rmm_error; @@ -67,13 +65,10 @@ main(int argc, char **argv) while ((c = getopt(argc, argv, opts)) != EOF) { switch (c) { case 'i': - opt_i = B_TRUE; break; case 't': - opt_t = B_TRUE; break; case 'v': - opt_v = B_TRUE; break; default: usage(); diff --git a/usr/src/cmd/ypcmd/ypserv.c b/usr/src/cmd/ypcmd/ypserv.c index 6e1eaa6797..e20874ddfa 100644 --- a/usr/src/cmd/ypcmd/ypserv.c +++ b/usr/src/cmd/ypcmd/ypserv.c @@ -20,6 +20,7 @@ * CDDL HEADER END */ /* + * Copyright 2017 Gary Mills * Copyright 2004 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -32,8 +33,6 @@ * under license from the Regents of the University of California. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * This contains the mainline code for the YP server. Data * structures which are process-global are also in this module. @@ -174,7 +173,7 @@ static void ypinit(int argc, char **argv) { int pid; - int stat, t; + int stat; struct sigaction act; int ufd, tfd; SVCXPRT *utransp, *ttransp; @@ -237,7 +236,7 @@ ypinit(int argc, char **argv) freopen(logfile, "a", stderr); } - t = open("/dev/tty", 2); + (void) open("/dev/tty", 2); setpgrp(); } |