From patchwork Wed Feb 10 20:39:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Marples X-Patchwork-Id: 581611 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 98E7C14031D for ; Thu, 11 Feb 2016 07:39:50 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aTbY4-0001De-C5; Wed, 10 Feb 2016 20:39:40 +0000 Received: from uberserver.marples.name ([77.75.106.61] helo=mail.marples.name) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aTbY2-0000yD-Jf for hostap@lists.infradead.org; Wed, 10 Feb 2016 20:39:39 +0000 Received: from [IPv6:2a01:348:31:2:d514:d51a:4528:29b6] (unknown [IPv6:2a01:348:31:2:d514:d51a:4528:29b6]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.marples.name (Postfix) with ESMTPSA id 14F90A10ED for ; Wed, 10 Feb 2016 20:39:15 +0000 (GMT) To: hostap@lists.infradead.org From: Roy Marples Subject: [PATCH] kqueue: Use 0 instead of NULL for udata X-Enigmail-Draft-Status: N1110 Message-ID: <56BB9FF2.4070801@marples.name> Date: Wed, 10 Feb 2016 20:39:14 +0000 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160210_123939_070978_150DD1A0 X-CRM114-Status: UNSURE ( 3.63 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.1 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.2 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org commit 2d826aee8c68edb6335befd44ef23ba4b7e7c5c1 Author: Roy Marples Date: Wed Feb 10 20:32:10 2016 +0000 Use 0 for udata instead of NULL for portability. NetBSD uses uintptr_t, others a pointer. Signed-off-by: Roy Marples diff --git a/src/utils/eloop.c b/src/utils/eloop.c index 831da12..436bc8c 100644 --- a/src/utils/eloop.c +++ b/src/utils/eloop.c @@ -239,7 +239,7 @@ static int eloop_sock_queue(int sock, eloop_event_type type) default: filter = 0; } - EV_SET(&ke, sock, filter, EV_ADD, 0, 0, NULL); + EV_SET(&ke, sock, filter, EV_ADD, 0, 0, 0); if (kevent(eloop.kqueuefd, &ke, 1, NULL, 0, NULL) == -1) { wpa_printf(MSG_ERROR, "%s: kevent(ADD) for fd=%d failed: %s", __func__, sock, strerror(errno)); @@ -411,7 +411,7 @@ static void eloop_sock_table_remove_sock(struct eloop_sock_table *table, os_memset(&eloop.fd_table[sock], 0, sizeof(struct eloop_sock)); #endif /* CONFIG_ELOOP_EPOLL */ #ifdef CONFIG_ELOOP_KQUEUE - EV_SET(&ke, sock, 0, EV_DELETE, 0, 0, NULL); + EV_SET(&ke, sock, 0, EV_DELETE, 0, 0, 0); if (kevent(eloop.kqueuefd, &ke, 1, NULL, 0, NULL) < 0) { wpa_printf(MSG_ERROR, "%s: kevent(DEL) for fd=%d failed: %s", __func__, sock, strerror(errno)); @@ -1333,7 +1333,7 @@ void eloop_wait_for_read_sock(int sock) kfd = kqueue(); if (kfd == -1) return; - EV_SET(&ke1, sock, EVFILT_READ, EV_ADD | EV_ONESHOT, 0, 0, NULL); + EV_SET(&ke1, sock, EVFILT_READ, EV_ADD | EV_ONESHOT, 0, 0, 0); kevent(kfd, &ke1, 1, &ke2, 1, NULL); close(kfd); #endif /* CONFIG_ELOOP_KQUEUE */