From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 123407 invoked by alias); 2 Aug 2016 15:31:40 -0000 Mailing-List: contact cygwin-apps-help@cygwin.com; run by ezmlm Precedence: bulk Sender: cygwin-apps-owner@cygwin.com List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Mail-Followup-To: cygwin-apps@cygwin.com Received: (qmail 123239 invoked by uid 89); 2 Aug 2016 15:31:39 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.1 required=5.0 tests=AWL,BAYES_00,KAM_LAZY_DOMAIN_SECURITY autolearn=no version=3.3.2 spammy=H*RU:CriticalPath, Hx-spam-relays-external:CriticalPath, vendor X-HELO: rgout0204.bt.lon5.cpcloud.co.uk Received: from rgout0204.bt.lon5.cpcloud.co.uk (HELO rgout0204.bt.lon5.cpcloud.co.uk) (65.20.0.203) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 02 Aug 2016 15:31:33 +0000 X-OWM-Source-IP: 31.51.206.218 (GB) X-OWM-Env-Sender: jonturney@btinternet.com X-Junkmail-Premium-Raw: score=27/50,refid=2.7.2:2016.8.1.131817:17:27.888,ip=31.51.206.218,rules=__HAS_FROM, __TO_MALFORMED_2, __TO_NO_NAME, __HAS_CC_HDR, __CC_NAME, __CC_NAME_DIFF_FROM_ACC, __SUBJ_ALPHA_END, __HAS_MSGID, __SANE_MSGID, __HAS_X_MAILER, __IN_REP_TO, __REFERENCES, __FROM_DOMAIN_IN_ANY_CC1, BODYTEXTP_SIZE_3000_LESS, BODY_SIZE_2000_2999, __MIME_TEXT_ONLY, RDNS_GENERIC_POOLED, SXL_IP_DYNAMIC[218.206.51.31.fur], HTML_00_01, HTML_00_10, BODY_SIZE_5000_LESS, RDNS_SUSP_GENERIC, NO_URI_FOUND, NO_CTA_URI_FOUND, __FROM_DOMAIN_IN_RCPT, RDNS_SUSP, IN_REP_TO, REFERENCES, BODY_SIZE_7000_LESS, NO_URI_HTTPS, MSG_THREAD, __CC_REAL_NAMES, MULTIPLE_REAL_RCPTS, LEGITIMATE_SIGNS, LEGITIMATE_NEGATE Received: from localhost.localdomain (31.51.206.218) by rgout02.bt.lon5.cpcloud.co.uk (8.6.122.06) (authenticated as jonturney@btinternet.com) id 57A0AF7B0001D985; Tue, 2 Aug 2016 16:31:27 +0100 From: Jon Turney To: cygwin-apps@cygwin.com Cc: Jon Turney Subject: [PATCH setup 07/10] Remove unused fn member from cygpackage Date: Tue, 02 Aug 2016 15:31:00 -0000 Message-Id: <20160802153037.125216-8-jon.turney@dronecode.org.uk> In-Reply-To: <20160802153037.125216-1-jon.turney@dronecode.org.uk> References: <20160802153037.125216-1-jon.turney@dronecode.org.uk> X-SW-Source: 2016-08/txt/msg00018.txt.bz2 This is set, but never used. --- cygpackage.cc | 3 --- cygpackage.h | 8 +++----- package_db.cc | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/cygpackage.cc b/cygpackage.cc index 4b05cb3..71816f9 100644 --- a/cygpackage.cc +++ b/cygpackage.cc @@ -39,7 +39,6 @@ name (), vendor (), packagev (), canonical (), -fn (), sdesc (), ldesc (), status (package_installed), @@ -66,14 +65,12 @@ cygpackage::createInstance (const std::string& pkgname, packageversion cygpackage::createInstance (const std::string& pkgname, - const std::string& filename, const std::string& version, package_status_t const newstatus, package_type_t const newtype) { cygpackage *temp = new cygpackage; temp->name = pkgname; - temp->fn = filename; temp->status = newstatus; temp->type = newtype; temp->setCanonicalVersion (version); diff --git a/cygpackage.h b/cygpackage.h index 0b08e0d..991072a 100644 --- a/cygpackage.h +++ b/cygpackage.h @@ -70,10 +70,9 @@ public: static packageversion createInstance (const std::string& pkgname, const package_type_t type); - static packageversion createInstance (const std::string& , - const std::string& , - const std::string& , - package_status_t const, + static packageversion createInstance (const std::string& pkgname, + const std::string& version, + package_status_t const, package_type_t const); private: @@ -83,7 +82,6 @@ private: std::string vendor; std::string packagev; std::string canonical; - std::string fn; std::string sdesc, ldesc; char getfilenamebuffer[CYG_PATH_MAX]; diff --git a/package_db.cc b/package_db.cc index 87da922..f437daf 100644 --- a/package_db.cc +++ b/package_db.cc @@ -105,7 +105,7 @@ packagedb::packagedb () } packageversion binary = - cygpackage::createInstance (pkgname, inst, f.ver, + cygpackage::createInstance (pkgname, f.ver, package_installed, package_binary); -- 2.8.3