Project

General

Profile

Bug #2077 ยป break-clean.patch

suggested fix - Milan Jurik, 2012-02-18 07:30 PM

View differences:

new/usr/src/cmd/auditreduce/token.c Sat Feb 18 20:26:37 2012
21 21
/*
22 22
 * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
23 23
 * Use is subject to license terms.
24
 * Copyright 2012 Milan Jurik. All rights reserved.
24 25
 */
25 26

  
26 27

  
......
224 225
			break;
225 226
		default:
226 227
			return (-2);
227
			break;
228 228
		}
229 229
	}
230 230
	return (-1);
231
-- old/usr/src/cmd/availdevs/availdevs.c	Sat Feb 18 20:26:39 2012
231
++ new/usr/src/cmd/availdevs/availdevs.c	Sat Feb 18 20:26:38 2012
......
21 21

  
22 22
/*
23 23
 * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
24
 * Copyright 2012 Milan Jurik. All rights reserved.
24 25
 */
25 26

  
26 27
#include "availdevs.h"
......
217 218

  
218 219
		default:
219 220
			return (1);
220
			break;
221 221
	}
222 222

  
223 223
	argc -= optind;
224
-- old/usr/src/cmd/boot/bootadm/bootadm.c	Sat Feb 18 20:26:40 2012
224
++ new/usr/src/cmd/boot/bootadm/bootadm.c	Sat Feb 18 20:26:39 2012
......
20 20
 */
21 21
/*
22 22
 * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
23
 * Copyright 2012 Milan Jurik. All rights reserved.
23 24
 */
24 25

  
25 26
/*
......
4961 4962
				free(wholedisk);
4962 4963
				libfdisk_fini(&epp);
4963 4964
				return (partno);
4964
				break;
4965 4965
		}
4966 4966
	}
4967 4967
#endif
4968
-- old/usr/src/cmd/boot/installgrub/installgrub.c	Sat Feb 18 20:26:41 2012
4968
++ new/usr/src/cmd/boot/installgrub/installgrub.c	Sat Feb 18 20:26:40 2012
......
20 20
 */
21 21
/*
22 22
 * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
23
 * Copyright 2012 Milan Jurik. All rights reserved.
23 24
 */
24 25

  
25 26
#include <stdio.h>
......
786 787
			default:
787 788
				(void) fprintf(stderr, LIBFDISK_INIT_FAIL);
788 789
				return (BC_ERROR);
789
				break;
790 790
		}
791 791
	}
792 792

  
793
-- old/usr/src/cmd/cdrw/misc_scsi.c	Sat Feb 18 20:26:42 2012
793
++ new/usr/src/cmd/cdrw/misc_scsi.c	Sat Feb 18 20:26:41 2012
......
21 21
/*
22 22
 * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
23 23
 * Use is subject to license terms.
24
 * Copyright 2012 Milan Jurik. All rights reserved.
24 25
 */
25 26

  
26
#pragma ident	"%Z%%M%	%I%	%E% SMI"
27

  
28 27
#include <sys/types.h>
29 28
#include <stdlib.h>
30 29
#include <string.h>
......
917 916
		rate = cd_speed_get(dev, GET_WRITE_SPEED);
918 917
		return (set_cd_speed(dev->d_fd,
919 918
		    cdrw_x_to_bandwidth(speed), rate));
920
		break;
921 919

  
922 920
	case SET_WRITE_SPEED:
923 921
		rate = cd_speed_get(dev, GET_READ_SPEED);
924 922
		return (set_cd_speed(dev->d_fd, rate,
925 923
		    cdrw_x_to_bandwidth(speed)));
926
		break;
927 924

  
928 925
	default:
929 926
		return (0);
930
-- old/usr/src/cmd/cmd-crypto/decrypt/decrypt.c	Sat Feb 18 20:26:43 2012
927
++ new/usr/src/cmd/cmd-crypto/decrypt/decrypt.c	Sat Feb 18 20:26:43 2012
......
22 22
/*
23 23
 * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
24 24
 * Use is subject to license terms.
25
 * Copyright 2012 Milan Jurik. All rights reserved.
25 26
 */
26 27

  
27 28
/*
......
792 793
			    "input file - expected %d, got %d."),
793 794
			    SUNW_ENCRYPT_FILE_VERSION, version);
794 795
			goto cleanup;
795
			break;
796 796
		}
797 797
	}
798 798

  
799
-- old/usr/src/cmd/cmd-crypto/pktool/delete.c	Sat Feb 18 20:26:44 2012
799
++ new/usr/src/cmd/cmd-crypto/pktool/delete.c	Sat Feb 18 20:26:43 2012
......
21 21
/*
22 22
 * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
23 23
 * Use is subject to license terms.
24
 * Copyright 2012 Milan Jurik. All rights reserved.
24 25
 */
25 26

  
26
#pragma ident	"%Z%%M%	%I%	%E% SMI"
27

  
28 27
/*
29 28
 * This file implements the token object delete operation for this tool.
30 29
 * It loads the PKCS#11 modules, finds the object to delete, deletes it,
......
805 804
			break;
806 805
		default:
807 806
			return (PK_ERR_USAGE);
808
			break;
809 807
		}
810 808
	}
811 809

  
812
-- old/usr/src/cmd/cmd-crypto/pktool/export.c	Sat Feb 18 20:26:45 2012
810
++ new/usr/src/cmd/cmd-crypto/pktool/export.c	Sat Feb 18 20:26:44 2012
......
19 19
 * CDDL HEADER END
20 20
 *
21 21
 * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
22
 * Copyright 2012 Milan Jurik. All rights reserved.
22 23
 */
23 24

  
24 25
/*
......
777 778
			break;
778 779
		default:
779 780
			return (PK_ERR_USAGE);
780
			break;
781 781
		}
782 782
	}
783 783

  
784
-- old/usr/src/cmd/cmd-crypto/pktool/import.c	Sat Feb 18 20:26:46 2012
784
++ new/usr/src/cmd/cmd-crypto/pktool/import.c	Sat Feb 18 20:26:45 2012
......
21 21
/*
22 22
 * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
23 23
 * Use is subject to license terms.
24
 * Copyright 2012 Milan Jurik. All rights reserved.
24 25
 */
25 26

  
26 27
/*
......
916 917
			break;
917 918
		default:
918 919
			return (PK_ERR_USAGE);
919
			break;
920 920
		}
921 921
	}
922 922

  
923
-- old/usr/src/cmd/cmd-crypto/pktool/inittoken.c	Sat Feb 18 20:26:46 2012
923
++ new/usr/src/cmd/cmd-crypto/pktool/inittoken.c	Sat Feb 18 20:26:46 2012
......
21 21
/*
22 22
 * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
23 23
 * Use is subject to license terms.
24
 * Copyright 2012 Milan Jurik. All rights reserved.
24 25
 */
25 26

  
26 27
/*
......
69 70
				break;
70 71
			default:
71 72
				return (PK_ERR_USAGE);
72
				break;
73 73
		}
74 74
	}
75 75

  
76
-- old/usr/src/cmd/cmd-crypto/pktool/list.c	Sat Feb 18 20:26:47 2012
76
++ new/usr/src/cmd/cmd-crypto/pktool/list.c	Sat Feb 18 20:26:47 2012
......
20 20
 */
21 21
/*
22 22
 * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
23
 * Copyright 2012 Milan Jurik. All rights reserved.
23 24
 */
