summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/acquire-item.cc4
-rw-r--r--apt-pkg/acquire-method.h4
-rw-r--r--apt-pkg/acquire.h10
-rw-r--r--apt-pkg/algorithms.cc4
-rw-r--r--apt-pkg/clean.h4
-rw-r--r--apt-pkg/contrib/fileutl.cc16
-rw-r--r--apt-pkg/contrib/fileutl.h3
-rw-r--r--apt-pkg/orderlist.cc22
-rw-r--r--apt-pkg/packagemanager.h4
-rw-r--r--apt-pkg/sourcelist.cc4
-rw-r--r--apt-pkg/srcrecords.h4
11 files changed, 47 insertions, 32 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 25839f85c..1f7980b11 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: acquire-item.cc,v 1.33 1999/07/10 05:32:25 jgg Exp $
+// $Id: acquire-item.cc,v 1.34 1999/07/20 05:53:32 jgg Exp $
/* ######################################################################
Acquire Item - Item to acquire
@@ -78,7 +78,7 @@ void pkgAcquire::Item::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
// ---------------------------------------------------------------------
/* Stash status and the file size. Note that setting Complete means
sub-phases of the acquire process such as decompresion are operating */
-void pkgAcquire::Item::Start(string Message,unsigned long Size)
+void pkgAcquire::Item::Start(string /*Message*/,unsigned long Size)
{
Status = StatFetching;
if (FileSize == 0 && Complete == false)
diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h
index 6aabcb91d..225ec15a8 100644
--- a/apt-pkg/acquire-method.h
+++ b/apt-pkg/acquire-method.h
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: acquire-method.h,v 1.10 1999/01/27 02:48:52 jgg Exp $
+// $Id: acquire-method.h,v 1.11 1999/07/20 05:53:33 jgg Exp $
/* ######################################################################
Acquire Method - Method helper class + functions
@@ -52,7 +52,7 @@ class pkgAcqMethod
// Handlers for messages
virtual bool Configuration(string Message);
- virtual bool Fetch(FetchItem *Item) {return true;};
+ virtual bool Fetch(FetchItem * /*Item*/) {return true;};
// Outgoing messages
void Fail(bool Transient = false);
diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h
index bf43ac703..0d12b554f 100644
--- a/apt-pkg/acquire.h
+++ b/apt-pkg/acquire.h
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: acquire.h,v 1.23 1999/07/09 04:38:00 jgg Exp $
+// $Id: acquire.h,v 1.24 1999/07/20 05:53:33 jgg Exp $
/* ######################################################################
Acquire - File Acquiration
@@ -259,10 +259,10 @@ class pkgAcquireStatus
virtual bool MediaChange(string Media,string Drive) = 0;
// Each of these is called by the workers when an event occures
- virtual void IMSHit(pkgAcquire::ItemDesc &Itm) {};
- virtual void Fetch(pkgAcquire::ItemDesc &Itm) {};
- virtual void Done(pkgAcquire::ItemDesc &Itm) {};
- virtual void Fail(pkgAcquire::ItemDesc &Itm) {};
+ virtual void IMSHit(pkgAcquire::ItemDesc &/*Itm*/) {};
+ virtual void Fetch(pkgAcquire::ItemDesc &/*Itm*/) {};
+ virtual void Done(pkgAcquire::ItemDesc &/*Itm*/) {};
+ virtual void Fail(pkgAcquire::ItemDesc &/*Itm*/) {};
virtual bool Pulse(pkgAcquire *Owner); // returns false on user cancel
virtual void Start();
virtual void Stop();
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 9ca6ca590..fed9b0be7 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: algorithms.cc,v 1.21 1999/07/09 04:11:33 jgg Exp $
+// $Id: algorithms.cc,v 1.22 1999/07/20 05:53:33 jgg Exp $
/* ######################################################################
Algorithms - A set of misc algorithms
@@ -36,7 +36,7 @@ pkgSimulate::pkgSimulate(pkgDepCache &Cache) : pkgPackageManager(Cache),
// Fake a filename so as not to activate the media swapping
string Jnk = "SIMULATE";
- for (int I = 0; I != Cache.Head().PackageCount; I++)
+ for (unsigned int I = 0; I != Cache.Head().PackageCount; I++)
FileNames[I] = Jnk;
}
/*}}}*/
diff --git a/apt-pkg/clean.h b/apt-pkg/clean.h
index afb5aa4f5..ee65fcb61 100644
--- a/apt-pkg/clean.h
+++ b/apt-pkg/clean.h
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: clean.h,v 1.1 1999/02/01 08:11:57 jgg Exp $
+// $Id: clean.h,v 1.2 1999/07/20 05:53:33 jgg Exp $
/* ######################################################################
Clean - Clean out downloaded directories
@@ -20,7 +20,7 @@ class pkgArchiveCleaner
{
protected:
- virtual void Erase(const char *File,string Pkg,string Ver,struct stat &St) {};
+ virtual void Erase(const char * /*File*/,string /*Pkg*/,string /*Ver*/,struct stat & /*St*/) {};
public:
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 4374dd7d5..c24a216ef 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: fileutl.cc,v 1.28 1999/07/11 22:42:32 jgg Exp $
+// $Id: fileutl.cc,v 1.29 1999/07/20 05:53:33 jgg Exp $
/* ######################################################################
File Utilities
@@ -373,6 +373,20 @@ bool FileFd::Seek(unsigned long To)
return true;
}
/*}}}*/
+// FileFd::Skip - Seek in the file /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool FileFd::Skip(unsigned long Over)
+{
+ if (lseek(iFd,Over,SEEK_CUR) < 0)
+ {
+ Flags |= Fail;
+ return _error->Error("Unable to seek ahead %u",Over);
+ }
+
+ return true;
+}
+ /*}}}*/
// FileFd::Truncate - Truncate the file /*{{{*/
// ---------------------------------------------------------------------
/* */
diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index e24f9cfb6..1186fb283 100644
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: fileutl.h,v 1.19 1999/07/11 22:42:32 jgg Exp $
+// $Id: fileutl.h,v 1.20 1999/07/20 05:53:33 jgg Exp $
/* ######################################################################
File Utilities
@@ -42,6 +42,7 @@ class FileFd
bool Read(void *To,unsigned long Size);
bool Write(const void *From,unsigned long Size);
bool Seek(unsigned long To);
+ bool Skip(unsigned long To);
bool Truncate(unsigned long To);
unsigned long Tell();
unsigned long Size();
diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc
index cb52d160e..0d529c122 100644
--- a/apt-pkg/orderlist.cc
+++ b/apt-pkg/orderlist.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: orderlist.cc,v 1.7 1999/07/19 01:49:44 jgg Exp $
+// $Id: orderlist.cc,v 1.8 1999/07/20 05:53:33 jgg Exp $
/* ######################################################################
Order List - Represents and Manipulates an ordered list of packages.
@@ -150,7 +150,7 @@ bool pkgOrderList::OrderCritical()
{
FileList = 0;
- Primary = &DepUnPackPre;
+ Primary = &pkgOrderList::DepUnPackPre;
Secondary = 0;
RevDepends = 0;
Remove = 0;
@@ -176,10 +176,10 @@ bool pkgOrderList::OrderUnpack(string *FileList)
{
this->FileList = FileList;
- Primary = &DepUnPackCrit;
- Secondary = &DepConfigure;
- RevDepends = &DepUnPackDep;
- Remove = &DepRemove;
+ Primary = &pkgOrderList::DepUnPackCrit;
+ Secondary = &pkgOrderList::DepConfigure;
+ RevDepends = &pkgOrderList::DepUnPackDep;
+ Remove = &pkgOrderList::DepRemove;
LoopCount = -1;
// Sort
@@ -200,7 +200,7 @@ bool pkgOrderList::OrderUnpack(string *FileList)
return false;
LoopCount = 0;
- Primary = &DepUnPackPre;
+ Primary = &pkgOrderList::DepUnPackPre;
if (DoRun() == false)
return false;
@@ -222,7 +222,7 @@ bool pkgOrderList::OrderUnpack(string *FileList)
bool pkgOrderList::OrderConfigure()
{
FileList = 0;
- Primary = &DepConfigure;
+ Primary = &pkgOrderList::DepConfigure;
Secondary = 0;
RevDepends = 0;
Remove = 0;
@@ -475,8 +475,8 @@ bool pkgOrderList::VisitNode(PkgIterator Pkg)
DepFunc Old = Primary;
// Perform immedate configuration of the package if so flagged.
- if (IsFlag(Pkg,Immediate) == true && Primary != &DepUnPackPre)
- Primary = &DepUnPackPreD;
+ if (IsFlag(Pkg,Immediate) == true && Primary != &pkgOrderList::DepUnPackPre)
+ Primary = &pkgOrderList::DepUnPackPreD;
if (IsNow(Pkg) == true)
{
@@ -589,7 +589,7 @@ bool pkgOrderList::DepUnPackCrit(DepIterator D)
DepFunc Old = Primary;
bool Res = false;
if (D->Type == pkgCache::Dep::PreDepends)
- Primary = &DepUnPackPreD;
+ Primary = &pkgOrderList::DepUnPackPreD;
Res = VisitProvides(D,true);
Primary = Old;
if (Res == false)
diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index 88039ba5a..d8a09f65a 100644
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: packagemanager.h,v 1.9 1999/07/09 04:11:34 jgg Exp $
+// $Id: packagemanager.h,v 1.10 1999/07/20 05:53:33 jgg Exp $
/* ######################################################################
Package Manager - Abstacts the package manager
@@ -74,7 +74,7 @@ class pkgPackageManager
// The Actuall installation implementation
virtual bool Install(PkgIterator /*Pkg*/,string /*File*/) {return false;};
virtual bool Configure(PkgIterator /*Pkg*/) {return false;};
- virtual bool Remove(PkgIterator /*Pkg*/,bool Purge=false) {return false;};
+ virtual bool Remove(PkgIterator /*Pkg*/,bool /*Purge*/=false) {return false;};
virtual bool Go() {return true;};
virtual void Reset() {};
diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index c4f225fde..a7e6b0e6a 100644
--- a/apt-pkg/sourcelist.cc
+++ b/apt-pkg/sourcelist.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: sourcelist.cc,v 1.13 1999/04/07 05:30:17 jgg Exp $
+// $Id: sourcelist.cc,v 1.14 1999/07/20 05:53:33 jgg Exp $
/* ######################################################################
List of Sources
@@ -73,7 +73,7 @@ bool pkgSourceList::Read(string File)
string Type;
string URI;
Item Itm;
- char *C = Buffer;
+ const char *C = Buffer;
if (ParseQuoteWord(C,Type) == false)
return _error->Error("Malformed line %u in source list %s (type)",CurLine,File.c_str());
if (ParseQuoteWord(C,URI) == false)
diff --git a/apt-pkg/srcrecords.h b/apt-pkg/srcrecords.h
index c7ff17fc2..17297a60e 100644
--- a/apt-pkg/srcrecords.h
+++ b/apt-pkg/srcrecords.h
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: srcrecords.h,v 1.3 1999/04/07 05:30:18 jgg Exp $
+// $Id: srcrecords.h,v 1.4 1999/07/20 05:53:33 jgg Exp $
/* ######################################################################
Source Package Records - Allows access to source package records
@@ -52,7 +52,7 @@ class pkgSrcRecords
virtual string Maintainer() = 0;
virtual string Section() = 0;
virtual const char **Binaries() = 0;
- virtual bool Files(vector<File> &F) = 0;
+ virtual bool Files(vector<pkgSrcRecords::File> &F) = 0;
Parser(FileFd *File,pkgSourceList::const_iterator SrcItem) : File(File),
SrcItem(SrcItem) {};
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 21:09:36 +0000