Project

General

Profile

Bug #5218 » il_5218.patch

Richard PALO, 2014-12-14 10:44 PM

View differences:

new/usr/src/cmd/avs/sdbc/scmadm.c Sun Dec 14 23:31:12 2014
125 125
void
126 126
sdbc_report_error(spcs_s_info_t *ustatus)
127 127
{
128
	if (*ustatus != NULL) {
128
	if (*ustatus != (uintptr_t)NULL) {
129 129
		spcs_s_report(*ustatus, stderr);
130 130
		spcs_s_ufree(ustatus);
131 131
	} else
132
-- old/usr/src/cmd/bart/compare.c	Sun Dec 14 23:31:13 2014
132
++ new/usr/src/cmd/bart/compare.c	Sun Dec 14 23:31:13 2014
......
246 246

  
247 247
	/* Reset these fields... */
248 248

  
249
	*contents = NULL;
249
	*contents = '\0';
250 250
	*devnode = '\0';
251 251
	*dest = '\0';
252 252

  
253
-- old/usr/src/cmd/bnu/getprm.c	Sun Dec 14 23:31:13 2014
253
++ new/usr/src/cmd/bnu/getprm.c	Sun Dec 14 23:31:13 2014
......
235 235
	    if (cl != (cr = wcsrchr(n, (wchar_t)'!'))) {
236 236
		/*  more than one ! */
237 237
		wcsncpy(tmpbuf, cl+1, cr-cl-1);
238
		tmpbuf[cr-cl-1] = NULL;
238
		tmpbuf[cr-cl-1] = L'\0';
239 239
		(void) wcstombs(fwd, tmpbuf, MAXFULLNAME);
240 240
	    }
241 241
	} else {
242
-- old/usr/src/cmd/bnu/gio.c	Sun Dec 14 23:31:13 2014
242
++ new/usr/src/cmd/bnu/gio.c	Sun Dec 14 23:31:13 2014
......
72 72
	if (Debug > 4)
73 73
		pkdebug = 1;
74 74
	Pk = pkopen(Ifn, Ofn);
75
	if ((int) Pk == NULL)
75
	if ( Pk == NULL)
76 76
		return(FAIL);
77 77
	return(0);
78 78
}
79
-- old/usr/src/cmd/bnu/interface.c	Sun Dec 14 23:31:14 2014
79
++ new/usr/src/cmd/bnu/interface.c	Sun Dec 14 23:31:14 2014
......
302 302
	}
303 303

  
304 304
	if (info.tsdu <= 0 || nbytes <= info.tsdu)
305
		return (t_snd(fd, buf, nbytes, NULL));
305
		return (t_snd(fd, buf, nbytes, 0));
306 306

  
307 307
	/* if get here, then there is a limit on transmit size	*/
308 308
	/* (info.tsdu > 0) and buf exceeds it			*/
309 309
	i = ret = 0;
310 310
	while (nbytes >= info.tsdu) {
311
		if ((ret = t_snd(fd,  &buf[i], info.tsdu, NULL)) != info.tsdu)
311
		if ((ret = t_snd(fd,  &buf[i], info.tsdu, 0)) != info.tsdu)
312 312
			return ((ret >= 0 ? (i + ret) : ret));
313 313
		i += info.tsdu;
314 314
		nbytes -= info.tsdu;
315 315
	}
316 316
	if (nbytes != 0) {
317
		if ((ret = t_snd(fd,  &buf[i], nbytes, NULL)) != nbytes)
317
		if ((ret = t_snd(fd,  &buf[i], nbytes, 0)) != nbytes)
318 318
			return ((ssize_t)(ret >= 0 ? (i + ret) : ret));
319 319
		i += nbytes;
320 320
	}
321
-- old/usr/src/cmd/bnu/sysfiles.c	Sun Dec 14 23:31:14 2014
321
++ new/usr/src/cmd/bnu/sysfiles.c	Sun Dec 14 23:31:14 2014
......
480 480

  
481 481
	ASSERT(len >= BUFSIZ, "BUFFER TOO SMALL", "getsysline", 0);