24 25

  
25 26
/*
......
138 139
		switch (key->keyalg) {
139 140
			case KMF_AES:
140 141
				return (gettext("AES"));
141
				break;
142 142
			case KMF_RC4:
143 143
				return (gettext("ARCFOUR"));
144
				break;
145 144
			case KMF_DES:
146 145
				return (gettext("DES"));
147
				break;
148 146
			case KMF_DES3:
149 147
				return (gettext("Triple-DES"));
150
				break;
151 148
			default:
152 149
				return (gettext("symmetric"));
153
				break;
154 150
		}
155 151
	}
156 152

  
157
-- old/usr/src/cmd/cmd-crypto/pktool/setpin.c	Sat Feb 18 20:26:48 2012
153
++ new/usr/src/cmd/cmd-crypto/pktool/setpin.c	Sat Feb 18 20:26:47 2012
......
21 21
/*
22 22
 * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
23 23
 * Use is subject to license terms.
24
 * Copyright 2012 Milan Jurik. All rights reserved.
24 25
 */
25 26

  
26 27
/*
......
275 276
				break;
276 277
			default:
277 278
				return (PK_ERR_USAGE);
278
				break;
279 279
		}
280 280
	}
281 281

  
282
-- old/usr/src/cmd/cmd-inet/usr.lib/ilbd/ilbd_hc.c	Sat Feb 18 20:26:49 2012
282
++ new/usr/src/cmd/cmd-inet/usr.lib/ilbd/ilbd_hc.c	Sat Feb 18 20:26:48 2012
......
22 22
/*
23 23
 * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
24 24
 * Use is subject to license terms.
25
 * Copyright 2012 Milan Jurik. All rights reserved.
25 26
 */
26 27

  
27 28
#include <sys/types.h>
......
1083 1084
	switch (topo) {
1084 1085
	case ILB_TOPO_DSR:
1085 1086
		return ("DSR");
1086
		break;
1087 1087
	case ILB_TOPO_NAT:
1088 1088
		return ("NAT");
1089
		break;
1090 1089
	case ILB_TOPO_HALF_NAT:
1091 1090
		return ("HALF_NAT");
1092
		break;
1093 1091
	default:
1094 1092
		/* Should not happen. */
1095 1093
		logerr("%s: unknown topology", __func__);
......
1188 1186
	default:
1189 1187
		logerr("%s: unknown protocol", __func__);
1190 1188
		goto cleanup;
1191
		break;
1192 1189
	}
1193 1190
	if (argv[3] == NULL)
1194 1191
		goto cleanup;
......
1225 1222
	default:
1226 1223
		logerr("%s: unknown HC flag", __func__);
1227 1224
		goto cleanup;
1228
		break;
1229 1225
	}
1230 1226
	(void) sprintf(buf, "%d", port);
1231 1227
	if ((argv[5] = strdup(buf)) == NULL)
1232
-- old/usr/src/cmd/cmd-inet/usr.lib/wanboot/wanboot-cgi/wanboot-cgi.c	Sat Feb 18 20:26:50 2012
1228
++ new/usr/src/cmd/cmd-inet/usr.lib/wanboot/wanboot-cgi/wanboot-cgi.c	Sat Feb 18 20:26:49 2012
......
20 20
 */
21 21
/*
22 22
 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
23
 * Copyright 2012 Milan Jurik. All rights reserved.
23 24
 */
24 25

  
25 26
#include <stdio.h>
......
474 475
		default:
475 476
			print_status(400, "(illegal query string)");
476 477
			return (B_FALSE);
477
			break;
478 478
		}
479 479
	}
480 480

  
481
-- old/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/ilbadm_rules.c	Sat Feb 18 20:26:50 2012
481
++ new/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/ilbadm_rules.c	Sat Feb 18 20:26:50 2012
......
22 22
/*
23 23
 * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
24 24
 * Use is subject to license terms.
25
 * Copyright 2012 Milan Jurik. All rights reserved.
25 26
 */
26 27

  
27 28
#include <stdio.h>
......
662 663
			    (char)optopt);
663 664
			rc = ILBADM_LIBERR;
664 665
			goto out;
665
			/* not reached */
666
			break;
667 666
		case '?':
668 667
		default:
669 668
			unknown_opt(argv, optind-1);
......
864 863
			    (char)optopt);
865 864
			rc = ILBADM_LIBERR;
866 865
			goto out;
867
			/* not reached */
868
			break;
869 866
		case '?':
870 867
		default:
871 868
			unknown_opt(argv, optind-1);
872
-- old/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/ilbadm_sg.c	Sat Feb 18 20:26:51 2012
869
++ new/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/ilbadm_sg.c	Sat Feb 18 20:26:51 2012
......
22 22
/*
23 23
 * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
24 24
 * Use is subject to license terms.
25
 * Copyright 2012 Milan Jurik. All rights reserved.
25 26
 */
26 27

  
27 28
#include <stdio.h>
......
258 259
			    " for %c"), (char)optopt);
259 260
			rc = ILBADM_LIBERR;
260 261
			goto out;
261
			/* not reached */
262
			break;
263 262
		default: unknown_opt(argv, optind-1);
264 263
			/* not reached */
265 264
			break;
266
-- old/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/ilbadm_stats.c	Sat Feb 18 20:26:52 2012
265
++ new/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/ilbadm_stats.c	Sat Feb 18 20:26:51 2012
......
22 22
/*
23 23
 * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
24 24
 * Use is subject to license terms.
25
 * Copyright 2012 Milan Jurik. All rights reserved.
25 26
 */
26 27

  
27 28
#include <stdio.h>
......
361 362
		(void) snprintf(buf, bufsize, "%s",
362 363
		    sta->ilbst_rlist[rule_index].ird_rulename);
363 364
		return (B_TRUE);
364
		/* not reached */
365
		break;
366 365
	case ILBST_ITEMIZE_SNAME:
367 366
		(void) snprintf(buf, bufsize, "%s", srv->isd_servername);
368 367
		return (B_TRUE);
369
		/* not reached */
370
		break;
371 368
	}
372 369

  
373 370
	count = srv->isd_serverstats[stat_ind].is_value;
374
-- old/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/ilbadm_subr.c	Sat Feb 18 20:26:53 2012
371
++ new/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/ilbadm_subr.c	Sat Feb 18 20:26:52 2012
......
22 22
/*
23 23
 * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
24 24
 * Use is subject to license terms.
25
 * Copyright 2012 Milan Jurik. All rights reserved.
25 26
 */
26 27

  
27 28
#include <stdio.h>
......
186 187
	}
187 188
	default:
188 189
		return (ILBADM_INVAL_AF);
189
		break;
190 190
	}
191 191

  
192 192
	if (a_type != NULL)
......
328 328
		return (ILBADM_TOOMANYIPADDR);
329 329

  
330 330
	switch (ip1->ia_af) {
331
	case AF_INET: return (i_expand_ipv4range(sg, sr, ip1, ip2));
332
		/* not reached */
333
		break;
334
	case AF_INET6: return (i_expand_ipv6range(sg, sr, ip1, ip2));
335
		/* not reached */
336
		break;
331
	case AF_INET:
332
		return (i_expand_ipv4range(sg, sr, ip1, ip2));
333
	case AF_INET6:
334
		return (i_expand_ipv6range(sg, sr, ip1, ip2));
337 335
	}
338 336
	return (ILBADM_INVAL_AF);
339 337
}
340
-- old/usr/src/cmd/cpio/cpio.c	Sat Feb 18 20:26:54 2012
338
++ new/usr/src/cmd/cpio/cpio.c	Sat Feb 18 20:26:53 2012
......
20 20
 */
