Browse Source

fix various -Wall warnings

debian/1.8.y
Michael Vogt 13 years ago
parent
commit
3c8cda8b05
  1. 4
      apt-inst/contrib/extracttar.cc
  2. 3
      apt-pkg/acquire.cc
  3. 3
      apt-pkg/contrib/cdromutl.cc
  4. 5
      apt-pkg/contrib/mmap.cc
  5. 4
      apt-pkg/deb/dpkgpm.cc
  6. 2
      apt-pkg/depcache.cc
  7. 2
      apt-pkg/indexcopy.cc
  8. 2
      cmdline/apt-cache.cc
  9. 5
      debian/changelog
  10. 3
      methods/http.cc
  11. 2
      methods/https.cc
  12. 27
      po/apt-all.pot

4
apt-inst/contrib/extracttar.cc

@ -208,14 +208,14 @@ bool ExtractTar::Go(pkgDirStream &Stream)
Itm.Name = (char *)LastLongName.c_str();
else
{
Tar->Name[sizeof(Tar->Name)] = 0;
Tar->Name[sizeof(Tar->Name)-1] = 0;
Itm.Name = Tar->Name;
}
if (Itm.Name[0] == '.' && Itm.Name[1] == '/' && Itm.Name[2] != 0)
Itm.Name += 2;
// Grab the link target
Tar->Name[sizeof(Tar->LinkName)] = 0;
Tar->Name[sizeof(Tar->LinkName)-1] = 0;
Itm.LinkTarget = Tar->LinkName;
if (LastLongLink.empty() == false)

3
apt-pkg/acquire.cc

@ -444,8 +444,9 @@ bool pkgAcquire::Clean(string Dir)
unlink(Dir->d_name);
};
chdir(StartDir.c_str());
closedir(D);
if (chdir(StartDir.c_str()) != 0)
return _error->Errno("chdir",_("Unable to change to %s"),StartDir.c_str());
return true;
}
/*}}}*/

3
apt-pkg/contrib/cdromutl.cc

@ -176,7 +176,8 @@ bool IdentCdrom(string CD,string &Res,unsigned int Version)
Hash.Add(Dir->d_name);
};
chdir(StartDir.c_str());
if (chdir(StartDir.c_str()) != 0)
return _error->Errno("chdir",_("Unable to change to %s"),StartDir.c_str());
closedir(D);
// Some stats from the fsys

5
apt-pkg/contrib/mmap.cc

@ -192,7 +192,8 @@ DynamicMMap::~DynamicMMap()
unsigned long EndOfFile = iSize;
iSize = WorkSpace;
Close(false);
ftruncate(Fd->Fd(),EndOfFile);
if(ftruncate(Fd->Fd(),EndOfFile) < 0)
_error->Errno("ftruncate", _("Failed to truncate file"));
}
/*}}}*/
// DynamicMMap::RawAllocate - Allocate a raw chunk of unaligned space /*{{{*/
@ -209,7 +210,7 @@ unsigned long DynamicMMap::RawAllocate(unsigned long Size,unsigned long Aln)
// Just in case error check
if (Result + Size > WorkSpace)
{
_error->Error("Dynamic MMap ran out of room");
_error->Error(_("Dynamic MMap ran out of room"));
return 0;
}

4
apt-pkg/deb/dpkgpm.cc

@ -531,7 +531,7 @@ bool pkgDPkgPM::OpenLog()
struct tm *tmp = localtime(&t);
strftime(outstr, sizeof(outstr), "%F %T", tmp);
fprintf(term_out, "\nLog started: ");
fprintf(term_out, outstr);
fprintf(term_out, "%s", outstr);
fprintf(term_out, "\n");
}
return true;
@ -546,7 +546,7 @@ bool pkgDPkgPM::CloseLog()
struct tm *tmp = localtime(&t);
strftime(outstr, sizeof(outstr), "%F %T", tmp);
fprintf(term_out, "Log ended: ");
fprintf(term_out, outstr);
fprintf(term_out, "%s", outstr);
fprintf(term_out, "\n");
fclose(term_out);
}

2
apt-pkg/depcache.cc

