From: Jon Turney <jon.turney@dronecode.org.uk>
To: cygwin-apps@cygwin.com
Cc: Jon Turney <jon.turney@dronecode.org.uk>
Subject: [PATCH setup 02/11] Remove unused package_status_t stored in packageversion class
Date: Fri, 28 Apr 2017 12:12:00 -0000 [thread overview]
Message-ID: <20170428121205.12240-3-jon.turney@dronecode.org.uk> (raw)
In-Reply-To: <20170428121205.12240-1-jon.turney@dronecode.org.uk>
The package installed/not installed status is tracked by the packagemeta
class, currently
---
cygpackage.cc | 3 ---
cygpackage.h | 6 ------
package_db.cc | 1 -
package_version.cc | 1 -
package_version.h | 9 ---------
5 files changed, 20 deletions(-)
diff --git a/cygpackage.cc b/cygpackage.cc
index cd4b6bd..14c0c98 100644
--- a/cygpackage.cc
+++ b/cygpackage.cc
@@ -36,7 +36,6 @@ packagev (),
canonical (),
sdesc (),
ldesc (),
-status (package_installed),
type (package_binary),
listdata (),
listfile ()
@@ -61,12 +60,10 @@ cygpackage::createInstance (const std::string& pkgname,
packageversion
cygpackage::createInstance (const std::string& pkgname,
const std::string& version,
- package_status_t const newstatus,
package_type_t const newtype)
{
cygpackage *temp = new cygpackage;
temp->name = pkgname;
- temp->status = newstatus;
temp->type = newtype;
temp->setCanonicalVersion (version);
return packageversion(temp);
diff --git a/cygpackage.h b/cygpackage.h
index 991072a..4c57b95 100644
--- a/cygpackage.h
+++ b/cygpackage.h
@@ -34,10 +34,6 @@ public:
virtual const std::string Vendor_version ();
virtual const std::string Package_version ();
virtual const std::string Canonical_version ();
- virtual package_status_t Status ()
- {
- return status;
- };
virtual package_type_t Type ()
{
return type;
@@ -72,7 +68,6 @@ public:
static packageversion createInstance (const std::string& pkgname,
const std::string& version,
- package_status_t const,
package_type_t const);
private:
@@ -86,7 +81,6 @@ private:
char getfilenamebuffer[CYG_PATH_MAX];
// package_stability_t stability;
- package_status_t status;
package_type_t type;
io_stream *listdata, *listfile;
diff --git a/package_db.cc b/package_db.cc
index ba1a561..a47fb11 100644
--- a/package_db.cc
+++ b/package_db.cc
@@ -107,7 +107,6 @@ packagedb::packagedb ()
packageversion binary =
cygpackage::createInstance (pkgname, f.ver,
- package_installed,
package_binary);
pkg->add_version (binary);
diff --git a/package_version.cc b/package_version.cc
index 8ed8ac8..1a4d041 100644
--- a/package_version.cc
+++ b/package_version.cc
@@ -45,7 +45,6 @@ public:
const std::string Package_version() {return std::string();}
const std::string Canonical_version() {return std::string();}
void setCanonicalVersion (const std::string& ) {}
- package_status_t Status (){return package_notinstalled;}
package_type_t Type () {return package_binary;}
const std::string getfirstfile () {return std::string();}
const std::string getnextfile () {return std::string();}
diff --git a/package_version.h b/package_version.h
index edfd15a..c271f73 100644
--- a/package_version.h
+++ b/package_version.h
@@ -57,13 +57,6 @@ package_stability_t;
typedef enum
{
- package_notinstalled,
- package_installed
-}
-package_status_t;
-
-typedef enum
-{
package_binary,
package_source
}
@@ -105,7 +98,6 @@ public:
const std::string Package_version () const;
const std::string Canonical_version () const;
void setCanonicalVersion (const std::string& );
- package_status_t Status () const;
package_type_t Type () const;
const std::string getfirstfile ();
const std::string getnextfile ();
@@ -165,7 +157,6 @@ public:
virtual const std::string Package_version () = 0;
virtual const std::string Canonical_version () = 0;
virtual void setCanonicalVersion (const std::string& ) = 0;
- virtual package_status_t Status () = 0;
// virtual package_stability_t Stability () = 0;
virtual package_type_t Type () = 0;
/* TODO: we should probably return a metaclass - file name & path & size & type
--
2.12.2
next prev parent reply other threads:[~2017-04-28 12:12 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-28 12:12 [PATCH setup 00/11] Various setup patches Jon Turney
2017-04-28 12:12 ` [PATCH setup 01/11] Remove pointless abstract base class IniDBBuilder Jon Turney
2017-04-28 12:12 ` Jon Turney [this message]
2017-04-28 12:13 ` [PATCH setup 11/11] Use wininet for fetching URLs in direct (non-proxy) case (DO NOT APPLY) Jon Turney
2017-04-28 15:33 ` Åke Rehnman
2017-04-29 10:53 ` Jon Turney
2017-05-01 12:58 ` Jon Turney
2017-05-01 15:31 ` Åke Rehnman
2017-05-01 20:45 ` Jon Turney
2017-05-02 7:28 ` Åke Rehnman
2017-05-02 11:05 ` Jon Turney
2017-05-02 19:29 ` Åke Rehnman
2017-05-03 16:37 ` Jon Turney
[not found] ` <60ed2d4e-7c89-a9b8-e3ab-e3d0819b7e56@gmail.com>
2017-05-04 10:11 ` Jon Turney
2017-05-16 14:00 ` Jon Turney
[not found] ` <e402101c-8e7d-98ed-b39a-c82100d6d59f@gmail.com>
2017-05-17 10:55 ` Jon Turney
2017-05-03 7:22 ` Brian Inglis
2017-05-03 16:37 ` Jon Turney
2017-04-28 12:13 ` [PATCH setup 06/11] packageversion::sourcePackageSpecification() is const Jon Turney
2017-04-28 12:13 ` [PATCH setup 10/11] Don't show source-only packages in package list Jon Turney
2017-05-01 14:45 ` Yaakov Selkowitz
2017-05-01 19:35 ` Jon Turney
2017-04-28 12:13 ` [PATCH setup 03/11] Remove cygpackage::destroy() because it does nothing Jon Turney
2017-04-28 12:13 ` [PATCH setup 07/11] Don't handle missing 'version:' Jon Turney
2017-04-28 12:13 ` [PATCH setup 04/11] Make packageversion::source(|s) const Jon Turney
2017-04-28 12:13 ` [PATCH setup 08/11] Don't do unneeded work when changing stability level Jon Turney
2017-04-28 12:13 ` [PATCH setup 09/11] Make building with DEBUG less useless Jon Turney
2017-04-28 12:13 ` [PATCH setup 05/11] Use const version of packageversion::depends() in PrereqChecker Jon Turney
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=20170428121205.12240-3-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).