21 21
/*
22 22
 * Copyright (c) 1988, 2010, Oracle and/or its affiliates. All rights reserved.
23
 * Copyright 2012 Milan Jurik. All rights reserved.
23 24
 */
24 25

  
25 26
/*	Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T	*/
......
9120 9121
			case 0:
9121 9122
				/* found it */
9122 9123
				return (p);
9123
				break;
9124 9124

  
9125 9125
			case 1:
9126 9126
				/* move right */
9127
-- old/usr/src/cmd/dfs.cmds/sharectl/sharectl.c	Sat Feb 18 20:26:55 2012
9127
++ new/usr/src/cmd/dfs.cmds/sharectl/sharectl.c	Sat Feb 18 20:26:55 2012
......
22 22
/*
23 23
 * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
24 24
 * Use is subject to license terms.
25
 * Copyright 2012 Milan Jurik. All rights reserved.
25 26
 */
26 27

  
27 28
#include <stdlib.h>
......
146 147
			(void) printf(gettext("usage: %s\n"),
147 148
			    sc_get_usage(USAGE_CTL_GET));
148 149
			return (SA_OK);
149
			break;
150 150
		}
151 151
	}
152 152

  
......
291 291
			(void) printf(gettext("usage: %s\n"),
292 292
			    sc_get_usage(USAGE_CTL_SET));
293 293
			return (SA_OK);
294
			break;
295 294
		}
296 295
	}
297 296

  
298
-- old/usr/src/cmd/dfs.cmds/sharemgr/commands.c	Sat Feb 18 20:26:56 2012
297
++ new/usr/src/cmd/dfs.cmds/sharemgr/commands.c	Sat Feb 18 20:26:56 2012
......
22 22
/*
23 23
 * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
24 24
 * Use is subject to license terms.
25
 * Copyright 2012 Milan Jurik. All rights reserved.
25 26
 */
26 27

  
27 28
#include <sys/types.h>
......
1220 1221
			(void) printf(gettext(
1221 1222
			    "Invalid protocol specified: %s\n"), protocol);
1222 1223
			return (SA_INVALID_PROTOCOL);
1223
			break;
1224 1224
		case 'p':
1225 1225
			ret = add_opt(&optlist, optarg, 0);
1226 1226
			switch (ret) {
1227
-- old/usr/src/cmd/fm/modules/common/eversholt/fme.c	Sat Feb 18 20:26:57 2012
1227
++ new/usr/src/cmd/fm/modules/common/eversholt/fme.c	Sat Feb 18 20:26:57 2012
......
21 21

  
22 22
/*
23 23
 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
24
 * Copyright 2012 Milan Jurik. All rights reserved.
24 25
 *
25 26
 * fme.c -- fault management exercise module
26 27
 *
......
2949 2950
	case UD_VAL_BADOBS:
2950 2951
	case UD_VAL_CFGMISMATCH:
2951 2952
		return (UNDIAG_DEFECT_CHKPT);
2952
		break;
2953 2953

  
2954 2954
	case UD_VAL_BADEVENTI:
2955 2955
	case UD_VAL_BADEVENTPATH:
......
2958 2958
	case UD_VAL_NOPATH:
2959 2959
	case UD_VAL_UNSOLVD:
2960 2960
		return (UNDIAG_DEFECT_FME);
2961
		break;
2962 2961

  
2963 2962
	case UD_VAL_MAXFME:
2964 2963
		return (UNDIAG_DEFECT_LIMIT);
2965
		break;
2966 2964

  
2967 2965
	case UD_VAL_UNKNOWN:
2968 2966
	default:
2969 2967
		return (UNDIAG_DEFECT_UNKNOWN);
2970
		break;
2971 2968
	}
2972 2969
}
2973 2970

  
2974
-- old/usr/src/cmd/format/menu_command.c	Sat Feb 18 20:26:58 2012
2971
++ new/usr/src/cmd/format/menu_command.c	Sat Feb 18 20:26:58 2012
......
20 20
 */
21 21
/*
22 22
 * Copyright (c) 1993, 2010, Oracle and/or its affiliates. All rights reserved.
23
 * Copyright 2012 Milan Jurik. All rights reserved.
23 24
 */
24 25

  
25 26
/*
......
497 498
				}
498 499
			}
499 500
			return (0);
500
			break;
501 501
		default:
502
		/* Should never happen */
503
		return (-1);
502
			/* Should never happen */
503
			return (-1);
504 504
		}
505 505
	} else if ((index == other_choice) && (cur_label == L_TYPE_SOLARIS)) {
506 506
		/*
507
-- old/usr/src/cmd/iscsid/iscsid.c	Sat Feb 18 20:26:59 2012
507
++ new/usr/src/cmd/iscsid/iscsid.c	Sat Feb 18 20:26:58 2012
......
21 21
/*
22 22
 * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
23 23
 * Use is subject to license terms.
24
 * Copyright 2012 Milan Jurik. All rights reserved.
24 25
 */
25 26

  
26 27
#include <sys/types.h>
......
280 281
				    " service exited with sessions left."));
281 282
			}
282 283
			return (0);
283
			break;
284 284
		default:
285 285
			break;
286 286
		}
287
-- old/usr/src/cmd/ldap/ns_ldap/ldapaddent.c	Sat Feb 18 20:27:00 2012
287
++ new/usr/src/cmd/ldap/ns_ldap/ldapaddent.c	Sat Feb 18 20:26:59 2012
......
20 20
 */
21 21
/*
22 22
 * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
23
 * Copyright 2012 Milan Jurik. All rights reserved.
23 24
 */
24 25

  
25 26
/*
......
4113 4114
			exit_val = 2;
4114 4115
			free(line.str);
4115 4116
			return;
4116
			break;
4117 4117
		case GENENT_ERR:
4118 4118
			(void) fprintf(stderr,
4119 4119
			    gettext("Internal Error while adding line: %s\n"),
......
4121 4121
			exit_val = 3;
4122 4122
			free(line.str);
4123 4123
			return;
4124
			break;
4125 4124
		}
4126 4125
	}
4127 4126
	free(line.str);
......
4726 4725
	switch (h_errno) {
4727 4726
	case HOST_NOT_FOUND:
4728 4727
		return ("HOST_NOT_FOUND");
4729
		break;
4730 4728
	case TRY_AGAIN:
4731 4729
		return ("TRY_AGAIN");
4732
		break;
4733 4730
	case NO_RECOVERY:
4734 4731
		return ("NO_RECOVERY");
4735
		break;
4736 4732
	case NO_DATA:
4737 4733
		return ("NO_DATA");
4738
		break;
4739 4734
	default:
4740 4735
		break;
4741 4736
	}
4742
-- old/usr/src/cmd/ldap/ns_ldap/ldapclient.c	Sat Feb 18 20:27:01 2012
4737
++ new/usr/src/cmd/ldap/ns_ldap/ldapclient.c	Sat Feb 18 20:27:00 2012
......
21 21
/*
22 22
 * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
23 23
 * Use is subject to license terms.
24
 * Copyright 2012 Milan Jurik. All rights reserved.
24 25
 */
25 26

  
26 27
/*
......
1703 1704
					break;
1704 1705
				default:
1705 1706
					continue;
1706
					break;
1707 1707
				}
1708 1708
				if (strcmp(cred,
1709 1709
				    arglist->credentialLevel) == 0) {
1710
-- old/usr/src/cmd/mdb/common/modules/pmcs/pmcs.c	Sat Feb 18 20:27:02 2012
1710
++ new/usr/src/cmd/mdb/common/modules/pmcs/pmcs.c	Sat Feb 18 20:27:01 2012
......
20 20
 */