482 482
	for(;;) {
483
		while (getaline(fsystems, buf) != NULL)
483
		while (getaline(fsystems, buf) != 0)
484 484
		    if ((*buf != '#') && (*buf != ' ') &&
485 485
			(*buf != '\t') && (*buf != '\n')) {
486 486
			(void) _uu_resetlocale(LC_ALL, prev);
487
-- old/usr/src/cmd/bnu/uudecode.c	Sun Dec 14 23:31:14 2014
487
++ new/usr/src/cmd/bnu/uudecode.c	Sun Dec 14 23:31:14 2014
......
356 356
		while ((fgets(inbuf, sizeof (inbuf), in)) != NULL) {
357 357
			/* process an input line */
358 358
			iptr = inbuf;
359
			while ((curchr = *(iptr++)) != NULL) {
359
			while ((curchr = *(iptr++)) != '\0') {
360 360
				/* decode chars */
361 361
				if (curchr == '=') /* if end */
362 362
					endseen++;
363
-- old/usr/src/cmd/chmod/chmod.c	Sun Dec 14 23:31:15 2014
363
++ new/usr/src/cmd/chmod/chmod.c	Sun Dec 14 23:31:15 2014
......
553 553
	/* process the arguments */
554 554

  
555 555
	for (i = mac = 0;
556
	    (av[i] != (char *)NULL) && (av[i][0] != (char)NULL);
556
	    (av[i] != NULL) && (av[i][0] != '\0');
557 557
	    i++) {
558 558
		if (!fflag && av[i][0] == '-') {
559 559
			/*
560
-- old/usr/src/cmd/cmd-crypto/tpmadm/admin_cmds.c	Sun Dec 14 23:31:15 2014
560
++ new/usr/src/cmd/cmd-crypto/tpmadm/admin_cmds.c	Sun Dec 14 23:31:15 2014
......
661 661
	    sizeof (well_known), well_known))
662 662
		return (ERR_FAIL);
663 663

  
664
	ret = Tspi_TPM_TakeOwnership(hTPM, hKeySRK, NULL);
664
	ret = Tspi_TPM_TakeOwnership(hTPM, hKeySRK, (TSS_HKEY)NULL);
665 665
	if (ret == TPM_E_NO_ENDORSEMENT) {
666 666
		if (createek(hContext, hTPM))
667 667
			return (ERR_FAIL);
668
		ret = Tspi_TPM_TakeOwnership(hTPM, hKeySRK, NULL);
668
		ret = Tspi_TPM_TakeOwnership(hTPM, hKeySRK, (TSS_HKEY)NULL);
669 669
	}
670 670
	if (ret) {
671 671
		print_error(ret, gettext("Take ownership"));
......
701 701
	    gettext("= New TPM owner passphrase ="), 0, NULL))
702 702
		return (ERR_FAIL);
703 703

  
704
	ret = Tspi_ChangeAuth(hTPM, NULL, hNewPolicy);
704
	ret = Tspi_ChangeAuth(hTPM, (TSS_HOBJECT)NULL, hNewPolicy);
705 705
	if (ret && ret != TSP_ERROR(TSS_E_POLICY_NO_SECRET)) {
706 706
		print_error(ret, gettext("Change authorization"));
707 707
		return (ERR_FAIL);
708
-- old/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ikeadm.c	Sun Dec 14 23:31:15 2014
708
++ new/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ikeadm.c	Sun Dec 14 23:31:15 2014
......
732 732
	{SADB_X_IDENTTYPE_ADDR_RANGE,	"rangev4"},
733 733
	{SADB_X_IDENTTYPE_ADDR_RANGE,	"rangev6"},
734 734
	{SADB_X_IDENTTYPE_KEY_ID,	"keyid"},
735
	{NULL,	0}
735
	{0, NULL}
736 736
};
737 737

  
738 738
static int
......
900 900
	{PSFLD_REMIDTYPE,	"remoteidtype"},
901 901
	{PSFLD_MODE,		"ike_mode"},
902 902
	{PSFLD_KEY,		"key"},
903
	{NULL,	0}
903
	{0, NULL}
904 904
};
905 905

  
906 906
static int
......
926 926
	{IKE_XCHG_IDENTITY_PROTECT,	"main"},
927 927
	{IKE_XCHG_AGGRESSIVE,		"aggressive"},
928 928
	{IKE_XCHG_IP_AND_AGGR,		"both"},
929
	{NULL,	0}
929
	{0, NULL}
930 930
};
931 931

  
932 932
static int
......
3345 3345
	case IKE_SVC_DUMP_AUTHALGS:
3346 3346
	case IKE_SVC_DUMP_PS:
3347 3347
	case IKE_SVC_DUMP_CERTCACHE:
3348
		if (argc != NULL) {
3348
		if (argc != 0) {
3349 3349
			print_dump_help();
3350 3350
			break;
3351 3351
		}
3352
-- old/usr/src/cmd/fm/modules/common/fabric-xlate/fx_fabric.c	Sun Dec 14 23:31:16 2014
3352
++ new/usr/src/cmd/fm/modules/common/fabric-xlate/fx_fabric.c	Sun Dec 14 23:31:16 2014
......
50 50
	PCI_MA,			PCI_STAT_R_MAST_AB,	NULL,
51 51
	PCI_REC_TA,		PCI_STAT_R_TARG_AB,	NULL,
52 52
	PCI_SIG_TA,		PCI_STAT_S_TARG_AB,	NULL,
53
	NULL, NULL, NULL
53
	NULL, 0 , NULL
54 54
};
55 55

  
56 56
/* Translate Fabric ereports to ereport.io.pci.sec-* */
......
63 63
#endif
64 64
	PCI_REC_TA,		PCI_STAT_R_TARG_AB,	NULL,
65 65
	PCI_SIG_TA,		PCI_STAT_S_TARG_AB,	NULL,
66
	NULL, NULL, NULL, NULL,
66
	NULL, 0 , NULL
67 67
};
68 68

  
69 69

  
70 70
/* Translate Fabric ereports to ereport.io.pci.dto */
71 71
static fab_erpt_tbl_t fab_pci_bdg_ctl_erpt_tbl[] = {
72 72
	PCI_DTO,	PCI_BCNF_BCNTRL_DTO_STAT,	NULL,
73
	NULL, NULL, NULL
73
	NULL, 0, NULL
74 74
};
75 75

  
76 76
/* Translate Fabric ereports to ereport.io.pciex.* */
......
81 81
	PCIEX_BDP,	PCIE_AER_CE_BAD_DLLP,		NULL,
82 82
	PCIEX_BTP,	PCIE_AER_CE_BAD_TLP,		NULL,
83 83
	PCIEX_ANFE,	PCIE_AER_CE_AD_NFE,		NULL,
84
	NULL, NULL, NULL
84
	NULL, 0, NULL
85 85
};
86 86

  
87 87
/*
......
104 104
	PCIEX_UR,	PCIE_AER_UCE_UR,		PCI_TARG_MA,
105 105
#endif
106 106
	PCIEX_POIS,	PCIE_AER_UCE_PTLP,		PCI_TARG_MDPE,
107
	NULL, NULL, NULL
107
	NULL, 0, NULL
108 108
};
109 109

  
110 110
/* Translate Fabric ereports to ereport.io.pciex.* */
......
124 124
	PCIEX_S_PERR,	PCIE_AER_SUCE_PERR_ASSERT,	PCI_TARG_MDPE,
125 125
	PCIEX_S_SERR,	PCIE_AER_SUCE_SERR_ASSERT,	NULL,
126 126
	PCIEX_INTERR,	PCIE_AER_SUCE_INTERNAL_ERR,	NULL,
127
	NULL, NULL, NULL
127
	NULL, 0, NULL
128 128
};
129 129

  
130 130
/* Translate Fabric ereports to ereport.io.pcix.* */
......
132 132
	PCIX_SPL_DIS,		PCI_PCIX_SPL_DSCD,	NULL,
133 133
	PCIX_UNEX_SPL,		PCI_PCIX_UNEX_SPL,	NULL,
134 134
	PCIX_RX_SPL_MSG,	PCI_PCIX_RX_SPL_MSG,	NULL,
135
	NULL, NULL, NULL
135
	NULL, 0, NULL
136 136
};
137 137
static fab_erpt_tbl_t *fab_pcix_bdg_erpt_tbl = fab_pcix_erpt_tbl;
138 138

  
......
142 142
	PCIX_UNEX_SPL,		PCI_PCIX_BSS_UNEX_SPL,	NULL,
143 143
	PCIX_BSS_SPL_OR,	PCI_PCIX_BSS_SPL_OR,	NULL,
144 144
	PCIX_BSS_SPL_DLY,	PCI_PCIX_BSS_SPL_DLY,	NULL,
145
	NULL, NULL, NULL
145
	NULL, 0, NULL
146 146
};
147 147

  
148 148
/* Translate Fabric ereports to ereport.io.pciex.* */
......
153 153
	PCIEX_FAT,		PCIE_DEVSTS_FE_DETECTED,	NULL,
154 154
	PCIEX_NONFAT,		PCIE_DEVSTS_NFE_DETECTED,	NULL,
155 155
	PCIEX_CORR,		PCIE_DEVSTS_CE_DETECTED,	NULL,
156
	NULL, NULL, NULL
156
	NULL, 0, NULL
157 157
};
158 158

  
159 159
/* Translate Fabric ereports to ereport.io.pciex.* */
......
163 163
	PCIEX_RC_CE_MSG,	PCIE_AER_RE_STS_CE_RCVD,	NULL,
164 164
	PCIEX_RC_MCE_MSG,	PCIE_AER_RE_STS_MUL_CE_RCVD,	NULL,
165 165
	PCIEX_RC_MUE_MSG,	PCIE_AER_RE_STS_MUL_FE_NFE_RCVD, NULL,
166
	NULL, NULL, NULL
166
	NULL, 0, NULL
167 167
};
168 168

  
169 169
/*
......
175 175
	PCIEX_RC_FE_MSG,	PCIE_DEVSTS_FE_DETECTED,	NULL,
176 176
	PCIEX_RC_NFE_MSG,	PCIE_DEVSTS_NFE_DETECTED,	NULL,
177 177
	PCIEX_RC_CE_MSG,	PCIE_DEVSTS_CE_DETECTED,	NULL,
178
	NULL, NULL, NULL,
178
	NULL, 0, NULL
179 179
};
180 180

  
181 181
/* ARGSUSED */
182
-- old/usr/src/cmd/lp/cmd/lpsched/fncs.c	Sun Dec 14 23:31:16 2014
182
++ new/usr/src/cmd/lp/cmd/lpsched/fncs.c	Sun Dec 14 23:31:16 2014
......
898 898
	} else if (req->file_list)
