public inbox for cygwin-apps@cygwin.com
 help / color / mirror / Atom feed
From: Jon Turney <jon.turney@dronecode.org.uk>
To: cygwin-apps@cygwin.com
Cc: Jon Turney <jon.turney@dronecode.org.uk>
Subject: [PATCH setup 07/10] Remove unused fn member from cygpackage
Date: Tue, 02 Aug 2016 15:31:00 -0000	[thread overview]
Message-ID: <20160802153037.125216-8-jon.turney@dronecode.org.uk> (raw)
In-Reply-To: <20160802153037.125216-1-jon.turney@dronecode.org.uk>

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

  parent reply	other threads:[~2016-08-02 15:31 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-02 15:31 [PATCH setup 00/10] Various setup patches Jon Turney
2016-08-02 15:31 ` [PATCH setup 06/10] Remove obsolete installed_from member from packagemeta Jon Turney
2016-08-02 15:31 ` [PATCH setup 04/10] Downgrade "Running preremove script" logging to debug Jon Turney
2016-08-02 15:31 ` [PATCH setup 03/10] Add lex and yacc generated files to .gitignore Jon Turney
2016-08-02 15:31 ` [PATCH setup 09/10] Add an additional filter view, showing packages which were user picked Jon Turney
2016-08-02 15:31 ` Jon Turney [this message]
2016-08-02 15:31 ` [PATCH setup 01/10] Remove stray execute permissions Jon Turney
2016-08-02 15:31 ` [PATCH setup 08/10] Track if a package was installed by user, or as a dependency Jon Turney
2016-08-03 10:49   ` Jon Turney
2016-08-02 15:31 ` [PATCH setup 10/10] Reserve paths starting "." for package metadata Jon Turney
2016-08-02 15:31 ` [PATCH setup 05/10] Properly report progress in PrereqChecker::isMet Jon Turney
2016-08-02 15:31 ` [PATCH setup 02/10] Prevent libtool warning that a getopt++ shared library cannot be built Jon Turney
2016-08-03  7:10 ` [PATCH setup 00/10] Various setup patches Achim Gratz
2016-08-03  8:35   ` Corinna Vinschen
2016-08-03  9:52     ` Achim Gratz
2016-08-03 17:40       ` Corinna Vinschen
2016-08-03 18:28         ` Achim Gratz
2016-08-03 18:43           ` Corinna Vinschen
2016-08-03 19:52             ` Achim Gratz
2016-08-04 11:40               ` Corinna Vinschen
2016-08-04 17:57                 ` Achim Gratz
2016-08-04 18:00                   ` Corinna Vinschen
2016-08-04 19:26                     ` Achim Gratz
2016-08-03 17:30 ` Corinna Vinschen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160802153037.125216-8-jon.turney@dronecode.org.uk \
    --to=jon.turney@dronecode.org.uk \
    --cc=cygwin-apps@cygwin.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).