21 21
/*
22 22
 * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
23
 * Copyright 2012 Milan Jurik. All rights reserved.
23 24
 */
24 25

  
25 26
#include <limits.h>
......
1243 1244
	switch (qnum) {
1244 1245
	case PMCS_OQ_IODONE:
1245 1246
		return ("I/O");
1246
		break;
1247 1247
	case PMCS_OQ_GENERAL:
1248 1248
		return ("General");
1249
		break;
1250 1249
	case PMCS_OQ_EVENTS:
1251 1250
		return ("Events");
1252
		break;
1253 1251
	default:
1254 1252
		return ("UNKNOWN");
1255 1253
	}
......
1261 1259
	switch (cat) {
1262 1260
	case PMCS_IOMB_CAT_NET:
1263 1261
		return ("NET");
1264
		break;
1265 1262
	case PMCS_IOMB_CAT_FC:
1266 1263
		return ("FC");
1267
		break;
1268 1264
	case PMCS_IOMB_CAT_SAS:
1269 1265
		return ("SAS");
1270
		break;
1271 1266
	case PMCS_IOMB_CAT_SCSI:
1272 1267
		return ("SCSI");
1273
		break;
1274 1268
	default:
1275 1269
		return ("???");
1276 1270
	}
......
1282 1276
	switch (event) {
1283 1277
	case IOP_EVENT_PHY_STOP_STATUS:
1284 1278
		return ("PHY STOP");
1285
		break;
1286 1279
	case IOP_EVENT_SAS_PHY_UP:
1287 1280
		return ("PHY UP");
1288
		break;
1289 1281
	case IOP_EVENT_SATA_PHY_UP:
1290 1282
		return ("SATA PHY UP");
1291
		break;
1292 1283
	case IOP_EVENT_SATA_SPINUP_HOLD:
1293 1284
		return ("SATA SPINUP HOLD");
1294
		break;
1295 1285
	case IOP_EVENT_PHY_DOWN:
1296 1286
		return ("PHY DOWN");
1297
		break;
1298 1287
	case IOP_EVENT_BROADCAST_CHANGE:
1299 1288
		return ("BROADCAST CHANGE");
1300
		break;
1301 1289
	case IOP_EVENT_BROADCAST_SES:
1302 1290
		return ("BROADCAST SES");
1303
		break;
1304 1291
	case IOP_EVENT_PHY_ERR_INBOUND_CRC:
1305 1292
		return ("INBOUND CRC ERROR");
1306
		break;
1307 1293
	case IOP_EVENT_HARD_RESET_RECEIVED:
1308 1294
		return ("HARD RESET");
1309
		break;
1310 1295
	case IOP_EVENT_EVENT_ID_FRAME_TIMO:
1311 1296
		return ("IDENTIFY FRAME TIMEOUT");
1312
		break;
1313 1297
	case IOP_EVENT_BROADCAST_EXP:
1314 1298
		return ("BROADCAST EXPANDER");
1315
		break;
1316 1299
	case IOP_EVENT_PHY_START_STATUS:
1317 1300
		return ("PHY START");
1318
		break;
1319 1301
	case IOP_EVENT_PHY_ERR_INVALID_DWORD:
1320 1302
		return ("INVALID DWORD");
1321
		break;
1322 1303
	case IOP_EVENT_PHY_ERR_DISPARITY_ERROR:
1323 1304
		return ("DISPARITY ERROR");
1324
		break;
1325 1305
	case IOP_EVENT_PHY_ERR_CODE_VIOLATION:
1326 1306
		return ("CODE VIOLATION");
1327
		break;
1328 1307
	case IOP_EVENT_PHY_ERR_LOSS_OF_DWORD_SYN:
1329 1308
		return ("LOSS OF DWORD SYNC");
1330
		break;
1331 1309
	case IOP_EVENT_PHY_ERR_PHY_RESET_FAILD:
1332 1310
		return ("PHY RESET FAILED");
1333
		break;
1334 1311
	case IOP_EVENT_PORT_RECOVERY_TIMER_TMO:
1335 1312
		return ("PORT RECOVERY TIMEOUT");
1336
		break;
1337 1313
	case IOP_EVENT_PORT_RECOVER:
1338 1314
		return ("PORT RECOVERY");
1339
		break;
1340 1315
	case IOP_EVENT_PORT_RESET_TIMER_TMO:
1341 1316
		return ("PORT RESET TIMEOUT");
1342
		break;
1343 1317
	case IOP_EVENT_PORT_RESET_COMPLETE:
1344 1318
		return ("PORT RESET COMPLETE");
1345
		break;
1346 1319
	case IOP_EVENT_BROADCAST_ASYNC_EVENT:
1347 1320
		return ("BROADCAST ASYNC");
1348
		break;
1349 1321
	case IOP_EVENT_IT_NEXUS_LOSS:
1350 1322
		return ("I/T NEXUS LOSS");
1351
		break;
1352 1323
	default:
1353 1324
		return ("Unknown Event");
1354 1325
	}