899 899
		strlcpy(buf, *req->file_list, sizeof (buf));
900 900
	
901
	if (*buf == NULL || !strncmp(buf, SPOOLDIR, sizeof(SPOOLDIR)-1))
901
	if (*buf == '\0' || !strncmp(buf, SPOOLDIR, sizeof(SPOOLDIR)-1))
902 902
		strcpy(buf, "<File name not available>");
903 903

  
904 904
	if (strlen(buf) > (size_t) 24) {
905
-- old/usr/src/cmd/lvm/rpc.mdcommd/mdmn_commd_server.c	Sun Dec 14 23:31:17 2014
905
++ new/usr/src/cmd/lvm/rpc.mdcommd/mdmn_commd_server.c	Sun Dec 14 23:31:17 2014
......
234 234
	commd_err.md_message = (uint64_t)(uintptr_t)&msg_buf[0];
235 235

  
236 236
	(void) metaioctl(MD_MN_COMMD_ERR, &commd_err, &mne, "rpc.mdcommd");
237
	(void) uadmin(A_DUMP, AD_BOOT, NULL);
237
	(void) uadmin(A_DUMP, AD_BOOT, (uintptr_t)NULL);
238 238
}
239 239

  
240 240
static void
241
-- old/usr/src/cmd/mdb/common/mdb/mdb_termio.c	Sun Dec 14 23:31:17 2014
241
++ new/usr/src/cmd/mdb/common/mdb/mdb_termio.c	Sun Dec 14 23:31:17 2014
......
350 350
	{ "cnorm", TIO_ATTR_STR, &termio_info.ti_cnorm },
351 351
	{ "nel", TIO_ATTR_STR, &termio_info.ti_nel },
352 352
	{ "cr", TIO_ATTR_STR, &termio_info.ti_cr },
353
	{ NULL, NULL, NULL }
353
	{ NULL, 0, NULL }
354 354
};
355 355

  
356 356
/*
357
-- old/usr/src/cmd/mdb/common/modules/genunix/sysevent.c	Sun Dec 14 23:31:18 2014
357
++ new/usr/src/cmd/mdb/common/modules/genunix/sysevent.c	Sun Dec 14 23:31:18 2014
......
181 181
int
182 182
sysevent_subclass_list_walk_init(mdb_walk_state_t *wsp)
183 183
{
184
	if (wsp->walk_addr == NULL) {
184
	if (wsp->walk_addr == (uintptr_t)NULL) {
185 185
		mdb_warn("sysevent_subclass_list does not support global "
186 186
		    "walks");
187 187
		return (WALK_ERR);
......
196 196
{
197 197
	int status;
198 198

  
199
	if (wsp->walk_addr == NULL)
199
	if (wsp->walk_addr == (uintptr_t)NULL)
200 200
		return (WALK_DONE);
201 201

  
202 202
	if (mdb_vread(wsp->walk_data, sizeof (subclass_lst_t),
......
230 230
{
231 231
	class_walk_data_t *cl_walker;
232 232

  
233
	if (wsp->walk_addr == NULL) {
233
	if (wsp->walk_addr == (uintptr_t)NULL) {
234 234
		mdb_warn("sysevent_class_list does not support global walks");
235 235
		return (WALK_ERR);
236 236
	}
......
259 259
	cl_walker = (class_walk_data_t *)wsp->walk_data;
260 260

  
261 261
	/* Skip over empty class table entries */
