From patchwork Wed Oct 3 04:16:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 477 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director11.mail.ord1d.rsapps.net ([172.31.255.6]) by backend30.mail.ord1d.rsapps.net with LMTP id 6NijE0HQtFsFfQAAIUCqbw for ; Wed, 03 Oct 2018 10:20:49 -0400 Received: from proxy15.mail.iad3b.rsapps.net ([172.31.255.6]) by director11.mail.ord1d.rsapps.net with LMTP id eKhLEUHQtFuSbgAAvGGmqA ; Wed, 03 Oct 2018 10:20:49 -0400 Received: from smtp8.gate.iad3b ([172.31.255.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy15.mail.iad3b.rsapps.net with LMTP id 4HvGCkHQtFvYWgAAhyf7VQ ; Wed, 03 Oct 2018 10:20: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: smtp8.gate.iad3b.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: 85f12f2c-c717-11e8-89a0-5254005eee35-1-1 Received: from [216.105.38.7] ([216.105.38.7:22758] helo=lists.sourceforge.net) by smtp8.gate.iad3b.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 4D/BB-10779-040D4BB5; Wed, 03 Oct 2018 10:20:48 -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 1g7hzc-0002A1-M9; Wed, 03 Oct 2018 14:19:12 +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 1g7hzb-00029r-Dk for openvpn-devel@lists.sourceforge.net; Wed, 03 Oct 2018 14:19:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=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:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Sq+tnaZY6+p2yoYFWvGp/zLT3G9b7kL8d0ZUsj45pYU=; b=cRhzsLkX0ygfR1Huy7qmN2QCCR o0yroFkYQsDrttcrWdjkSvD5UfSCdx7aVIsT6m2obRm6Jm2o+09re8veXoVS4De25vCxZ1UIRN9A0 ol+8rTb3cbsp7uts1ukynd0jFvzYj11eWBXmStXIUyLwu3HsHb0dwc2O1lbXkHA1CNr8=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=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: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=Sq+tnaZY6+p2yoYFWvGp/zLT3G9b7kL8d0ZUsj45pYU=; b=cjMq+udE/pXGgmAEi+FhkqPMt+ miA0nM6YHRKgQGXFNahsX5b9TuNrM5VLecMTX/GExh4JPFqVj35iIgta1zL0QIeG5GcA/AZYQ4f6r 4gpq2HuRTrOSFP0aqCxyobHg5IlHcJuE6umXrNIyROQ8n1mTj0xa7uFtzKIGsmqpKTQM=; Received: from mail-ed1-f68.google.com ([209.85.208.68]) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.90_1) id 1g7hzY-00BU6Z-3T for openvpn-devel@lists.sourceforge.net; Wed, 03 Oct 2018 14:19:11 +0000 Received: by mail-ed1-f68.google.com with SMTP id f4-v6so5523479edq.3 for ; Wed, 03 Oct 2018 07:19:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=Sq+tnaZY6+p2yoYFWvGp/zLT3G9b7kL8d0ZUsj45pYU=; b=lfuuauO1uxUGicjNho/yk5GQE/WTJoKJPeci8y3h6qJoHJGhCa6lmE74rh6cIV4jia GnOEXKKuWU44YBsYoOicg8ITAiTNeL59NU94GxYcgrDqqAjrmIEHmCFhUPHNowX1hMID C/RH8SBhGUEH4J5elzfMjIrqpm1Q7sHb6becPvji/VjXFNQ4dHcpTqvEWt1RMMkuwXCP Yi4So8j6bJXI0iJUHhRSmNLu0h1APD33kFkPT7wZIfIAzLy8KR7qn10vAtyRLvDgRq7/ /U+CHjV1LYGen20MfYwhccK/JIm/vnmkrklygD2xWSIcbZy6jQwIG0UHYUtjrf07giFA +0MQ== 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; bh=Sq+tnaZY6+p2yoYFWvGp/zLT3G9b7kL8d0ZUsj45pYU=; b=IsoWy4Aey+IaLsTAWZ8vMOzCUsLOzAWscHQ/OOziXG85SjALDOnysd0bofoZk3n1MD F0DChcaMwia3T18ALUEixubx68bwIKsMJndbZowcDIm6NKDW2k67Ibae7/UxfMRr2de9 kv1YDQtUYGG/GPCW/gl1i7LXkWhPIDwEkBSExb6qam6VZcdhwVorxK+8UGiIOAe0Gu+I XM+8ERKZLCLbUuuB1WTo/rmQs8e6Rh6YB9YIegMKbMH+BrE5l2JuNF0iJUxlr/LlxvdK P4A50VQpPplc6s0gpbF8mVlKgNa8s74BLHF0oftmpfMcZe36Q6vGziAGO6NidMSyrJmD J3kA== X-Gm-Message-State: ABuFfojTByZXhZfXSLO6gIcDI7vDBbOMGz653oY+w5opnKiFrKWUyM6R DP+Sh8707LJKqtNNbZhc+1haqlh3RIg= X-Google-Smtp-Source: ACcGV63DTqQY510lQUmvTBU8xxxFjunZ86XD5nvlcVMUK+6338YvYUnge0UdbIV9A072Xtg3AW6cJQ== X-Received: by 2002:a50:b2a6:: with SMTP id p35-v6mr2602630edd.215.1538576341147; Wed, 03 Oct 2018 07:19:01 -0700 (PDT) Received: from stipakov.fi (stipakov.fi. [128.199.52.117]) by smtp.gmail.com with ESMTPSA id g48-v6sm636221edc.93.2018.10.03.07.19.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 03 Oct 2018 07:19:00 -0700 (PDT) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Wed, 3 Oct 2018 17:16:52 +0300 Message-Id: <1538576212-2363-1-git-send-email-lstipakov@gmail.com> X-Mailer: git-send-email 2.7.4 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (lstipakov[at]gmail.com) -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.68 listed in wl.mailspike.net] -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 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [209.85.208.68 listed in list.dnswl.org] X-Headers-End: 1g7hzY-00BU6Z-3T Subject: [Openvpn-devel] [PATCH] 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, which is essentially bool. To make code more clear, change return type to bool. Also use stdbool.h header instead of bool definition macros. Signed-off-by: Lev Stipakov Signed-off-by: Lev Stipakov <lev@openvpn.net>
--- src/openvpnserv/automatic.c | 5 ----- src/openvpnserv/common.c | 13 +++++++------ src/openvpnserv/service.h | 5 +++-- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/openvpnserv/automatic.c b/src/openvpnserv/automatic.c index 1f98283..c2982c1 100644 --- a/src/openvpnserv/automatic.c +++ b/src/openvpnserv/automatic.c @@ -38,11 +38,6 @@ #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..69dd44b 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..eaa479a 100644 --- a/src/openvpnserv/service.h +++ b/src/openvpnserv/service.h @@ -32,6 +32,7 @@ #include #include +#include #include #include @@ -82,9 +83,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);