......
1360 1331
	switch (opcode) {
1361 1332
	case PMCIN_ECHO:
1362 1333
		return ("ECHO");
1363
		break;
1364 1334
	case PMCIN_GET_INFO:
1365 1335
		return ("GET_INFO");
1366
		break;
1367 1336
	case PMCIN_GET_VPD:
1368 1337
		return ("GET_VPD");
1369
		break;
1370 1338
	case PMCIN_PHY_START:
1371 1339
		return ("PHY_START");
1372
		break;
1373 1340
	case PMCIN_PHY_STOP:
1374 1341
		return ("PHY_STOP");
1375
		break;
1376 1342
	case PMCIN_SSP_INI_IO_START:
1377 1343
		return ("INI_IO_START");
1378
		break;
1379 1344
	case PMCIN_SSP_INI_TM_START:
1380 1345
		return ("INI_TM_START");
1381
		break;
1382 1346
	case PMCIN_SSP_INI_EXT_IO_START:
1383 1347
		return ("INI_EXT_IO_START");
1384
		break;
1385 1348
	case PMCIN_DEVICE_HANDLE_ACCEPT:
1386 1349
		return ("DEVICE_HANDLE_ACCEPT");
1387
		break;
1388 1350
	case PMCIN_SSP_TGT_IO_START:
1389 1351
		return ("TGT_IO_START");
1390
		break;
1391 1352
	case PMCIN_SSP_TGT_RESPONSE_START:
1392 1353
		return ("TGT_RESPONSE_START");
1393
		break;
1394 1354
	case PMCIN_SSP_INI_EDC_EXT_IO_START:
1395 1355
		return ("INI_EDC_EXT_IO_START");
1396
		break;
1397 1356
	case PMCIN_SSP_INI_EDC_EXT_IO_START1:
1398 1357
		return ("INI_EDC_EXT_IO_START1");
1399
		break;
1400 1358
	case PMCIN_SSP_TGT_EDC_IO_START:
1401 1359
		return ("TGT_EDC_IO_START");
1402
		break;
1403 1360
	case PMCIN_SSP_ABORT:
1404 1361
		return ("SSP_ABORT");
1405
		break;
1406 1362
	case PMCIN_DEREGISTER_DEVICE_HANDLE:
1407 1363
		return ("DEREGISTER_DEVICE_HANDLE");
1408
		break;
1409 1364
	case PMCIN_GET_DEVICE_HANDLE:
1410 1365
		return ("GET_DEVICE_HANDLE");
1411
		break;
1412 1366
	case PMCIN_SMP_REQUEST:
1413 1367
		return ("SMP_REQUEST");
1414
		break;
1415 1368
	case PMCIN_SMP_RESPONSE:
1416 1369
		return ("SMP_RESPONSE");
1417
		break;
1418 1370
	case PMCIN_SMP_ABORT:
1419 1371
		return ("SMP_ABORT");
1420
		break;
1421 1372
	case PMCIN_ASSISTED_DISCOVERY:
1422 1373
		return ("ASSISTED_DISCOVERY");
1423
		break;
1424 1374
	case PMCIN_REGISTER_DEVICE:
1425 1375
		return ("REGISTER_DEVICE");
1426
		break;
1427 1376
	case PMCIN_SATA_HOST_IO_START:
1428 1377
		return ("SATA_HOST_IO_START");
1429
		break;
1430 1378
	case PMCIN_SATA_ABORT:
1431 1379
		return ("SATA_ABORT");
1432
		break;
1433 1380
	case PMCIN_LOCAL_PHY_CONTROL:
1434 1381
		return ("LOCAL_PHY_CONTROL");
1435
		break;
1436 1382
	case PMCIN_GET_DEVICE_INFO:
1437 1383
		return ("GET_DEVICE_INFO");
1438
		break;
1439 1384
	case PMCIN_TWI:
1440 1385
		return ("TWI");
1441
		break;
1442 1386
	case PMCIN_FW_FLASH_UPDATE:
1443 1387
		return ("FW_FLASH_UPDATE");
1444
		break;
1445 1388
	case PMCIN_SET_VPD:
1446 1389
		return ("SET_VPD");
1447
		break;
1448 1390
	case PMCIN_GPIO:
1449 1391
		return ("GPIO");
1450
		break;
1451 1392
	case PMCIN_SAS_DIAG_MODE_START_END:
1452 1393
		return ("SAS_DIAG_MODE_START_END");
1453
		break;
1454 1394
	case PMCIN_SAS_DIAG_EXECUTE:
1455 1395
		return ("SAS_DIAG_EXECUTE");
1456
		break;
1457 1396
	case PMCIN_SAS_HW_EVENT_ACK:
1458 1397
		return ("SAS_HW_EVENT_ACK");
1459
		break;
1460 1398
	case PMCIN_GET_TIME_STAMP:
1461 1399
		return ("GET_TIME_STAMP");
1462
		break;
1463 1400
	case PMCIN_PORT_CONTROL:
1464 1401
		return ("PORT_CONTROL");
1465
		break;
1466 1402
	case PMCIN_GET_NVMD_DATA:
1467 1403
		return ("GET_NVMD_DATA");
1468
		break;
1469 1404
	case PMCIN_SET_NVMD_DATA:
1470 1405
		return ("SET_NVMD_DATA");
1471
		break;
1472 1406
	case PMCIN_SET_DEVICE_STATE:
1473 1407
		return ("SET_DEVICE_STATE");
1474
		break;
1475 1408
	case PMCIN_GET_DEVICE_STATE:
1476 1409
		return ("GET_DEVICE_STATE");
1477
		break;
1478 1410
	default:
1479 1411
		return ("UNKNOWN");
1480
		break;
1481 1412
	}
1482 1413
}
1483 1414

  
......
1487 1418
	switch (opcode) {
1488 1419
	case PMCOUT_ECHO:
1489 1420
		return ("ECHO");
1490
		break;
1491 1421
	case PMCOUT_GET_INFO:
1492 1422
		return ("GET_INFO");
1493
		break;
1494 1423
	case PMCOUT_GET_VPD:
1495 1424
		return ("GET_VPD");
1496
		break;
1497 1425
	case PMCOUT_SAS_HW_EVENT:
1498 1426
		return ("SAS_HW_EVENT");
1499
		break;
1500 1427
	case PMCOUT_SSP_COMPLETION:
1501 1428
		return ("SSP_COMPLETION");
1502
		break;
1503 1429
	case PMCOUT_SMP_COMPLETION:
1504 1430
		return ("SMP_COMPLETION");
1505
		break;
1506 1431
	case PMCOUT_LOCAL_PHY_CONTROL:
1507 1432
		return ("LOCAL_PHY_CONTROL");
1508
		break;
1509 1433
	case PMCOUT_SAS_ASSISTED_DISCOVERY_EVENT:
1510 1434
		return ("SAS_ASSISTED_DISCOVERY_SENT");
1511
		break;
1512 1435
	case PMCOUT_SATA_ASSISTED_DISCOVERY_EVENT:
1513 1436
		return ("SATA_ASSISTED_DISCOVERY_SENT");
1514
		break;
1515 1437
	case PMCOUT_DEVICE_REGISTRATION:
1516 1438
		return ("DEVICE_REGISTRATION");
1517
		break;
1518 1439
	case PMCOUT_DEREGISTER_DEVICE_HANDLE:
1519 1440
		return ("DEREGISTER_DEVICE_HANDLE");
1520
		break;
1521 1441
	case PMCOUT_GET_DEVICE_HANDLE:
1522 1442
		return ("GET_DEVICE_HANDLE");
1523
		break;
1524 1443
	case PMCOUT_SATA_COMPLETION:
1525 1444
		return ("SATA_COMPLETION");
1526
		break;
1527 1445
	case PMCOUT_SATA_EVENT:
1528 1446
		return ("SATA_EVENT");
1529
		break;
1530 1447
	case PMCOUT_SSP_EVENT:
1531 1448
		return ("SSP_EVENT");
1532
		break;
1533 1449
	case PMCOUT_DEVICE_HANDLE_ARRIVED:
1534 1450
		return ("DEVICE_HANDLE_ARRIVED");
1535
		break;
1536 1451
	case PMCOUT_SSP_REQUEST_RECEIVED:
1537 1452
		return ("SSP_REQUEST_RECEIVED");
1538
		break;
1539 1453
	case PMCOUT_DEVICE_INFO:
1540 1454
		return ("DEVICE_INFO");
1541
		break;
1542 1455
	case PMCOUT_FW_FLASH_UPDATE:
1543 1456
		return ("FW_FLASH_UPDATE");
1544
		break;
1545 1457
	case PMCOUT_SET_VPD:
1546 1458
		return ("SET_VPD");
1547
		break;
1548 1459
	case PMCOUT_GPIO:
1549 1460
		return ("GPIO");
1550
		break;
1551 1461
	case PMCOUT_GPIO_EVENT:
1552 1462
		return ("GPIO_EVENT");
1553
		break;
1554 1463
	case PMCOUT_GENERAL_EVENT:
1555 1464
		return ("GENERAL_EVENT");
1556
		break;
1557 1465
	case PMCOUT_TWI:
1558 1466
		return ("TWI");
1559
		break;
1560 1467
	case PMCOUT_SSP_ABORT:
1561 1468
		return ("SSP_ABORT");
1562
		break;
1563 1469
	case PMCOUT_SATA_ABORT:
1564 1470
		return ("SATA_ABORT");
1565
		break;
1566 1471
	case PMCOUT_SAS_DIAG_MODE_START_END:
1567 1472
		return ("SAS_DIAG_MODE_START_END");
1568
		break;
1569 1473
	case PMCOUT_SAS_DIAG_EXECUTE:
1570 1474
		return ("SAS_DIAG_EXECUTE");
1571
		break;
1572 1475
	case PMCOUT_GET_TIME_STAMP:
1573 1476
		return ("GET_TIME_STAMP");
1574
		break;
1575 1477
	case PMCOUT_SAS_HW_EVENT_ACK_ACK:
1576 1478
		return ("SAS_HW_EVENT_ACK_ACK");
1577
		break;
1578 1479
	case PMCOUT_PORT_CONTROL:
1579 1480
		return ("PORT_CONTROL");
1580
		break;
1581 1481
	case PMCOUT_SKIP_ENTRIES:
1582 1482
		return ("SKIP_ENTRIES");
1583
		break;
1584 1483
	case PMCOUT_SMP_ABORT:
1585 1484
		return ("SMP_ABORT");
1586
		break;
1587 1485
	case PMCOUT_GET_NVMD_DATA:
1588 1486
		return ("GET_NVMD_DATA");
1589
		break;
1590 1487
	case PMCOUT_SET_NVMD_DATA:
1591 1488
		return ("SET_NVMD_DATA");
1592
		break;
1593 1489
	case PMCOUT_DEVICE_HANDLE_REMOVED:
1594 1490
		return ("DEVICE_HANDLE_REMOVED");
1595
		break;
1596 1491
	case PMCOUT_SET_DEVICE_STATE:
1597 1492
		return ("SET_DEVICE_STATE");
1598
		break;
1599 1493
	case PMCOUT_GET_DEVICE_STATE:
1600 1494
		return ("GET_DEVICE_STATE");
1601
		break;
1602 1495
	case PMCOUT_SET_DEVICE_INFO:
1603 1496
		return ("SET_DEVICE_INFO");
1604
		break;
1605 1497
	default:
1606 1498
		return ("UNKNOWN");
1607
		break;
1608 1499
	}
