Deleted Added
full compact
secondary.c (212051) secondary.c (212899)
1/*-
2 * Copyright (c) 2009-2010 The FreeBSD Foundation
3 * Copyright (c) 2010 Pawel Jakub Dawidek <pjd@FreeBSD.org>
4 * All rights reserved.
5 *
6 * This software was developed by Pawel Jakub Dawidek under sponsorship from
7 * the FreeBSD Foundation.
8 *

--- 15 unchanged lines hidden (view full) ---

24 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
25 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
26 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
28 * SUCH DAMAGE.
29 */
30
31#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2009-2010 The FreeBSD Foundation
3 * Copyright (c) 2010 Pawel Jakub Dawidek <pjd@FreeBSD.org>
4 * All rights reserved.
5 *
6 * This software was developed by Pawel Jakub Dawidek under sponsorship from
7 * the FreeBSD Foundation.
8 *

--- 15 unchanged lines hidden (view full) ---

24 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
25 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
26 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
28 * SUCH DAMAGE.
29 */
30
31#include <sys/cdefs.h>
32__FBSDID("$FreeBSD: head/sbin/hastd/secondary.c 212051 2010-08-31 12:03:29Z pjd $");
32__FBSDID("$FreeBSD: head/sbin/hastd/secondary.c 212899 2010-09-20 13:23:43Z pjd $");
33
34#include <sys/param.h>
35#include <sys/time.h>
36#include <sys/bio.h>
37#include <sys/disk.h>
38#include <sys/stat.h>
39
40#include <assert.h>

--- 473 unchanged lines hidden (view full) ---

514 hio->hio_error = EINVAL;
515 goto end;
516 }
517 hio->hio_error = 0;
518end:
519 return (hio->hio_error);
520}
521
33
34#include <sys/param.h>
35#include <sys/time.h>
36#include <sys/bio.h>
37#include <sys/disk.h>
38#include <sys/stat.h>
39
40#include <assert.h>

--- 473 unchanged lines hidden (view full) ---

514 hio->hio_error = EINVAL;
515 goto end;
516 }
517 hio->hio_error = 0;
518end:
519 return (hio->hio_error);
520}
521
522static void
522static __dead2 void
523secondary_exit(int exitcode, const char *fmt, ...)
524{
525 va_list ap;
526
527 assert(exitcode != EX_OK);
528 va_start(ap, fmt);
529 pjdlogv_errno(LOG_ERR, fmt, ap);
530 va_end(ap);

--- 208 unchanged lines hidden ---
523secondary_exit(int exitcode, const char *fmt, ...)
524{
525 va_list ap;
526
527 assert(exitcode != EX_OK);
528 va_start(ap, fmt);
529 pjdlogv_errno(LOG_ERR, fmt, ap);
530 va_end(ap);

--- 208 unchanged lines hidden ---