diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2014-02-25 22:30:39 +0100 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2014-03-13 13:58:45 +0100 |
| commit | 6298ff8b6492e2071a8f2ca7669a3aeef0fb29c7 (patch) | |
| tree | e2b48e6edada0dbebcfadd14daaa727b1783a982 | |
| parent | 67c3067f1a615fd6ff0b332c2a526d052442913d (diff) | |
| download | apt-6298ff8b6492e2071a8f2ca7669a3aeef0fb29c7.tar.gz | |
fix -Wformat= warnings about size_t != %lu on e.g. armel
Git-Dch: Ignore
Reported-By: gcc
| -rw-r--r-- | apt-private/private-show.cc | 5 | ||||
| -rw-r--r-- | methods/rred.cc | 12 |
2 files changed, 9 insertions, 8 deletions
diff --git a/apt-private/private-show.cc b/apt-private/private-show.cc index 9e4bbd35..0a69debb 100644 --- a/apt-private/private-show.cc +++ b/apt-private/private-show.cc @@ -148,8 +148,9 @@ bool ShowPackage(CommandLine &CmdL) /*{{{*/ if (select == APT::VersionList::CANDIDATE) { APT::VersionList const verset_all = APT::VersionList::FromCommandLine(CacheFile, CmdL.FileList + 1, APT::VersionList::ALL, helper); - if (verset_all.size() > verset.size()) - _error->Notice(ngettext("There is %lu additional record. Please use the '-a' switch to see it", "There are %lu additional records. Please use the '-a' switch to see them.", verset_all.size() - verset.size()), verset_all.size() - verset.size()); + int const records = verset_all.size() - verset.size(); + if (records > 0) + _error->Notice(P_("There is %i additional record. Please use the '-a' switch to see it", "There are %i additional records. Please use the '-a' switch to see them.", records), records); } for (APT::PackageSet::const_iterator Pkg = helper.virtualPkgs.begin(); diff --git a/methods/rred.cc b/methods/rred.cc index fe7ef732..7169fc73 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -469,7 +469,7 @@ class Patch { void write_diff(FILE *f) { - size_t line = 0; + unsigned long long line = 0; std::list<struct Change>::reverse_iterator ch; for (ch = filechanges.rbegin(); ch != filechanges.rend(); ++ch) { line += ch->offset + ch->del_cnt; @@ -482,11 +482,11 @@ class Patch { line -= ch->del_cnt; if (ch->add_cnt > 0) { if (ch->del_cnt == 0) { - fprintf(f, "%lua\n", line); + fprintf(f, "%llua\n", line); } else if (ch->del_cnt == 1) { - fprintf(f, "%luc\n", line+1); + fprintf(f, "%lluc\n", line+1); } else { - fprintf(f, "%lu,%luc\n", line+1, line+ch->del_cnt); + fprintf(f, "%llu,%lluc\n", line+1, line+ch->del_cnt); } mg_i = ch; @@ -496,9 +496,9 @@ class Patch { fprintf(f, ".\n"); } else if (ch->del_cnt == 1) { - fprintf(f, "%lud\n", line+1); + fprintf(f, "%llud\n", line+1); } else if (ch->del_cnt > 1) { - fprintf(f, "%lu,%lud\n", line+1, line+ch->del_cnt); + fprintf(f, "%llu,%llud\n", line+1, line+ch->del_cnt); } line -= ch->offset; } |