@ -269,7 +269,7 @@ bool pkgDepCache::writeStateFile(OpProgress *prog, bool InstalledOnly)
ostr.str(string(""));
ostr << "Package: " << pkg.Name()
<< "\nAuto-Installed: 1\n\n";
fprintf(OutFile,ostr.str().c_str());
fprintf(OutFile,"%s",ostr.str().c_str());
fprintf(OutFile,"\n");
}
}

2
apt-pkg/indexcopy.cc

@ -639,7 +639,7 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList,
// Open the Release file and add it to the MetaIndex
if(!MetaIndex->Load(*I+"Release"))
{
_error->Error(MetaIndex->ErrorText.c_str());
_error->Error("%s",MetaIndex->ErrorText.c_str());
return false;
}

2
cmdline/apt-cache.cc

@ -1272,7 +1272,7 @@ bool DisplayRecord(pkgCache::VerIterator V)
/*}}}*/
// Search - Perform a search /*{{{*/
// ---------------------------------------------------------------------
/* This searches the package names and pacakge descriptions for a pattern */
/* This searches the package names and package descriptions for a pattern */
struct ExDescFile
{
pkgCache::DescFile *Df;

5
debian/changelog

@ -7,9 +7,12 @@ apt (0.7.17~exp2) experimental; urgency=low
* apt-pkg/algorithm.cc:
- Strip username and password from source URL in error message.
(Closes: #425150)
[ Michael Vogt ]
* fix various -Wall warnings
-- Eugene V. Lyubimkin <jackyf.devel@gmail.com> Fri, 24 Oct 2008 23:45:17 +0300
-- Michael Vogt <mvo@debian.org> Tue, 28 Oct 2008 18:06:38 +0100
apt (0.7.17~exp1) experimental; urgency=low

3
methods/http.cc

@ -941,7 +941,8 @@ int HttpMethod::DealWithHeaders(FetchResult &Res,ServerState *Srv)
if (Srv->StartPos >= 0)
{
Res.ResumePoint = Srv->StartPos;
ftruncate(File->Fd(),Srv->StartPos);
if (ftruncate(File->Fd(),Srv->StartPos) < 0)
_error->Errno("ftruncate", _("Failed to truncate file"));
}
// Set the start point

2
methods/https.cc

@ -249,7 +249,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
if(success != 0)
{
unlink(File->Name().c_str());
_error->Error(curl_errorstr);
_error->Error("%s", curl_errorstr);
Fail();
return true;
}

27
po/apt-all.pot

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-10-28 16:44+0100\n"
"POT-Creation-Date: 2008-10-28 18:12+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"
@ -1663,7 +1663,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr ""
#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
@ -1855,15 +1855,19 @@ msgstr ""
msgid "Error reading from server"
msgstr ""
#: methods/http.cc:1104
#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
msgid "Failed to truncate file"
msgstr ""
#: methods/http.cc:1105
msgid "Bad header data"
msgstr ""
#: methods/http.cc:1121 methods/http.cc:1176
#: methods/http.cc:1122 methods/http.cc:1177
msgid "Connection failed"
msgstr ""
#: methods/http.cc:1228
#: methods/http.cc:1229
msgid "Internal error"
msgstr ""
@ -1876,6 +1880,10 @@ msgstr ""
msgid "Couldn't make mmap of %lu bytes"
msgstr ""
#: apt-pkg/contrib/mmap.cc:213
msgid "Dynamic MMap ran out of room"
msgstr ""
#: apt-pkg/contrib/strutl.cc:1014
#, c-format
msgid "Selection %s not found"
@ -1992,12 +2000,13 @@ msgstr ""
msgid "Unable to stat the mount point %s"
msgstr ""
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
#, c-format
msgid "Unable to change to %s"
msgstr ""
#: apt-pkg/contrib/cdromutl.cc:187
#: apt-pkg/contrib/cdromutl.cc:188
msgid "Failed to stat the cdrom"
msgstr ""
@ -2274,12 +2283,12 @@ msgstr ""
#. only show the ETA if it makes sense
#. two days
#: apt-pkg/acquire.cc:827
#: apt-pkg/acquire.cc:828
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
#: apt-pkg/acquire.cc:829
#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li"
msgstr ""

Loading…
Cancel
Save