Deleted Added
full compact
main.c (133211) main.c (142810)
1/*
2 * Copyright (c) 2001-2003
3 * Fraunhofer Institute for Open Communication Systems (FhG Fokus).
4 * All rights reserved.
5 *
6 * Author: Harti Brandt <harti@freebsd.org>
7 *
8 * Redistribution and use in source and binary forms, with or without

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

21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
1/*
2 * Copyright (c) 2001-2003
3 * Fraunhofer Institute for Open Communication Systems (FhG Fokus).
4 * All rights reserved.
5 *
6 * Author: Harti Brandt <harti@freebsd.org>
7 *
8 * Redistribution and use in source and binary forms, with or without

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

21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * $Begemot: bsnmp/snmpd/main.c,v 1.89 2004/08/06 08:47:11 brandt Exp $
29 * $Begemot: bsnmp/snmpd/main.c,v 1.90 2005/02/25 11:50:03 brandt_h Exp $
30 *
31 * SNMPd main stuff.
32 */
33#include <sys/param.h>
34#include <sys/un.h>
35#include <sys/ucred.h>
36#include <stdio.h>
37#include <stdlib.h>

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

607fd_resume(void *p)
608{
609 struct fdesc *f = p;
610 int err;
611
612#ifdef USE_LIBBEGEMOT
613 if (f->id >= 0)
614 return (0);
30 *
31 * SNMPd main stuff.
32 */
33#include <sys/param.h>
34#include <sys/un.h>
35#include <sys/ucred.h>
36#include <stdio.h>
37#include <stdlib.h>

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

607fd_resume(void *p)
608{
609 struct fdesc *f = p;
610 int err;
611
612#ifdef USE_LIBBEGEMOT
613 if (f->id >= 0)
614 return (0);
615 if ((f->fd = poll_register(f->fd, input, f, POLL_IN)) < 0) {
615 if ((f->id = poll_register(f->fd, input, f, POLL_IN)) < 0) {
616 err = errno;
617 syslog(LOG_ERR, "select fd %d: %m", f->fd);
618 errno = err;
619 return (-1);
620 }
621#else
622 if (evTestID(f->id))
623 return (0);

--- 1649 unchanged lines hidden ---
616 err = errno;
617 syslog(LOG_ERR, "select fd %d: %m", f->fd);
618 errno = err;
619 return (-1);
620 }
621#else
622 if (evTestID(f->id))
623 return (0);

--- 1649 unchanged lines hidden ---