Attachment #99477 for bug #138557

View | Details | Raw Unified | Return to bug 138557
Collapse All | Expand All




	tmp_w1 = NULL;
	tmp_w2 = NULL;
	if (witness_watch < 1) {
		error = SYSCTL_OUT(req, w_notrunning, strlen(w_notrunning) + 1);
		return (error);
	}
	if (witness_cold) {
		error = SYSCTL_OUT(req, w_stillcold, strlen(w_stillcold) + 1);
		return (error);
	}
	error = 0;

	int error;

	if (witness_watch < 1) {
		error = SYSCTL_OUT(req, w_notrunning, strlen(w_notrunning) + 1);
		return (error);
	}
	if (witness_cold) {
		error = SYSCTL_OUT(req, w_stillcold, strlen(w_stillcold) + 1);
		return (error);
	}
	error = 0;

Return to bug 138557

Lines 2378-2388 Link Here

(-)subr_witness.c (-4 / +4 lines)
2378	tmp_w1 = NULL;	2378	tmp_w1 = NULL;
2379	tmp_w2 = NULL;	2379	tmp_w2 = NULL;
2380	if (witness_watch < 1) {	2380	if (witness_watch < 1) {
2381	error = SYSCTL_OUT(req, w_notrunning, sizeof(w_notrunning));	2381	error = SYSCTL_OUT(req, w_notrunning, strlen(w_notrunning) + 1);
2382	return (error);	2382	return (error);
2383	}	2383	}
2384	if (witness_cold) {	2384	if (witness_cold) {
2385	error = SYSCTL_OUT(req, w_stillcold, sizeof(w_stillcold));	2385	error = SYSCTL_OUT(req, w_stillcold, strlen(w_stillcold) + 1);
2386	return (error);	2386	return (error);
2387	}	2387	}
2388	error = 0;	2388	error = 0;
Lines 2530-2540 Link Here
2530	int error;	2530	int error;
2531		2531
2532	if (witness_watch < 1) {	2532	if (witness_watch < 1) {
2533	error = SYSCTL_OUT(req, w_notrunning, sizeof(w_notrunning));	2533	error = SYSCTL_OUT(req, w_notrunning, strlen(w_notrunning) + 1);
2534	return (error);	2534	return (error);
2535	}	2535	}
2536	if (witness_cold) {	2536	if (witness_cold) {
2537	error = SYSCTL_OUT(req, w_stillcold, sizeof(w_stillcold));	2537	error = SYSCTL_OUT(req, w_stillcold, strlen(w_stillcold) + 1);
2538	return (error);	2538	return (error);
2539	}	2539	}
2540	error = 0;	2540	error = 0;