[PATCH setup 07/10] Remove unused fn member from cygpackage
Jon Turney
jon.turney@dronecode.org.uk
Tue Aug 2 15:31:00 GMT 2016
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
More information about the Cygwin-apps
mailing list