diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-08-15 14:14:35 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-08-15 14:14:35 +0200 |
| commit | bb3e64527b0c1ccf3f31a5a56c21819e25f128ae (patch) | |
| tree | 0a68ed928e65b502596fcbe22dbce96a62183741 /ftparchive/override.cc | |
| parent | 11bf622600cd1a1eaeda3af64f4757fffa558ae7 (diff) | |
| parent | d4882aa1e1a37b3092950180036676a930a5792f (diff) | |
merged from the debian-sid branch
Diffstat (limited to 'ftparchive/override.cc')
| -rw-r--r-- | ftparchive/override.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ftparchive/override.cc b/ftparchive/override.cc index 3cf10b89b..bd583a66f 100644 --- a/ftparchive/override.cc +++ b/ftparchive/override.cc @@ -231,7 +231,7 @@ Override::Item* Override::GetItem(string const &Package, string const &Architect if (R->OldMaint != "") result->OldMaint = R->OldMaint; if (R->NewMaint != "") result->NewMaint = R->NewMaint; for (map<string,string>::const_iterator foI = R->FieldOverride.begin(); - foI != R->FieldOverride.end(); foI++) + foI != R->FieldOverride.end(); ++foI) { result->FieldOverride[foI->first] = foI->second; } @@ -268,7 +268,7 @@ string Override::Item::SwapMaint(string const &Orig,bool &Failed) string::const_iterator Start = End; for (; End < OldMaint.end() && (End + 3 >= OldMaint.end() || End[0] != ' ' || - End[1] != '/' || End[2] != '/'); End++); + End[1] != '/' || End[2] != '/'); ++End); if (stringcasecmp(Start,End,Orig.begin(),Orig.end()) == 0) return NewMaint; @@ -276,7 +276,7 @@ string Override::Item::SwapMaint(string const &Orig,bool &Failed) break; // Skip the divider and white space - for (; End < OldMaint.end() && (*End == '/' || *End == ' '); End++); + for (; End < OldMaint.end() && (*End == '/' || *End == ' '); ++End); } #else if (stringcasecmp(OldMaint.begin(),OldMaint.end(),Orig.begin(),Orig.end()) == 0) |