From patchwork Wed Oct 3 07:21:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 478 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director7.mail.ord1d.rsapps.net ([172.28.255.1]) by backend30.mail.ord1d.rsapps.net with LMTP id oP8fCWH7tFsZVgAAIUCqbw for ; Wed, 03 Oct 2018 13:24:49 -0400 Received: from director5.mail.ord1c.rsapps.net ([172.28.255.1]) by director7.mail.ord1d.rsapps.net with LMTP id ANr5CGH7tFvLZAAAovjBpQ ; Wed, 03 Oct 2018 13:24:49 -0400 Received: from smtp18.gate.ord1c ([172.28.255.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by director5.mail.ord1c.rsapps.net with LMTP id ANKnCGH7tFtKJwAAH8LYwg ; Wed, 03 Oct 2018 13:24:49 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp18.gate.ord1c.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dkim=fail (signature verification failed) header.d=gmail.com; dmarc=fail (p=none; dis=none) header.from=gmail.com X-Suspicious-Flag: YES X-Classification-ID: 39e04b26-c731-11e8-94de-bc305bf00c68-1-1 Received: from [216.105.38.7] ([216.105.38.7:51485] helo=lists.sourceforge.net) by smtp18.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 5D/FA-03526-F5BF4BB5; Wed, 03 Oct 2018 13:24:47 -0400 Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1g7ksF-0006tb-05; Wed, 03 Oct 2018 17:23:47 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1g7ksE-0006tU-2i for openvpn-devel@lists.sourceforge.net; Wed, 03 Oct 2018 17:23:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=References:In-Reply-To:Message-Id:Date:Subject:To: From:Sender:Reply-To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=RY31tDlbWy5srm/lXBtfAIZQtXWCM1sA+NawkYZ3d2I=; b=XTf6a1uXMtOCgGyaPOcIOT2+yh kJMkgOrzNW8uPXTb5wrBILFSm7NkrDBNJnp4WMqhxut6pJPZuwWPjr+1sKQeYONBGR0QJVbBuiQ7M ZuJ/imPdbDgkpbANRwOnC1ah0aPKb+XtPwCy5tk3Dz4x4Tdtqe/7Dku9saWd146JaRVI=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=References:In-Reply-To:Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc :MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=RY31tDlbWy5srm/lXBtfAIZQtXWCM1sA+NawkYZ3d2I=; b=jklM1shDW20JJP8MwkHDGRu8Q7 u05MxXAzjDBC3matvLiCrIn8ziHZJsnw9r+3gAmRcUcA4pIhO04czUHMzM6mWTRtQDnxXQuvwh64B TbgFwipLoKclJcu0n1OXhj/xtECHxkbTNeP4h+Xa2K+I6ophp4nw4aZVXN/ncnRLlFlk=; Received: from mail-ed1-f46.google.com ([209.85.208.46]) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.90_1) id 1g7ksC-00BZPE-HE for openvpn-devel@lists.sourceforge.net; Wed, 03 Oct 2018 17:23:46 +0000 Received: by mail-ed1-f46.google.com with SMTP id f38-v6so6075743edd.8 for ; Wed, 03 Oct 2018 10:23:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=RY31tDlbWy5srm/lXBtfAIZQtXWCM1sA+NawkYZ3d2I=; b=KsHa6baTmImupgHn6LG0dSAs76n1Z2AeGhlb8XSolNP5QQdGwwl1+FQP2XKoYA5SsU S1EMGpRxCpIoabGHTQ3+eFWzNixYuDHG6Tc0/6xIM3IaHUfBQ7mD4lTg/O45qQgIQ6Bb IXXjPkLaseyh+LkLlkpUT/6kKMIwTz7A53PsAp5ShxsC9DgSB1hc8I1tdEw8fbN7+GuN qevXE8fn6W7AjE0Kf430JAR2WvjDt0n2aAEwRgYZsW6mHPbUxfWks5MeMCOQUqBob3af fsNxgFp9bW+mrI2N315ZV7yZphRY4x+scDvLIZDGjskC8KCFqozMeLiPjLYTk9ATrfPK y3ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=RY31tDlbWy5srm/lXBtfAIZQtXWCM1sA+NawkYZ3d2I=; b=gncW8/2MZXVB7PQ9sDToROiwnD3hpNbKo00HXpTg6y8rmx4W/iENCVVGVl5rvJ0bun UEYQzui1ZROWqZamiU9RN/UAxsgfWcrmAFpzLH953tLgj7PuQm5DMON/B15HisPPtW1X N68hTuUGQ2bjFgKeaoQeePxD85lVHyqbnQuLNNtI8+wCfxocwb5TVAGF3bw4xS9iP4eB g+YJsIPiYwqJRslXJjIot9ku56oJvJQT+sY570aQYl6wk9XaDGebVgDtqs/IGdkDlhtW Y62CH7VtUaFP4HsRYCkEEdpf1CN0uG5VwF9z4avddFGtQB+XkrnkZjQBqUzZZtsvpF5f UAqA== X-Gm-Message-State: ABuFfohp0HH/WEu5FFaZokKQwx3CncqPRAslhWfPtCHe6o2KKoxkjEvB OoSlPmXMYBqU94VE5FKtsmmZjCkgQUM= X-Google-Smtp-Source: ACcGV63zeAne5Y/puH4qkLlLJYk91TALJ5JJmjGArOVWz7T/g+/8Eg1VrwzdvE+sxS46647t3ec9ow== X-Received: by 2002:a50:8f64:: with SMTP id 91-v6mr3711876edy.264.1538587417240; Wed, 03 Oct 2018 10:23:37 -0700 (PDT) Received: from stipakov.fi (stipakov.fi. [128.199.52.117]) by smtp.gmail.com with ESMTPSA id i23-v6sm397567ejc.66.2018.10.03.10.23.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 03 Oct 2018 10:23:36 -0700 (PDT) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Wed, 3 Oct 2018 20:21:21 +0300 Message-Id: <1538587281-3209-1-git-send-email-lstipakov@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [209.85.208.46 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (lstipakov[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.0 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1g7ksC-00BZPE-HE Subject: [Openvpn-devel] [PATCH v2] openvpnserv: clarify return values type X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox From: Lev Stipakov Functions openvpn_vsntprintf and openvpn_sntprintf return values of type int, but in reality it is always 0 or 1 (and -1 for snrptinf), which can be represented as boolean. To make code clearer, change return type to BOOL. Also use stdbool.h header instead of bool definition macros in automatic.c. Signed-off-by: Lev Stipakov Acked-by: selva.nair@gmail.com Signed-off-by: Lev Stipakov <lev@openvpn.net>
--- v2: replace bool with BOOL as discussed src/openvpnserv/automatic.c | 6 +----- src/openvpnserv/common.c | 13 +++++++------ src/openvpnserv/service.h | 4 ++-- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/openvpnserv/automatic.c b/src/openvpnserv/automatic.c index 1f98283..73d3003 100644 --- a/src/openvpnserv/automatic.c +++ b/src/openvpnserv/automatic.c @@ -36,13 +36,9 @@ #include #include +#include #include -/* bool definitions */ -#define bool int -#define true 1 -#define false 0 - static SERVICE_STATUS_HANDLE service; static SERVICE_STATUS status = { .dwServiceType = SERVICE_WIN32_SHARE_PROCESS }; diff --git a/src/openvpnserv/common.c b/src/openvpnserv/common.c index dc47666..6b3a859 100644 --- a/src/openvpnserv/common.c +++ b/src/openvpnserv/common.c @@ -31,7 +31,7 @@ LPCTSTR service_instance = TEXT(""); * These are necessary due to certain buggy implementations of (v)snprintf, * that don't guarantee null termination for size > 0. */ -int +BOOL openvpn_vsntprintf(LPTSTR str, size_t size, LPCTSTR format, va_list arglist) { int len = -1; @@ -42,18 +42,19 @@ openvpn_vsntprintf(LPTSTR str, size_t size, LPCTSTR format, va_list arglist) } return (len >= 0 && len < size); } -int + +BOOL openvpn_sntprintf(LPTSTR str, size_t size, LPCTSTR format, ...) { va_list arglist; - int len = -1; + BOOL res = FALSE; if (size > 0) { va_start(arglist, format); - len = openvpn_vsntprintf(str, size, format, arglist); + res = openvpn_vsntprintf(str, size, format, arglist); va_end(arglist); } - return len; + return res; } static DWORD @@ -65,7 +66,7 @@ GetRegString(HKEY key, LPCTSTR value, LPTSTR data, DWORD size, LPCTSTR default_v if (status == ERROR_FILE_NOT_FOUND && default_value) { size_t len = size/sizeof(data[0]); - if (openvpn_sntprintf(data, len, default_value) > 0) + if (openvpn_sntprintf(data, len, default_value)) { status = ERROR_SUCCESS; } diff --git a/src/openvpnserv/service.h b/src/openvpnserv/service.h index 4d03b88..b90033a 100644 --- a/src/openvpnserv/service.h +++ b/src/openvpnserv/service.h @@ -82,9 +82,9 @@ VOID WINAPI ServiceStartAutomatic(DWORD argc, LPTSTR *argv); VOID WINAPI ServiceStartInteractiveOwn(DWORD argc, LPTSTR *argv); VOID WINAPI ServiceStartInteractive(DWORD argc, LPTSTR *argv); -int openvpn_vsntprintf(LPTSTR str, size_t size, LPCTSTR format, va_list arglist); +BOOL openvpn_vsntprintf(LPTSTR str, size_t size, LPCTSTR format, va_list arglist); -int openvpn_sntprintf(LPTSTR str, size_t size, LPCTSTR format, ...); +BOOL openvpn_sntprintf(LPTSTR str, size_t size, LPCTSTR format, ...); DWORD GetOpenvpnSettings(settings_t *s);