mostly whitespace fixes from OpenBSD via Brad

svn:r192

diff --git a/event.c b/event.c
index 0d6de870f31db6c5633d07b7b349275f48c4dd07..4c8aeed3b82fb5c9e47206d471bd25e933cb40f5 100644 (file)
--- a/event.c
+++ b/event.c
@@ -24,7 +24,9 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #ifdef WIN32
 #define WIN32_LEAN_AND_MEAN

diff --git a/poll.c b/poll.c
index da35b20afab6d5c96c464697dfec450eaadfc9e9..437b94a29e3fe0e4a17dabf7756f6f560c05cf1b 100644 (file)
--- a/poll.c
+++ b/poll.c
@@ -93,7 +93,7 @@ poll_init(void)
        if (getenv("EVENT_NOPOLL"))
                return (NULL);
 
-        if (!(pollop = calloc(1, sizeof(struct pollop))))
+       if (!(pollop = calloc(1, sizeof(struct pollop))))
                return (NULL);
 
        evsignal_init(&pollop->evsigmask);

diff --git a/signal.c b/signal.c
index 978b7ba2f3ac9eb66e7afa4d1c538933986045fc..8a6963b166a200928e279752f8a39b2fe39ad1af 100644 (file)
--- a/signal.c
+++ b/signal.c
@@ -26,7 +26,9 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #include <sys/types.h>
 #ifdef HAVE_SYS_TIME_H
@@ -110,12 +112,12 @@ int
 evsignal_add(sigset_t *evsigmask, struct event *ev)
 {
        int evsignal;
-       
+
        if (ev->ev_events & (EV_READ|EV_WRITE))
                event_errx(1, "%s: EV_SIGNAL incompatible use", __func__);
        evsignal = EVENT_SIGNAL(ev);
        sigaddset(evsigmask, evsignal);
-       
+
        return (0);
 }
 
@@ -153,7 +155,7 @@ evsignal_recalc(sigset_t *evsigmask)
 {
        struct sigaction sa;
        struct event *ev;
-       
+
        if (!ev_signal_added) {
                ev_signal_added = 1;
                event_add(&ev_signal, NULL);
@@ -165,13 +167,13 @@ evsignal_recalc(sigset_t *evsigmask)
 
        if (sigprocmask(SIG_BLOCK, evsigmask, NULL) == -1)
                return (-1);
-       
+
        /* Reinstall our signal handler. */
        memset(&sa, 0, sizeof(sa));
        sa.sa_handler = evsignal_handler;
        sa.sa_mask = *evsigmask;
        sa.sa_flags |= SA_RESTART;
-       
+
        TAILQ_FOREACH(ev, &signalqueue, ev_signal_next) {
                if (sigaction(EVENT_SIGNAL(ev), &sa, NULL) == -1)
                        return (-1);