Deleted Added
full compact
hastd.c (218218) hastd.c (218370)
1/*-
2 * Copyright (c) 2009-2010 The FreeBSD Foundation
3 * Copyright (c) 2010-2011 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-2011 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/hastd.c 218218 2011-02-03 11:39:49Z pjd $");
32__FBSDID("$FreeBSD: head/sbin/hastd/hastd.c 218370 2011-02-06 12:21:29Z pjd $");
33
34#include <sys/param.h>
35#include <sys/linker.h>
36#include <sys/module.h>
37#include <sys/stat.h>
38#include <sys/wait.h>
39
40#include <err.h>

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

104 (res->hr_remotein == NULL &&
105 res->hr_remoteout == NULL));
106 continue;
107 }
108 if (tres->hr_remotein != NULL)
109 proto_close(tres->hr_remotein);
110 if (tres->hr_remoteout != NULL)
111 proto_close(tres->hr_remoteout);
33
34#include <sys/param.h>
35#include <sys/linker.h>
36#include <sys/module.h>
37#include <sys/stat.h>
38#include <sys/wait.h>
39
40#include <err.h>

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

104 (res->hr_remotein == NULL &&
105 res->hr_remoteout == NULL));
106 continue;
107 }
108 if (tres->hr_remotein != NULL)
109 proto_close(tres->hr_remotein);
110 if (tres->hr_remoteout != NULL)
111 proto_close(tres->hr_remoteout);
112 if (tres->hr_ctrl != NULL)
113 proto_close(tres->hr_ctrl);
114 if (tres->hr_event != NULL)
115 proto_close(tres->hr_event);
116 if (tres->hr_conn != NULL)
117 proto_close(tres->hr_conn);
112 }
113 if (cfg->hc_controlin != NULL)
114 proto_close(cfg->hc_controlin);
115 proto_close(cfg->hc_controlconn);
116 proto_close(cfg->hc_listenconn);
117 (void)pidfile_close(pfh);
118 hook_fini();
119 pjdlog_fini();

--- 960 unchanged lines hidden ---
118 }
119 if (cfg->hc_controlin != NULL)
120 proto_close(cfg->hc_controlin);
121 proto_close(cfg->hc_controlconn);
122 proto_close(cfg->hc_listenconn);
123 (void)pidfile_close(pfh);
124 hook_fini();
125 pjdlog_fini();

--- 960 unchanged lines hidden ---