summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apt-pkg/acquire-item.cc6
-rw-r--r--apt-pkg/contrib/configuration.cc2
-rw-r--r--apt-pkg/deb/dpkgpm.cc2
-rw-r--r--debian/changelog13
-rw-r--r--methods/http.cc2
-rw-r--r--methods/http.h2
-rw-r--r--methods/https.cc7
-rw-r--r--methods/https.h4
-rw-r--r--po/apt-all.pot42
9 files changed, 43 insertions, 37 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 1b9120586..6d71b6ea3 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -271,7 +271,7 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile)
if(found)
{
// queue the diffs
- int last_space = Description.rfind(" ");
+ unsigned int last_space = Description.rfind(" ");
if(last_space != string::npos)
Description.erase(last_space, Description.size()-last_space);
new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc,
@@ -884,8 +884,8 @@ pkgAcqMetaIndex::pkgAcqMetaIndex(pkgAcquire *Owner,
string SigFile,
const vector<struct IndexTarget*>* IndexTargets,
indexRecords* MetaIndexParser) :
- Item(Owner), RealURI(URI), SigFile(SigFile), AuthPass(false),
- MetaIndexParser(MetaIndexParser), IndexTargets(IndexTargets), IMSHit(false)
+ Item(Owner), RealURI(URI), SigFile(SigFile), IndexTargets(IndexTargets),
+ MetaIndexParser(MetaIndexParser), AuthPass(false), IMSHit(false)
{
DestFile = _config->FindDir("Dir::State::lists") + "partial/";
DestFile += URItoFileName(URI);
diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index 7914bd07b..3109fd7a5 100644
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -507,7 +507,7 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool AsSectional,
CurLine++;
// This should be made to work instead, but this is better than looping
if (F.fail() && !F.eof())
- return _error->Error(_("Line %d too long (max %lu)"), CurLine, sizeof(Buffer));
+ return _error->Error(_("Line %d too long (max %u)"), CurLine, sizeof(Buffer));
_strtabexpand(Buffer,sizeof(Buffer));
_strstrip(Buffer);
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index e5506d3bf..a63c4e412 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -385,7 +385,7 @@ bool pkgDPkgPM::Go(int OutStatusFd)
// the dpkg states that are already done; the string is the package
// the int is the state that is already done (e.g. a package that is
// going to be install is already in state "half-installed")
- map<string,int> PackageOpsDone;
+ map<string,unsigned int> PackageOpsDone;
// init the PackageOps map, go over the list of packages that
// that will be [installed|configured|removed|purged] and add
diff --git a/debian/changelog b/debian/changelog
index 907390651..2703b98cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,18 @@
apt (0.7.4) UNRELEASED; urgency=low
- [Otavio Salvador]
- * Fix a typo on 0.7.3 changelog entry about g++ (7.3 to 4.3)
-
[Michael Vogt]
* cmdline/apt-get.cc:
- fix in the task-install code
+ [Otavio Salvador]
+ * Fix a typo on 0.7.3 changelog entry about g++ (7.3 to 4.3)
+ * Fix compilation warnings:
+ - apt-pkg/contrib/configuration.cc: wrong argument type;
+ - apt-pkg/deb/dpkgpm.cc: wrong signess;
+ - apt-pkg-acquire-item.cc: wrong signess and orderned initializers;
+ - methods/https.cc:
+ - type conversion;
+ - unused variable;
+ - changed SetupProxy() method to void;
-- Michael Vogt <michael.vogt@ubuntu.com> Wed, 11 Jul 2007 23:20:15 +0100
diff --git a/methods/http.cc b/methods/http.cc
index d9487be88..3c2d8a36f 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -3,7 +3,7 @@
// $Id: http.cc,v 1.59 2004/05/08 19:42:35 mdz Exp $
/* ######################################################################
- HTTP Aquire Method - This is the HTTP aquire method for APT.
+ HTTP Acquire Method - This is the HTTP aquire method for APT.
It uses HTTP/1.1 and many of the fancy options there-in, such as
pipelining, range, if-range and so on.
diff --git a/methods/http.h b/methods/http.h
index a6191e501..6753a9901 100644
--- a/methods/http.h
+++ b/methods/http.h
@@ -3,7 +3,7 @@
// $Id: http.h,v 1.12 2002/04/18 05:09:38 jgg Exp $
/* ######################################################################
- HTTP Aquire Method - This is the HTTP aquire method for APT.
+ HTTP Acquire Method - This is the HTTP aquire method for APT.
##################################################################### */
/*}}}*/
diff --git a/methods/https.cc b/methods/https.cc
index b758e4ab3..d48ac97fb 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -3,7 +3,7 @@
// $Id: http.cc,v 1.59 2004/05/08 19:42:35 mdz Exp $
/* ######################################################################
- HTTPS Aquire Method - This is the HTTPS aquire method for APT.
+ HTTPS Acquire Method - This is the HTTPS aquire method for APT.
It uses libcurl
@@ -50,13 +50,13 @@ HttpsMethod::progress_callback(void *clientp, double dltotal, double dlnow,
{
HttpsMethod *me = (HttpsMethod *)clientp;
if(dltotal > 0 && me->Res.Size == 0) {
- me->Res.Size = dltotal;
+ me->Res.Size = (unsigned long)dltotal;
me->URIStart(me->Res);
}
return 0;
}
-bool HttpsMethod::SetupProxy()
+void HttpsMethod::SetupProxy()
{
URI ServerName = Queue->Uri;
@@ -84,7 +84,6 @@ bool HttpsMethod::SetupProxy()
}
// Determine what host and port to use based on the proxy settings
- int Port = 0;
string Host;
if (Proxy.empty() == true || Proxy.Host.empty() == true)
{
diff --git a/methods/https.h b/methods/https.h
index 6620a10fc..2c33d95ee 100644
--- a/methods/https.h
+++ b/methods/https.h
@@ -3,7 +3,7 @@
// $Id: http.h,v 1.12 2002/04/18 05:09:38 jgg Exp $
/* ######################################################################
- HTTP Aquire Method - This is the HTTP aquire method for APT.
+ HTTP Acquire Method - This is the HTTP aquire method for APT.
##################################################################### */
/*}}}*/
@@ -29,7 +29,7 @@ class HttpsMethod : public pkgAcqMethod
static size_t write_data(void *buffer, size_t size, size_t nmemb, void *userp);
static int progress_callback(void *clientp, double dltotal, double dlnow,
double ultotal, double ulnow);
- bool SetupProxy();
+ void SetupProxy();
CURL *curl;
FetchResult Res;
diff --git a/po/apt-all.pot b/po/apt-all.pot
index cccd4b75a..d1d6c7622 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 22:26+0200\n"
+"POT-Creation-Date: 2007-07-11 23:19+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1371,7 +1371,7 @@ msgstr ""
msgid "File %s/%s overwrites the one in the package %s"
msgstr ""
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
#, c-format
@@ -1883,57 +1883,57 @@ msgstr ""
msgid "Selection %s not found"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:433
+#: apt-pkg/contrib/configuration.cc:434
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:492
#, c-format
msgid "Opening configuration file %s"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:509
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
-msgid "Line %d too long (max %d)"
+msgid "Line %d too long (max %u)"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:606
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr ""
-#: apt-pkg/contrib/configuration.cc:624
+#: apt-pkg/contrib/configuration.cc:625
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:641
+#: apt-pkg/contrib/configuration.cc:642
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:688
+#: apt-pkg/contrib/configuration.cc:689
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:701
+#: apt-pkg/contrib/configuration.cc:702
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:735
+#: apt-pkg/contrib/configuration.cc:736
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr ""
@@ -2242,7 +2242,7 @@ msgid ""
"you really want to do it, activate the APT::Force-LoopBreak option."
msgstr ""
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
msgstr ""
@@ -2355,7 +2355,7 @@ msgstr ""
#: apt-pkg/pkgcachegen.cc:153
#, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
+msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr ""
#: apt-pkg/pkgcachegen.cc:178
@@ -2385,7 +2385,7 @@ msgstr ""
#: apt-pkg/pkgcachegen.cc:245
#, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
+msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr ""
#: apt-pkg/pkgcachegen.cc:251
@@ -2622,10 +2622,10 @@ msgstr ""
msgid "Completely removed %s"
msgstr ""
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr ""
-
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr ""
+
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr ""
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 18:09:53 +0000