262
	if (wsp->walk_addr != NULL) {
262
	if (wsp->walk_addr != (uintptr_t)NULL) {
263 263
		if (mdb_vread(&clist, sizeof (class_lst_t),
264 264
		    wsp->walk_addr) == -1) {
265 265
			mdb_warn("failed to read class list at %p",
266
-- old/usr/src/cmd/mdb/common/modules/usba/usb.c	Sun Dec 14 23:31:18 2014
266
++ new/usr/src/cmd/mdb/common/modules/usba/usb.c	Sun Dec 14 23:31:18 2014
......
98 98
	usba_device2devinfo_cbdata_t	*cb_data =
99 99
			    (usba_device2devinfo_cbdata_t *)cb_arg;
100 100

  
101
	if ((cur_usb_dev = mdb_usba_get_usba_device(dip_addr)) == NULL) {
101
	if ((cur_usb_dev = mdb_usba_get_usba_device(dip_addr)) == (uintptr_t)NULL) {
102 102
		/*
103 103
		 * If there's no corresponding usba_device_t, this dip isn't
104 104
		 * a usb node.  Might be an sd node.  Ignore it.
......
182 182
usba_list_walk_init(mdb_walk_state_t *wsp)
183 183
{
184 184
	/* Must have a start addr.  */
185
	if (wsp->walk_addr == NULL) {
185
	if (wsp->walk_addr == (uintptr_t)NULL) {
186 186
		mdb_warn("not a global walk.  Starting address required\n");
187 187

  
188 188
		return (WALK_ERR);
......
215 215
	wsp->walk_addr = (uintptr_t)list_entry.next;
216 216

  
217 217
	/* Check if we're at the last element */
218
	if (wsp->walk_addr == NULL) {
218
	if (wsp->walk_addr == (uintptr_t)NULL) {
219 219

  
220 220
		return (WALK_DONE);
221 221
	}
......
237 237
int
238 238
usb_pipe_handle_walk_init(mdb_walk_state_t *wsp)
239 239
{
240
	if (wsp->walk_addr == NULL) {
240
	if (wsp->walk_addr == (uintptr_t)NULL) {
241 241
		mdb_warn("not a global walk; usba_device_t required\n");
242 242

  
243 243
		return (WALK_ERR);
......
403 403
{
404 404
	usba_list_entry_t	list_entry;
405 405

  
406
	if (wsp->walk_addr != NULL) {
406
	if (wsp->walk_addr != (uintptr_t)NULL) {
407 407
		mdb_warn(
408 408
		    "global walk only.  Must be invoked without an address\n");
409 409

  
......
437 437
	char		pathname[MAXNAMELEN];
438 438
	char		dname[MODMAXNAMELEN + 1] = "<unatt>"; /* Driver name */
439 439
	char		drv_statep[MODMAXNAMELEN+ 10];
440
	uint_t		usb_flag  = NULL;
440
	uint_t		usb_flag  = 0;
441 441
	boolean_t	no_driver_attached = FALSE;
442 442
	uintptr_t	dip_addr;
443 443
	struct dev_info	devinfo;
......
509 509

  
510 510
	if (usb_flag & USB_DUMP_VERBOSE) {
511 511
		int		i;
512
		uintptr_t	statep = NULL;
512
		uintptr_t	statep = (uintptr_t)NULL;
513 513
		char		*string_descr;
514 514
		char		**config_cloud, **conf_str_descr;
515 515
		usb_dev_descr_t	usb_dev_descr;
......
717 717
	}
718 718
	local_debug_buf[debug_buf_size - 1] = '\0';
719 719

  
720
	if (strlen(local_debug_buf) == NULL) {
720
	if (strlen(local_debug_buf) == 0) {
721 721

  
722 722
		return (DCMD_OK);
723 723
	}
724
-- old/usr/src/cmd/picl/plugins/common/piclevent/picl_slm.c	Sun Dec 14 23:31:18 2014
724
++ new/usr/src/cmd/picl/plugins/common/piclevent/picl_slm.c	Sun Dec 14 23:31:18 2014
......
344 344
		return (EAGAIN);
345 345
	}
346 346

  
347
	if (nvlist_alloc(&nvl, NV_UNIQUE_NAME_TYPE, NULL)) {
347
	if (nvlist_alloc(&nvl, NV_UNIQUE_NAME_TYPE, 0)) {
348 348
		free(ename);
349 349
		sysevent_free(dupev);
350 350
		return (EAGAIN);
......
371 371
	if (nvlist_add_string(nvl, PICLEVENTARG_EVENT_NAME, ename) ||
372 372
	    nvlist_add_string(nvl, PICLEVENTARG_DATA_TYPE,
373 373
	    PICLEVENTARG_PICLEVENT_DATA) ||
374
	    nvlist_pack(nvl, &pack_buf, &nvl_size, NV_ENCODE_NATIVE, NULL)) {
374
	    nvlist_pack(nvl, &pack_buf, &nvl_size, NV_ENCODE_NATIVE, 0)) {
375 375
		free(ename);
376 376
		nvlist_free(nvl);
377 377
		sysevent_free(dupev);
......
402 402
	(void) mutex_init(&nvq_lock, USYNC_THREAD, NULL);
403 403
	(void) cond_init(&nvq_cv, USYNC_THREAD, NULL);
404 404

  
405
	if (thr_create(NULL, NULL, piclslm_deliver_thr,
405
	if (thr_create(NULL, 0, piclslm_deliver_thr,
406 406
	    NULL, THR_BOUND, &piclslm_deliver_thr_id) != 0) {
407 407
		(void) mutex_destroy(&nvq_lock);
408 408
		(void) cond_destroy(&nvq_cv);
409
-- old/usr/src/cmd/powertop/common/powertop.c	Sun Dec 14 23:31:19 2014
409
++ new/usr/src/cmd/powertop/common/powertop.c	Sun Dec 14 23:31:19 2014
......
149 149
			g_gui = B_FALSE;
150 150
			dump_count = (int)strtod(optarg, &endptr);
151 151

  
152
			if (dump_count <= 0 || *endptr != NULL) {
152
			if (dump_count <= 0 || *endptr != '\0') {
153 153
				pt_usage();
154 154
				exit(EXIT_USAGE);
155 155
			}
......
165 165
			interval = interval_usr = (double)strtod(optarg,
166 166
			    &endptr);
167 167

  
168
			if (*endptr != NULL || interval < 1 ||
168
			if (*endptr != '\0' || interval < 1 ||
169 169
			    interval > INTERVAL_MAX) {
170 170
				pt_usage();
171 171
				exit(EXIT_USAGE);
172
-- old/usr/src/cmd/powertop/common/suggestions.c	Sun Dec 14 23:31:19 2014
172
++ new/usr/src/cmd/powertop/common/suggestions.c	Sun Dec 14 23:31:19 2014
......
268 268
pt_sugg_as_root(void)
269 269
{
270 270
	pt_sugg_add("Suggestion: run as root to get suggestions"
271
	    " for reducing system power consumption",  40, NULL, NULL,
271
	    " for reducing system power consumption",  40, '\0', NULL,
272 272
	    NULL);
273 273
}
274
-- old/usr/src/cmd/svc/svcs/svcs.c	Sun Dec 14 23:31:19 2014
274
++ new/usr/src/cmd/svc/svcs/svcs.c	Sun Dec 14 23:31:19 2014
......
553 553
	int r;
554 554

  
555 555
	r = inst_get_single_val(inst, SCF_PG_RESTARTER, pname, SCF_TYPE_TIME,
556
	    tvp, NULL, ok_if_empty ? EMPTY_OK : 0, 0, 1);
556
	    tvp, 0, ok_if_empty ? EMPTY_OK : 0, 0, 1);
557 557

  
558 558
	return (r == 0 ? 0 : -1);
559 559
}
......
1650 1650
		    SCF_PROPERTY_STATE_TIMESTAMP, &tv, 0);
1651 1651
	} else {
1652 1652
		r = pg_get_single_val(wip->pg, SCF_PROPERTY_STATE_TIMESTAMP,
1653
		    SCF_TYPE_TIME, &tv, NULL, 0);
1653
		    SCF_TYPE_TIME, &tv, 0, 0);
1654 1654
	}
1655 1655

  
1656 1656
	if (r != 0) {
......
1702 1702
		    SCF_PROPERTY_STATE_TIMESTAMP, &tv, 0);
1703 1703
	else
1704 1704
		r = pg_get_single_val(wip->pg, SCF_PROPERTY_STATE_TIMESTAMP,
1705
		    SCF_TYPE_TIME, &tv, NULL, 0);
1705
		    SCF_TYPE_TIME, &tv, 0, 0);
1706 1706

  
1707 1707
	if (r == 0) {
1708 1708
		int64_t sec;
......
2514 2514
			    gettext("next_state"), buf);
2515 2515

  
2516 2516
		if (pg_get_single_val(rpg, SCF_PROPERTY_STATE_TIMESTAMP,
2517
		    SCF_TYPE_TIME, &tv, NULL, 0) == 0) {
2517
		    SCF_TYPE_TIME, &tv, 0, 0) == 0) {
2518 2518
			stime = tv.tv_sec;
2519 2519
			tmp = localtime(&stime);
2520 2520
			for (tbsz = 50; ; tbsz *= 2) {
2521
-- old/usr/src/cmd/syseventd/modules/devfsadmd_mod/devfsadmd_mod.c	Sun Dec 14 23:31:20 2014
2521
++ new/usr/src/cmd/syseventd/modules/devfsadmd_mod/devfsadmd_mod.c	Sun Dec 14 23:31:20 2014
......
333 333
	(void) mutex_init(&evq_lock, USYNC_THREAD, NULL);
334 334
	(void) cond_init(&evq_cv, USYNC_THREAD, NULL);
335 335

  
336
	if (thr_create(NULL, NULL, (void *(*)(void *))devfsadmd_deliver_thr,
336
	if (thr_create(NULL, 0, (void *(*)(void *))devfsadmd_deliver_thr,
337 337
	    NULL, THR_BOUND, &deliver_thr_id) != 0) {
338 338
		(void) mutex_destroy(&evq_lock);
339 339
		(void) cond_destroy(&evq_cv);
340
-- old/usr/src/cmd/syseventd/modules/sysevent_reg_mod/sysevent_reg_mod.c	Sun Dec 14 23:31:20 2014
340
++ new/usr/src/cmd/syseventd/modules/sysevent_reg_mod/sysevent_reg_mod.c	Sun Dec 14 23:31:20 2014
......
232 232
	(void) mutex_init(&evq_lock, USYNC_THREAD, NULL);
233 233
	(void) cond_init(&evq_cv, USYNC_THREAD, NULL);
234 234

  
235
	if (thr_create(NULL, NULL, (void *(*)(void *))subscriber_deliver_thr,
235
	if (thr_create(NULL, 0, (void *(*)(void *))subscriber_deliver_thr,
236 236
	    NULL, 0, &deliver_thr_id) != 0) {
237 237
		syseventd_err_print(INIT_SUB_THR_CREATE_ERR, strerror(errno));
238 238
		return (NULL);
239
-- old/usr/src/cmd/tar/tar.c	Sun Dec 14 23:31:20 2014
239
++ new/usr/src/cmd/tar/tar.c	Sun Dec 14 23:31:20 2014
......
2646 2646
convtoreg(off_t size)
2647 2647
{
2648 2648
	if ((size > 0) && (dblock.dbuf.typeflag != '0') &&
2649
	    (dblock.dbuf.typeflag != NULL) && (dblock.dbuf.typeflag != '1') &&
2649
	    (dblock.dbuf.typeflag != '\0') && (dblock.dbuf.typeflag != '1') &&
2650 2650
	    (dblock.dbuf.typeflag != '2') && (dblock.dbuf.typeflag != '3') &&
2651 2651
	    (dblock.dbuf.typeflag != '4') && (dblock.dbuf.typeflag != '5') &&
2652 2652
	    (dblock.dbuf.typeflag != '6') && (dblock.dbuf.typeflag != 'A') &&
......
3159 3159
					(void) unlink(namep);
3160 3160
			}
3161 3161
			linkp = templink;
3162
			if (*linkp !=  NULL) {
3162
			if (*linkp !=  '\0') {
3163 3163
				if (Aflag && *linkp == '/')
3164 3164
					linkp++;
3165 3165
				if (link(linkp, namep) < 0) {
......
3200 3200
					(void) unlink(namep);
3201 3201
			}
3202 3202
			linkp = templink;
3203
			if (*linkp != NULL) {
3203
			if (*linkp != '\0') {
3204 3204
				if (Aflag && *linkp == '/')
3205 3205
					linkp++;
3206 3206
				if (link(linkp, namep) < 0) {
......
3249 3249
					(void) unlink(namep);
3250 3250
			}
3251 3251
			linkp = templink;
3252
			if (*linkp != NULL) {
3252
			if (*linkp != '\0') {
3253 3253
				if (Aflag && *linkp == '/')
3254 3254
					linkp++;
3255 3255
				if (link(linkp, namep) < 0) {
......
3389 3389
			}
3390 3390
		}
3391 3391
		if (dblock.dbuf.typeflag == '0' ||
3392
		    dblock.dbuf.typeflag == NULL || convflag) {
3392
		    dblock.dbuf.typeflag == '\0' || convflag) {
3393 3393
			delete_target(dirfd, comp, namep);
3394 3394
			linkp = templink;
3395
			if (*linkp != NULL) {
3395
			if (*linkp != '\0') {
3396 3396
				if (Aflag && *linkp == '/')
3397 3397
					linkp++;
3398 3398
				if (link(linkp, comp) < 0) {
......
3598 3598

  
3599 3599
		if (pflag && newfile == TRUE && !dir &&
3600 3600
		    (dblock.dbuf.typeflag == '0' ||
3601
		    dblock.dbuf.typeflag == NULL ||
3601
		    dblock.dbuf.typeflag == '\0' ||
3602 3602
		    convflag || dblock.dbuf.typeflag == '1')) {
3603 3603
			if (fstat(ofile, &xtractbuf) == -1)
3604 3604
				(void) fprintf(stderr, gettext(
......
5485 5485

  
5486 5486
	(void) strcpy(name, str);
5487 5487
	while (name[strlen(name) - 1] == '/') {
5488
		name[strlen(name) - 1] = NULL;
5488
		name[strlen(name) - 1] = '\0';
5489 5489
	}
5490 5490

  
5491 5491
	h = hash(name);
......
5523 5523

  
5524 5524
	(void) strcpy(name, str);
5525 5525
	while (name[strlen(name) - 1] == '/') {
5526
		name[strlen(name) - 1] = NULL;
5526
		name[strlen(name) - 1] = '\0';
5527 5527
	}
5528 5528

  
5529 5529
	/*
......
5542 5542
	 * check for any parent directories in the file list
5543 5543
	 */
5544 5544
	while ((ptr = strrchr(name, '/'))) {
5545
		*ptr = NULL;
5545
		*ptr = '\0';
5546 5546
		h = hash(name);
5547 5547
		exp = table[h];
5548 5548
		while (exp != NULL) {
......
6615 6615
					(void) unlinkat(fd, comp, 0);
6616 6616
				} else if ((n = readlink(namep, buf,
6617 6617
				    PATH_MAX)) != -1) {
6618
					buf[n] = (char)NULL;
6618
					buf[n] = '\0';
6619 6619
					(void) unlinkat(fd, buf,
6620 6620
					    AT_REMOVEDIR);
6621 6621
					if (errno == ENOTDIR)
6622
-- old/usr/src/cmd/tnf/tnfxtract/tnfxtract.c	Sun Dec 14 23:31:22 2014
6622
++ new/usr/src/cmd/tnf/tnfxtract/tnfxtract.c	Sun Dec 14 23:31:22 2014
......
128 128
			"kvm_read error in %s\n"), dumpfile);
129 129
		exit(1);
130 130
	}
131
	if (dump_bufaddr == NULL || tnf_bufsize == 0) {
131
	if (dump_bufaddr == (uintptr_t)NULL || tnf_bufsize == 0) {
132 132
		(void) fprintf(stderr, gettext(
133 133
			"No trace data available in the kernel.\n"));
134 134
		exit(1);
135
-- old/usr/src/head/iso/stddef_iso.h	Sun Dec 14 23:31:22 2014
135
++ new/usr/src/head/iso/stddef_iso.h	Sun Dec 14 23:31:22 2014
......
29 29
 */
30 30

  
31 31
/*
32
 * Copyright 2014 PALO, Richard.
33
 */
34

  
35
/*
32 36
 * An application should not include this header directly.  Instead it
33 37
 * should be included only through the inclusion of other Sun headers.
34 38
 *
......
43 47
#ifndef _ISO_STDDEF_ISO_H
44 48
#define	_ISO_STDDEF_ISO_H
45 49

  
46
#pragma ident	"%Z%%M%	%I%	%E% SMI" /* SVr4.0 1.5 */
47

  
48 50
#include <sys/isa_defs.h>
51
#include <sys/null.h>
49 52

  
50 53
#ifdef	__cplusplus
51 54
extern "C" {
......
55 58
namespace std {
56 59
#endif
57 60

  
58
#ifndef	NULL
59
#if defined(_LP64)
60
#define	NULL    0L
61
#else
62
#define	NULL    0
63
#endif
64
#endif
65

  
66 61
#if !defined(_PTRDIFF_T) || __cplusplus >= 199711L
67 62
#define	_PTRDIFF_T
68 63
#if defined(_LP64) || defined(_I32LPx)
69
-- old/usr/src/head/unistd.h	Sun Dec 14 23:31:22 2014
64
++ new/usr/src/head/unistd.h	Sun Dec 14 23:31:22 2014
......
31 31

  
32 32
/* Copyright (c) 2013, OmniTI Computer Consulting, Inc. All rights reserved. */
33 33

  
34
/*
35
 * Copyright 2014 PALO, Richard.
36
 */
37

  
34 38
#ifndef _UNISTD_H
35 39
#define	_UNISTD_H
36 40

  
37 41
#include <sys/feature_tests.h>
38 42

  
43
#include <sys/null.h>
39 44
#include <sys/types.h>
40 45
#include <sys/unistd.h>
41 46

  
......
178 183
#define	_POSIX_VDISABLE		0
179 184
#endif
180 185

  
181
#ifndef NULL
182
#if defined(_LP64)
183
#define	NULL	0L
184
#else
185
#define	NULL	0
186
#endif
187
#endif
188

  
189 186
#define	STDIN_FILENO	0
190 187
#define	STDOUT_FILENO	1
191 188
#define	STDERR_FILENO	2
192
-- old/usr/src/lib/cfgadm_plugins/pci/common/cfga.c	Sun Dec 14 23:31:23 2014
189
++ new/usr/src/lib/cfgadm_plugins/pci/common/cfga.c	Sun Dec 14 23:31:23 2014
......
1083 1083
				if ((strncmp(str, func_strs[MODE], len) == 0) &&
1084 1084
				    (*(str+(len)) == '=')) {
1085 1085
				    for (str = (str+(++len)), i = 0;
1086
					*str != NULL; i++, str++) {
1086
					*str != '\0'; i++, str++) {
1087 1087
						buf[i] = *str;
1088 1088

  
1089 1089
				    }
......
1281 1281
	if ((root_node = di_init("/", DINFOCPYALL|DINFOPATH))
1282 1282
		== DI_NODE_NIL) {
1283 1283
		DBG(1, ("di_init() failed\n"));
1284
		return (NULL);
1284
		return (0);
1285 1285
	}
1286 1286

  
1287 1287
	slotarg->devpath = (char *)devcomp;
......
1289 1289
	if ((slotarg->promp = di_prom_init()) == DI_PROM_HANDLE_NIL) {
1290 1290
		DBG(1, ("di_prom_init() failed\n"));
1291 1291
		di_fini(root_node);
1292
		return (NULL);
1292
		return (0);
1293 1293
	}
1294 1294

  
1295 1295
	(void) di_walk_minor(root_node, "ddi_ctl:attachment_point:pci",
1296
-- old/usr/src/lib/cfgadm_plugins/shp/common/shp.c	Sun Dec 14 23:31:23 2014
1296
++ new/usr/src/lib/cfgadm_plugins/shp/common/shp.c	Sun Dec 14 23:31:23 2014
......
953 953
				if ((strncmp(str, func_strs[MODE], len) == 0) &&
954 954
				    (*(str+(len)) == '=')) {
955 955
					for (str = (str+(++len)), i = 0;
956
					    *str != NULL; i++, str++) {
956
					    *str != '\0'; i++, str++) {
957 957
						buf[i] = *str;
958 958
					}
959 959
				}
960
-- old/usr/src/lib/fm/topo/modules/i86pc/chip/chip_intel.c	Sun Dec 14 23:31:23 2014
960
++ new/usr/src/lib/fm/topo/modules/i86pc/chip/chip_intel.c	Sun Dec 14 23:31:23 2014
......
429 429
		}
430 430
	}
431 431

  
432
	return (NULL);
432
	return (0);
433 433
}
434 434

  
435 435
int
......
451 451

  
452 452
		free(buf);
453 453
		(void) close(mc_fd);
454
		return (NULL);
454
		return (0);
455 455
	}
456 456
	(void) close(mc_fd);
457 457
	(void) nvlist_unpack(buf, mcs.mcs_size, &nvl, 0);
......
460 460
	if (nvlist_lookup_uint8(nvl, MCINTEL_NVLIST_VERSTR, &ver) != 0) {
461 461
		whinge(mod, NULL, "mc nvlist is not versioned\n");
462 462
		nvlist_free(nvl);
463
		return (NULL);
463
		return (0);
464 464
	} else if (ver != MCINTEL_NVLIST_VERS0) {
465 465
		whinge(mod, NULL, "mc nvlist version mismatch\n");
466 466
		nvlist_free(nvl);
467
		return (NULL);
467
		return (0);
468 468
	}
469 469

  
470 470
	rc = mc_nb_create(mod, chip_smbid, pnode, name, auth, nvl);
471
-- old/usr/src/lib/gss_mechs/mech_krb5/crypto/des/afsstring2key.c	Sun Dec 14 23:31:24 2014
471
++ new/usr/src/lib/gss_mechs/mech_krb5/crypto/des/afsstring2key.c	Sun Dec 14 23:31:24 2014
......
382 382
	for(i=0; i<66; i++)
383 383
		block[i] = 0;
384 384
	/* Solaris Kerberos */
385
	for(i=0; ((c= *pw) != NULL) && i<64; pw++){
385
	for(i=0; ((c= *pw) != 0) && i<64; pw++){
386 386
		for(j=0; j<7; j++, i++)
387 387
			block[i] = (c>>(6-j)) & 01;
388 388
		i++;
389
-- old/usr/src/lib/gss_mechs/mech_krb5/krb5/krb/vfy_increds.c	Sun Dec 14 23:31:24 2014
389
++ new/usr/src/lib/gss_mechs/mech_krb5/krb5/krb/vfy_increds.c	Sun Dec 14 23:31:24 2014
......
19 19

  
20 20
   flags = 0;				/* turns off OPENCLOSE mode */
21 21
   /* Solaris Kerberos */
22
   if ((code = krb5_cc_set_flags(context, incc, flags)) != NULL)
22
   if ((code = krb5_cc_set_flags(context, incc, flags)) != 0)
23 23
      return(code);
24 24
   /* Solaris Kerberos */
25
   if ((code = krb5_cc_set_flags(context, outcc, flags)) != NULL)
25
   if ((code = krb5_cc_set_flags(context, outcc, flags)) != 0)
26 26
      return(code);
27 27

  
28 28
   /* Solaris Kerberos */
29
   if ((code = krb5_cc_start_seq_get(context, incc, &cur)) != NULL)
29
   if ((code = krb5_cc_start_seq_get(context, incc, &cur)) != 0)
30 30
      goto cleanup;
31 31

  
32 32
   /* Solaris Kerberos */
33
   while ((code = krb5_cc_next_cred(context, incc, &cur, &creds)) == NULL) {
33
   while ((code = krb5_cc_next_cred(context, incc, &cur, &creds)) == 0) {
34 34
      if (krb5_principal_compare(context, princ, creds.server))
35 35
	 continue;
36 36

  
......
165 165
      if ((ret = krb5_cc_resolve(context, "MEMORY:rd_req", &ccache)))
166 166
	 goto cleanup;
167 167
      /* Solaris Kerberos */
168
      if ((ret = krb5_cc_initialize(context, ccache, creds->client)) != NULL)
168
      if ((ret = krb5_cc_initialize(context, ccache, creds->client)) != 0)
169 169
	 goto cleanup;
170 170

  
171 171
      /* Solaris Kerberos */
172
      if ((ret = krb5_cc_store_cred(context, ccache, creds)) != NULL)
172
      if ((ret = krb5_cc_store_cred(context, ccache, creds)) != 0)
173 173
	 goto cleanup;
174 174

  
175 175
      /* set up for get_creds */
......
212 212
	   retcc = NULL;
213 213

  
214 214
	   /* Solaris Kerberos */
215
	   if (((ret = krb5_cc_resolve(context, "MEMORY:rd_req2", &retcc)) != NULL) ||
216
	       ((ret = krb5_cc_initialize(context, retcc, creds->client)) != NULL) ||
215
	   if (((ret = krb5_cc_resolve(context, "MEMORY:rd_req2", &retcc)) != 0) ||
216
	       ((ret = krb5_cc_initialize(context, retcc, creds->client)) != 0) ||
217 217
	       ((ret = krb5_cc_copy_creds_except(context, ccache, retcc,
218
						creds->server)) != NULL)) {
218
						creds->server)) != 0)) {
219 219
	       /* Solaris Kerberos */
220 220
	       if (retcc)
221 221
		   (void) krb5_cc_destroy(context, retcc);
222
-- old/usr/src/lib/libc/port/gen/getopt.c	Sun Dec 14 23:31:24 2014
222
++ new/usr/src/lib/libc/port/gen/getopt.c	Sun Dec 14 23:31:24 2014
......
199 199
		if (optind >= argc || argv[optind][0] != '-' ||
200 200
		    argv[optind] == NULL || argv[optind][1] == '\0')
201 201
			return (EOF);
202
		else if (strcmp(argv[optind], "--") == NULL) {
202
		else if (strcmp(argv[optind], "--") == 0) {
203 203
			optind++;
204 204
			return (EOF);
205 205
		}
206
-- old/usr/src/lib/libdtrace/common/dt_handle.c	Sun Dec 14 23:31:25 2014
206
++ new/usr/src/lib/libdtrace/common/dt_handle.c	Sun Dec 14 23:31:25 2014
......
247 247
	err.dteda_action = -1;
248 248
	err.dteda_offset = -1;
249 249
	err.dteda_fault = DTRACEFLT_LIBRARY;
250
	err.dteda_addr = NULL;
250
	err.dteda_addr = 0L;
251 251

  
252 252
	len = strlen(faultstr) +
253 253
	    strlen(errpd->dtpd_provider) + strlen(errpd->dtpd_mod) +
254
-- old/usr/src/lib/libscf/common/midlevel.c	Sun Dec 14 23:31:25 2014
254
++ new/usr/src/lib/libscf/common/midlevel.c	Sun Dec 14 23:31:25 2014
......
1342 1342
	}
1343 1343

  
1344 1344
	if (scf_handle_decode_fmri(ret->h, fmri, NULL, NULL, ret->inst,
1345
	    NULL, NULL, NULL) == -1) {
1345
	    NULL, NULL, 0) == -1) {
1346 1346
		goto out;
1347 1347
	}
1348 1348

  
1349
-- old/usr/src/lib/libtnfctl/elf.c	Sun Dec 14 23:31:25 2014
1349
++ new/usr/src/lib/libtnfctl/elf.c	Sun Dec 14 23:31:25 2014
......
87 87
	Elf3264_Dyn	*dynam_tab = NULL;
88 88
	long		dynam_tab_size;
89 89

  
90
	*entaddr_p = NULL;
90
	*entaddr_p = (uintptr_t)NULL;
91 91

  
92 92
	prbstat = prb_mainobj_get(hndl->proc_p, &objfd, &baseaddr);
93 93
	if (prbstat)
94
-- old/usr/src/lib/libumem/common/misc.c	Sun Dec 14 23:31:26 2014
94
++ new/usr/src/lib/libumem/common/misc.c	Sun Dec 14 23:31:26 2014
......
244 244
	int result;
245 245
	Dl_info sym_info;
246 246

  
247
	uintptr_t end = NULL;
247
	uintptr_t end = (uintptr_t)NULL;
248 248

  
249 249
	Sym *ext_info = NULL;
250 250

  
251
-- old/usr/src/pkg/manifests/system-header.mf	Sun Dec 14 23:31:26 2014
251
++ new/usr/src/pkg/manifests/system-header.mf	Sun Dec 14 23:31:26 2014
......
1261 1261
file path=usr/include/sys/netstack.h
1262 1262
file path=usr/include/sys/nexusdefs.h
1263 1263
file path=usr/include/sys/note.h
1264
file path=usr/include/sys/null.h
1264 1265
file path=usr/include/sys/nvpair.h
1265 1266
file path=usr/include/sys/nvpair_impl.h
1266 1267
file path=usr/include/sys/objfs.h
1267
-- old/usr/src/uts/common/gssapi/mechs/krb5/crypto/cksumtypes.c	Sun Dec 14 23:31:26 2014
1268
++ new/usr/src/uts/common/gssapi/mechs/krb5/crypto/cksumtypes.c	Sun Dec 14 23:31:26 2014
......
38 38
const struct krb5_cksumtypes krb5_cksumtypes_list[] = {
39 39
    { CKSUMTYPE_CRC32, KRB5_CKSUMFLAG_NOT_COLL_PROOF,
40 40
      "crc32", "CRC-32",
41
      NULL, NULL, &krb5int_hash_crc32, 0,
41
      0, NULL, &krb5int_hash_crc32, 0,
42 42
#ifdef _KERNEL
43 43
      NULL,
44 44
      CRYPTO_MECH_INVALID
......
48 48
    { CKSUMTYPE_DESCBC, 0,
49 49
      "des-cbc", "DES cbc mode",
50 50
      ENCTYPE_DES_CBC_CRC, &krb5int_keyhash_descbc,
51
      NULL,  NULL,
51
      NULL, 0,
52 52
#ifdef _KERNEL
53 53
      NULL,
54 54
      CRYPTO_MECH_INVALID
......
57 57

  
58 58
    { CKSUMTYPE_RSA_MD5, 0,
59 59
      "md5", "RSA-MD5",
60
      NULL, NULL, &krb5int_hash_md5, 0,
60
      0, NULL, &krb5int_hash_md5, 0,
61 61
#ifdef _KERNEL
62 62
      SUN_CKM_MD5,
63 63
      CRYPTO_MECH_INVALID
......
66 66
    { CKSUMTYPE_RSA_MD5_DES, 0,
67 67
      "md5-des", "RSA-MD5 with DES cbc mode",
68 68
      ENCTYPE_DES_CBC_CRC, &krb5int_keyhash_md5des,
69
      NULL, NULL,
69
      NULL, 0,
70 70
#ifdef _KERNEL
71 71
      SUN_CKM_MD5,
72 72
      CRYPTO_MECH_INVALID
......
75 75

  
76 76
    { CKSUMTYPE_NIST_SHA, 0,
77 77
      "sha", "NIST-SHA",
78
      NULL, NULL, &krb5int_hash_sha1, 0,
78
      0, NULL, &krb5int_hash_sha1, 0,
79 79
#ifdef _KERNEL
80 80
      SUN_CKM_SHA1,
81 81
      CRYPTO_MECH_INVALID
......
84 84

  
85 85
    { CKSUMTYPE_HMAC_SHA1_DES3, KRB5_CKSUMFLAG_DERIVE,
86 86
      "hmac-sha1-des3", "HMAC-SHA1 DES3 key",
87
      NULL, NULL, &krb5int_hash_sha1, 0,
87
      0, NULL, &krb5int_hash_sha1, 0,
88 88
#ifdef _KERNEL
89 89
      SUN_CKM_SHA1_HMAC,
90 90
      CRYPTO_MECH_INVALID
......
92 92
 },
93 93
    { CKSUMTYPE_HMAC_SHA1_DES3, KRB5_CKSUMFLAG_DERIVE,
94 94
      "hmac-sha1-des3-kd", "HMAC-SHA1 DES3 key", /* alias */
95
      NULL, NULL, &krb5int_hash_sha1, 0,
95
      0, NULL, &krb5int_hash_sha1, 0,
96 96
#ifdef _KERNEL
97 97
      SUN_CKM_SHA1_HMAC,
98 98
      CRYPTO_MECH_INVALID
......
128 128

  
129 129
    { CKSUMTYPE_HMAC_SHA1_96_AES128, KRB5_CKSUMFLAG_DERIVE,
130 130
      "hmac-sha1-96-aes128", "HMAC-SHA1 AES128 key",
131
	NULL, NULL, &krb5int_hash_sha1, 12,
131
       0, NULL, &krb5int_hash_sha1, 12,
132 132
#ifdef _KERNEL
133 133
      SUN_CKM_SHA1_HMAC,
134 134
      CRYPTO_MECH_INVALID
......
136 136
    },
137 137
    { CKSUMTYPE_HMAC_SHA1_96_AES256, KRB5_CKSUMFLAG_DERIVE,
138 138
      "hmac-sha1-96-aes256", "HMAC-SHA1 AES256 key",
139
	0, NULL, &krb5int_hash_sha1, 12,
139
       0, NULL, &krb5int_hash_sha1, 12,
140 140
#ifdef _KERNEL
141 141
      SUN_CKM_SHA1_HMAC,
142 142
      CRYPTO_MECH_INVALID
143
-- old/usr/src/uts/common/gssapi/mechs/krb5/crypto/etypes.c	Sun Dec 14 23:31:27 2014
143
++ new/usr/src/uts/common/gssapi/mechs/krb5/crypto/etypes.c	Sun Dec 14 23:31:27 2014
......
101 101
    { ENCTYPE_DES_CBC_RAW,
102 102
      "des-cbc-raw", "DES cbc mode raw",
103 103
      &krb5int_enc_des, NULL,
104
      krb5_raw_encrypt_length, krb5_raw_encrypt, krb5_raw_decrypt,
105
      NULL,
104
      krb5_raw_encrypt_length, krb5_raw_encrypt, krb5_raw_decrypt, 0,
106 105
#ifndef _KERNEL
107 106
      krb5int_des_string_to_key,
108 107
#else
......
116 115
    { ENCTYPE_DES3_CBC_RAW,
117 116
      "des3-cbc-raw", "Triple DES cbc mode raw",
118 117
      &krb5int_enc_des3, NULL,
119
      krb5_raw_encrypt_length, krb5_raw_encrypt, krb5_raw_decrypt,
120
      NULL,
118
      krb5_raw_encrypt_length, krb5_raw_encrypt, krb5_raw_decrypt, 0,
121 119
#ifndef _KERNEL
122 120
      krb5int_dk_string_to_key,
123 121
#else
......
191 189
    { ENCTYPE_DES_HMAC_SHA1,
192 190
      "des-hmac-sha1", "DES with HMAC/sha1",
193 191
      &krb5int_enc_des, &krb5int_hash_sha1,
194
      krb5_dk_encrypt_length, krb5_dk_encrypt, krb5_dk_decrypt,
195
      NULL,
192
      krb5_dk_encrypt_length, krb5_dk_encrypt, krb5_dk_decrypt, 0,
196 193
#ifndef _KERNEL
197 194
      krb5int_dk_string_to_key,
198 195
#else
199
-- old/usr/src/uts/common/sys/Makefile	Sun Dec 14 23:31:27 2014
196
++ new/usr/src/uts/common/sys/Makefile	Sun Dec 14 23:31:27 2014
......
409 409
	netstack.h		\
410 410
	nexusdefs.h		\
411 411
	note.h			\
412
	null.h			\
412 413
	nvpair.h		\
413 414
	nvpair_impl.h		\
414 415
	objfs.h			\
415
-- /dev/null	Sun Dec 14 23:31:27 2014
416
++ new/usr/src/uts/common/sys/null.h	Sun Dec 14 23:31:27 2014
......
1
/*
2
 * CDDL HEADER START
3
 *
4
 * The contents of this file are subject to the terms of the
5
 * Common Development and Distribution License (the "License").
6
 * You may not use this file except in compliance with the License.
7
 *
8
 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
9
 * or http://www.opensolaris.org/os/licensing.
10
 * See the License for the specific language governing permissions
11
 * and limitations under the License.
12
 *
13
 * When distributing Covered Code, include this CDDL HEADER in each
14
 * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
15
 * If applicable, add the following below this CDDL HEADER, with the
16
 * fields enclosed by brackets "[]" replaced with your own identifying
17
 * information: Portions Copyright [yyyy] [name of copyright owner]
18
 *
19
 * CDDL HEADER END
20
 */
21

  
22
/*
23
 * Copyright (c) 2003 Marcel Moolenaar.  All rights reserved.
24
 * Copyright 2014 PALO, Richard.
25
 */
26

  
27
#ifndef _SYS_NULL_H
28
#define	_SYS_NULL_H
29

  
30
#ifndef	NULL
31

  
32
#if !defined(__cplusplus)
33
#define	NULL    ((void *)0)
34
#else
35
#if __cplusplus >= 201103L
36
#define	NULL    nullptr
37
#elif defined(__GNUG__) && defined(__GNUC__) && __GNUC__ >= 4
38
#define	NULL    __null
39
#else
40
#if defined(_LP64)
41
#define	NULL    (0L)
42
#else
43
#define	NULL    0
44
#endif	/* _LP64 */
45
#endif	/* __GNUG__ */
46
#endif	/* !__cplusplus */
47

  
48
#endif
49

  
50
#endif	/* _SYS_NULL_H */
(2-2/2)