1609 1500
}
1610 1501

  
1611
-- old/usr/src/cmd/ndmpd/tlm/tlm_util.c	Sat Feb 18 20:27:03 2012
1502
++ new/usr/src/cmd/ndmpd/tlm/tlm_util.c	Sat Feb 18 20:27:02 2012
......
1 1
/*
2 2
 * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
3 3
 * Use is subject to license terms.
4
 * Copyright 2012 Milan Jurik. All rights reserved.
4 5
 */
5 6

  
6 7
/*
......
222 223
				str++;
223 224
				patn++;
224 225
				continue;
225
			} else {
226
				return (FALSE);
227 226
			}
228
			break;
227
			return (FALSE);
229 228

  
230 229
		case '*':
231 230
			patn++;
......
276 275
				str++;
277 276
				patn++;
278 277
				continue;
279
			} else {
280
				return (FALSE);
281 278
			}
282
			break;
279
			return (FALSE);
283 280

  
284

  
285 281
		case '*':
286 282
			patn++;
287 283
			if (*patn == 0)
288
-- old/usr/src/cmd/nscd/nscd_config.c	Sat Feb 18 20:27:04 2012
284
++ new/usr/src/cmd/nscd/nscd_config.c	Sat Feb 18 20:27:03 2012
......
21 21
/*
22 22
 * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
23 23
 * Use is subject to license terms.
24
 * Copyright 2012 Milan Jurik. All rights reserved.
24 25
 */
25 26

  
26 27
#include <stdio.h>
......
132 133
		(me, "invalid argument: type (%d)\n", type);
133 134

  
134 135
		return (NSCD_INVALID_ARGUMENT);
135
		break;
136 136
	}
137 137

  
138 138
	size =  sizeof (nscd_cfg_list_t) + sizeof (nscd_cfg_id_t *) * (num + 1);
139
-- old/usr/src/cmd/nscd/nscd_selfcred.c	Sat Feb 18 20:27:05 2012
139
++ new/usr/src/cmd/nscd/nscd_selfcred.c	Sat Feb 18 20:27:04 2012
......
21 21

  
22 22
/*
23 23
 * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
24
 * Copyright 2012 Milan Jurik. All rights reserved.
24 25
 */
25 26

  
26 27
#include <stdio.h>
......
456 457
			(void) smf_maintain_instance(fmri, SMF_TEMPORARY);
457 458
		}
458 459
		return ((void *)1);
459
		break;
460 460
	case 0:
461 461
		_NSCD_LOG(NSCD_LOG_SELF_CRED, NSCD_LOG_LEVEL_DEBUG)
462 462
		(me, "execv path = %s\n", execpath);
463 463

  
464 464
		(void) execv(execpath, execargv);
465 465
		exit(0);
466
		break;
467 466
	default:
468 467
		_NSCD_LOG(NSCD_LOG_SELF_CRED, NSCD_LOG_LEVEL_DEBUG)
469 468
		(me, "new forker's pid is %d\n", fpid);
470
-- old/usr/src/cmd/pcitool/pcitool_ui.c	Sat Feb 18 20:27:06 2012
469
++ new/usr/src/cmd/pcitool/pcitool_ui.c	Sat Feb 18 20:27:05 2012
......
20 20
 */
21 21
/*
22 22
 * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
23
 * Copyright 2012 Milan Jurik. All rights reserved.
23 24
 */
24 25

  
25 26
/*
......
823 824
		case 'y':
824 825
		case 'Y':
825 826
			return (B_TRUE);
826
			break;
827 827
		default:
828 828
			return (B_FALSE);
829
			break;
830 829
		}
831 830
	}
832 831
}
833
-- old/usr/src/cmd/power/sys-suspend.c	Sat Feb 18 20:27:06 2012
832
++ new/usr/src/cmd/power/sys-suspend.c	Sat Feb 18 20:27:06 2012
......
21 21
/*
22 22
 * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
23 23
 * Use is subject to license terms.
24
 * Copyright 2012 Milan Jurik. All rights reserved.
24 25
 */
25 26

  
26 27
/*
......
641 642
				(void) printf(gettext("USAGE: suspend "
642 643
				    "[-fnxh] [-d <display>]\n"));
643 644
				return (1);
644
				break;
645 645
		}
646 646
	}
647 647

  
648
-- old/usr/src/cmd/sbdadm/sbdadm.c	Sat Feb 18 20:27:07 2012
648
++ new/usr/src/cmd/sbdadm/sbdadm.c	Sat Feb 18 20:27:07 2012
......
21 21
/*
22 22
 * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
23 23
 * Use is subject to license terms.
24
 * Copyright 2012 Milan Jurik. All rights reserved.
24 25
 */
25 26
#include <stdlib.h>
26 27
#include <stdio.h>
......
653 654
			case STMF_ERROR_NOT_FOUND:
654 655
				/* No error here */
655 656
				return (0);
656
				break;
657 657
			default:
658 658
				(void) fprintf(stderr, "%s: %s\n", cmdName,
659 659
				    gettext("get extended properties failed"));
660
-- old/usr/src/cmd/sgs/elfedit/modules/common/cap.c	Sat Feb 18 20:27:08 2012
660
++ new/usr/src/cmd/sgs/elfedit/modules/common/cap.c	Sat Feb 18 20:27:07 2012
......
22 22
/*
23 23
 * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
24 24
 * Use is subject to license terms.
25
 * Copyright 2012 Milan Jurik. All rights reserved.
25 26
 */
26 27

  
27 28
#include	<ctype.h>
......
227 228
			argstate_add_str(argstate, TRUE);
228 229
			return (elfedit_offset_to_str(argstate->str.sec,
229 230
			    cap->c_un.c_val, ELFEDIT_MSG_ERR, 0));
230
			break;
231 231
		}
232 232

  
233 233
		if (cap->c_tag == CA_SUNW_NULL)
