Module Name: src
Committed By: htodd
Date: Wed Jul 23 05:00:39 UTC 2014
Modified Files:
src/lib/libnpf: npf.c
src/usr.sbin/npf/npfctl: npfctl.c
Log Message:
Build fix (use error when defined).
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/lib/libnpf/npf.c
cvs rdiff -u -r1.41 -r1.42 src/usr.sbin/npf/npfctl/npfctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libnpf/npf.c
diff -u src/lib/libnpf/npf.c:1.30 src/lib/libnpf/npf.c:1.31
--- src/lib/libnpf/npf.c:1.30 Wed Jul 23 01:25:34 2014
+++ src/lib/libnpf/npf.c Wed Jul 23 05:00:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: npf.c,v 1.30 2014/07/23 01:25:34 rmind Exp $ */
+/* $NetBSD: npf.c,v 1.31 2014/07/23 05:00:38 htodd Exp $ */
/*-
* Copyright (c) 2010-2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf.c,v 1.30 2014/07/23 01:25:34 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf.c,v 1.31 2014/07/23 05:00:38 htodd Exp $");
#include <sys/types.h>
#include <netinet/in_systm.h>
@@ -227,7 +227,7 @@ npf_config_export(const nl_config_t *ncf
if (!prop_dictionary_externalize_to_file(npf_dict, path)) {
error = errno;
}
- return 0;
+ return error;
}
nl_config_t *
Index: src/usr.sbin/npf/npfctl/npfctl.c
diff -u src/usr.sbin/npf/npfctl/npfctl.c:1.41 src/usr.sbin/npf/npfctl/npfctl.c:1.42
--- src/usr.sbin/npf/npfctl/npfctl.c:1.41 Wed Jul 23 01:25:34 2014
+++ src/usr.sbin/npf/npfctl/npfctl.c Wed Jul 23 05:00:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: npfctl.c,v 1.41 2014/07/23 01:25:34 rmind Exp $ */
+/* $NetBSD: npfctl.c,v 1.42 2014/07/23 05:00:38 htodd Exp $ */
/*-
* Copyright (c) 2009-2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: npfctl.c,v 1.41 2014/07/23 01:25:34 rmind Exp $");
+__RCSID("$NetBSD: npfctl.c,v 1.42 2014/07/23 05:00:38 htodd Exp $");
#include <sys/ioctl.h>
#include <sys/stat.h>
@@ -493,7 +493,7 @@ npfctl_save(int fd)
}
error = npf_config_export(ncf, NPF_DB_PATH);
npf_config_destroy(ncf);
- return 0;
+ return error;
}
static int