234
-- old/usr/src/cmd/svc/startd/fork.c	Sat Feb 18 20:27:09 2012
234
++ new/usr/src/cmd/svc/startd/fork.c	Sat Feb 18 20:27:08 2012
......
21 21
/*
22 22
 * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
23 23
 * Use is subject to license terms.
24
 * Copyright 2012 Milan Jurik. All rights reserved.
24 25
 */
25 26

  
26 27
/*
......
762 763
		fork_sulogin(B_FALSE, "Could not set state of "
763 764
		    "%s: %s\n", SCF_INSTANCE_EMI, strerror(r));
764 765
		goto retry;
765
		break;
766 766

  
767 767
	case EINVAL:
768 768
	default:
769
-- old/usr/src/cmd/syslogd/syslogd.c	Sat Feb 18 20:27:10 2012
769
++ new/usr/src/cmd/syslogd/syslogd.c	Sat Feb 18 20:27:09 2012
......
21 21
/*
22 22
 * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
23 23
 * Use is subject to license terms.
24
 * Copyright 2012 Milan Jurik. All rights reserved.
24 25
 */
25 26

  
26 27
/*
......
504 505
			close_door();
505 506
			delete_doorfiles();
506 507
			return (0);
507
			break;
508 508
		case SIGUSR1:			/* secret debug dump mode */
509 509
			/* if in debug mode, use stdout */
510 510

  
511
-- old/usr/src/cmd/zfs/zfs_main.c	Sat Feb 18 20:27:11 2012
511
++ new/usr/src/cmd/zfs/zfs_main.c	Sat Feb 18 20:27:10 2012
......
23 23
 * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
24 24
 * Copyright 2012 Nexenta Systems, Inc. All rights reserved.
25 25
 * Copyright (c) 2011 by Delphix. All rights reserved.
26
 * Copyright 2012 Milan Jurik. All rights reserved.
26 27
 */
27 28

  
28 29
#include <assert.h>
......
741 742
			(void) fprintf(stderr, gettext("missing size "
742 743
			    "argument\n"));
743 744
			goto badusage;
744
			break;
745 745
		case '?':
746 746
			(void) fprintf(stderr, gettext("invalid option '%c'\n"),
747 747
			    optopt);
748
-- old/usr/src/lib/auditd_plugins/syslog/systoken.c	Sat Feb 18 20:27:12 2012
748
++ new/usr/src/lib/auditd_plugins/syslog/systoken.c	Sat Feb 18 20:27:11 2012
......
21 21
/*
22 22
 * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
23 23
 * Use is subject to license terms.
24
 * Copyright 2012 Milan Jurik. All rights reserved.
24 25
 */
25 26

  
26 27

  
......
245 246
		break;
246 247
	default:
247 248
		return (-1);
248
		break;
249 249
	}
250 250
	return (0);
251 251
}
252
-- old/usr/src/lib/libc/amd64/unwind/call_frame_inst.c	Sat Feb 18 20:27:13 2012
252
++ new/usr/src/lib/libc/amd64/unwind/call_frame_inst.c	Sat Feb 18 20:27:12 2012
......
22 22
/*
23 23
 * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
24 24
 * Use is subject to license terms.
25
 * Copyright 2012 Milan Jurik. All rights reserved.
25 26
 */
26 27

  
27
#pragma ident	"%Z%%M%	%I%	%E% SMI"
28

  
29 28
/*
30 29
 * interface used by unwind support to query frame descriptor info
31 30
 */
......
373 372
		break;
374 373
	case ULEB128_FAC:
375 374
		return (daf * extractuleb(datap));
376
		break;
377 375
	case ULEB128:
378 376
		return (extractuleb(datap));
379
		break;
380 377
	case ULEB128_SREG:
381 378
		res = (uint64_t)(*((uint8_t *)data));
382 379
		data += 1;
......
449 446
		break;
450 447
	case SLEB128_FAC:
451 448
		return (daf * extractsleb(datap));
452
		break;
453 449
	case SLEB128:
454 450
		return (extractsleb(datap));
455
		break;
456 451
	case ZTSTRING:
457 452
		/* max length of augmentation string is 4 */
458 453
		rp = (char *)&res;
......
463 458
		break;
464 459
	case ADDR:
465 460
		return (get_encoded_val(datap, reloc, enc));
466
		break;
467 461
	case SIZE:
468 462
		return (get_encoded_val(datap, reloc, enc & 0x7));
469 463
	case BLOCK:
470
-- old/usr/src/lib/libc/amd64/unwind/unwind.c	Sat Feb 18 20:27:13 2012
464
++ new/usr/src/lib/libc/amd64/unwind/unwind.c	Sat Feb 18 20:27:13 2012
......
22 22
/*
23 23
 * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
24 24
 * Use is subject to license terms.
25
 * Copyright 2012 Milan Jurik. All rights reserved.
25 26
 */
26 27

  
27
#pragma ident	"%Z%%M%	%I%	%E% SMI"
28

  
29 28
/*
30 29
 * UNWIND - Unwind library
31 30
 */
......
313 312
			break;
314 313
		default:
315 314
			return (res);
316
			break;
317 315
		}
318 316
	} else {
319 317
		finish_capture(entry_ctx, 1);
......
419 417
			    exception_object->exception_class,
420 418
			    exception_object, ctx, stop_parameter);
421 419
			return (_URC_END_OF_STACK);
422
			break;
423 420
		default:
424 421
			again = 0;
425 422
			break;
426
-- old/usr/src/lib/libc/port/locale/engine.c	Sat Feb 18 20:27:14 2012
423
++ new/usr/src/lib/libc/port/locale/engine.c	Sat Feb 18 20:27:14 2012
......
1 1
/*
2 2
 * Copyright 2010 Nexenta Systems, Inc.  All rights reserved.
3
 * Copyright 2012 Milan Jurik. All rights reserved.
3 4
 * Copyright (c) 1992, 1993, 1994 Henry Spencer.
4 5
 * Copyright (c) 1992, 1993, 1994
5 6
 *	The Regents of the University of California.  All rights reserved.
......
607 608
			    (m->g->cflags&REG_NEWLINE))) {
608 609
				break;
609 610
			}
610
			else
611
				return (NULL);
612
			break;
611
			return (NULL);
613 612
		case OEOL:
614 613
			if ((sp == m->endp && !(m->eflags&REG_NOTEOL)) ||
615 614
			    (sp < m->endp && *sp == '\n' &&
616 615
			    (m->g->cflags&REG_NEWLINE))) {
617 616
				break;
618 617
			}
619
			else
620
				return (NULL);
621
			break;
618
			return (NULL);
622 619
		case OBOW:
623 620
			if (((sp == m->beginp && !(m->eflags&REG_NOTBOL)) ||
624 621
			    (sp < m->endp && *(sp-1) == '\n' &&
......
626 623
			    (sp > m->beginp && !ISWORD(*(sp-1)))) &&
627 624
			    (sp < m->endp && ISWORD(*sp))) {
628 625
				break;
629
			} else
630
				return (NULL);
631
			break;
626
			}
627
			return (NULL);
632 628
		case OEOW:
633 629
			if (((sp == m->endp && !(m->eflags&REG_NOTEOL)) ||
634 630
			    (sp < m->endp && *sp == '\n' &&
......
636 632
			    (sp < m->endp && !ISWORD(*sp))) &&
637 633
			    (sp > m->beginp && ISWORD(*(sp-1)))) {
638 634
				break;
639
			} else
640
				return (NULL);
641
			break;
635
			}
636
			return (NULL);
642 637
		case O_QUEST:
643 638
			break;
644 639
		case OOR1:	/* matches null but needs to skip */
......
683 678
		while (m->g->strip[ss] != SOP(O_BACK, i))
684 679
			ss++;
685 680
		return (backref(m, sp+len, stop, ss+1, stopst, lev, rec));
686
		break;
687 681
	case OQUEST_:		/* to null or not */
688 682
		dp = backref(m, sp, stop, ss+1, stopst, lev, rec);
689 683
		if (dp != NULL)
690 684
			return (dp);	/* not */
691 685
		return (backref(m, sp, stop, ss+OPND(s)+1, stopst, lev, rec));
692
		break;
693 686
	case OPLUS_:
694 687
		assert(m->lastpos != NULL);
695 688
		assert(lev+1 <= m->g->nplus);
696 689
		m->lastpos[lev+1] = sp;
697 690
		return (backref(m, sp, stop, ss+1, stopst, lev+1, rec));
698
		break;
699 691
	case O_PLUS:
700 692
		if (sp == m->lastpos[lev])	/* last pass matched null */
701 693
			return (backref(m, sp, stop, ss+1, stopst, lev-1, rec));
......
704 696
		dp = backref(m, sp, stop, ss-OPND(s)+1, stopst, lev, rec);
705 697
		if (dp == NULL)
706 698
			return (backref(m, sp, stop, ss+1, stopst, lev-1, rec));
707
		else
708
			return (dp);
709
		break;
699
		return (dp);
710 700
	case OCH_:		/* find the right one, if any */
711 701
		ssub = ss + 1;
712 702
		esub = ss + OPND(s) - 1;
......
727 717
			else
728 718
				assert(OP(m->g->strip[esub]) == O_CH);
729 719
		}
720
		/* NOTREACHED */
730 721
		break;
731 722
	case OLPAREN:		/* must undo assignment if rest fails */
732 723
		i = OPND(s);
......
738 729
			return (dp);
739 730
		m->pmatch[i].rm_so = offsave;
740 731
		return (NULL);
741
		break;
742 732
	case ORPAREN:		/* must undo assignment if rest fails */
743 733
		i = OPND(s);
744 734
		assert(0 < i && i <= m->g->nsub);
......
749 739
			return (dp);
750 740
		m->pmatch[i].rm_eo = offsave;
751 741
		return (NULL);
752
		break;
753 742
	default:		/* uh oh */
754 743
		assert(0);
755 744
		break;
756
-- old/usr/src/lib/libc/port/locale/regcomp.c	Sat Feb 18 20:27:15 2012
745
++ new/usr/src/lib/libc/port/locale/regcomp.c	Sat Feb 18 20:27:14 2012
......
1 1
/*
2 2
 * Copyright 2010 Nexenta Systems, Inc.  All rights reserved.
3
 * Copyright 2012 Milan Jurik. All rights reserved.
3 4
 * Copyright (c) 1992, 1993, 1994 Henry Spencer.
4 5
 * Copyright (c) 1992, 1993, 1994
5 6
 *	The Regents of the University of California.  All rights reserved.
......
733 734
	case '-':
734 735
		SETERROR(REG_ERANGE);
735 736
		return;			/* NOTE RETURN */
736
		break;
737 737
	default:
738 738
		c = '\0';
739 739
		break;
740
-- old/usr/src/lib/libcmdutils/common/process_xattrs.c	Sat Feb 18 20:27:16 2012
740
++ new/usr/src/lib/libcmdutils/common/process_xattrs.c	Sat Feb 18 20:27:15 2012
......
22 22
/*
23 23
 * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
24 24
 * Use is subject to license terms.
25
 * Copyright 2012 Milan Jurik. All rights reserved.
25 26
 */
26 27

  
27
#pragma ident	"%Z%%M%	%I%	%E% SMI"
28

  
29 28
#include "libcmdutils.h"
30 29

  
31 30

  
......
318 317
			case DATA_TYPE_NVLIST:
319 318
			default:
320 319
				return (response);
321
				break;
322 320
		}
323 321
	}
324 322
	if (response != NULL)
325
-- old/usr/src/lib/libcryptoutil/common/mechkeygen.c	Sat Feb 18 20:27:17 2012
323
++ new/usr/src/lib/libcryptoutil/common/mechkeygen.c	Sat Feb 18 20:27:16 2012
......
21 21
/*
22 22
 * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
23 23
 * Use is subject to license terms.
24
 * Copyright 2012 Milan Jurik. All rights reserved.
24 25
 */
25 26

  
26
#pragma ident	"%Z%%M%	%I%	%E% SMI"
27

  
28 27
#include <cryptoutil.h>
29 28

  
30 29
/*
......
355 354

  
356 355
	default:
357 356
		return (CKR_MECHANISM_INVALID);
358
		break;
359 357
	}
360 358

  
361 359
	return (CKR_OK);
362
-- old/usr/src/lib/libcryptoutil/common/pkcserror.c	Sat Feb 18 20:27:17 2012
360
++ new/usr/src/lib/libcryptoutil/common/pkcserror.c	Sat Feb 18 20:27:17 2012
......
22 22
/*
23 23
 * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
24 24
 * Use is subject to license terms.
25
 * Copyright 2012 Milan Jurik. All rights reserved.
25 26
 */
26 27

  
27
#pragma ident	"%Z%%M%	%I%	%E% SMI"
28

  
29 28
/*
30 29
 * Block comment which describes the contents of this file.
31 30
 */
......
46 45
	switch (rv) {
47 46
		case CKR_OK:
48 47
			return ("CKR_OK");
49
			break;
50 48
		case CKR_CANCEL:
51 49
			return ("CKR_CANCEL");
52
			break;
53 50
		case CKR_HOST_MEMORY:
54 51
			return ("CKR_HOST_MEMORY");
55
			break;
56 52
		case CKR_SLOT_ID_INVALID:
57 53
			return ("CKR_SLOT_ID_INVALID");
58
			break;
59 54
		case CKR_GENERAL_ERROR:
60 55
			return ("CKR_GENERAL_ERROR");
61
			break;
62 56
		case CKR_FUNCTION_FAILED:
63 57
			return ("CKR_FUNCTION_FAILED");
64
			break;
65 58
		case CKR_ARGUMENTS_BAD:
66 59
			return ("CKR_ARGUMENTS_BAD");
67
			break;
68 60
		case CKR_NO_EVENT:
69 61
			return ("CKR_NO_EVENT");
70
			break;
71 62
		case CKR_NEED_TO_CREATE_THREADS:
72 63
			return ("CKR_NEED_TO_CREATE_THREADS");
73
			break;
74 64
		case CKR_CANT_LOCK:
75 65
			return ("CKR_CANT_LOCK");
76
			break;
77 66
		case CKR_ATTRIBUTE_READ_ONLY:
78 67
			return ("CKR_ATTRIBUTE_READ_ONLY");
79
			break;
80 68
		case CKR_ATTRIBUTE_SENSITIVE:
81 69
			return ("CKR_ATTRIBUTE_SENSITIVE");
82
			break;
83 70
		case CKR_ATTRIBUTE_TYPE_INVALID:
84 71
			return ("CKR_ATTRIBUTE_TYPE_INVALID");
85
			break;
86 72
		case CKR_ATTRIBUTE_VALUE_INVALID:
87 73
			return ("CKR_ATTRIBUTE_VALUE_INVALID");
88
			break;
89 74
		case CKR_DATA_INVALID:
... This diff was truncated because it exceeds the maximum size that can be displayed.
    (1-1/1)