64 lines
1.9 KiB
Diff
64 lines
1.9 KiB
Diff
Fix build errors on gcc 4.7:
|
|
|
|
deb/deblistparser.cc: In member function 'virtual short unsigned int debListParser::VersionHash()':
|
|
deb/deblistparser.cc:212:13: error: redeclaration of 'char* I'
|
|
deb/deblistparser.cc:202:22: error: 'const char** I' previously declared here
|
|
|
|
Upstream-Status: Backport
|
|
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|
|
---
|
|
apt-pkg/deb/deblistparser.cc | 10 +++++-----
|
|
cmdline/apt-get.cc | 8 ++++----
|
|
2 files changed, 9 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
|
|
--- a/apt-pkg/deb/deblistparser.cc
|
|
+++ b/apt-pkg/deb/deblistparser.cc
|
|
@@ -209,18 +209,18 @@ unsigned short debListParser::VersionHash()
|
|
/* Strip out any spaces from the text, this undoes dpkgs reformatting
|
|
of certain fields. dpkg also has the rather interesting notion of
|
|
reformatting depends operators < -> <= */
|
|
- char *I = S;
|
|
+ char *J = S;
|
|
for (; Start != End; Start++)
|
|
{
|
|
if (isspace(*Start) == 0)
|
|
- *I++ = tolower(*Start);
|
|
+ *J++ = tolower(*Start);
|
|
if (*Start == '<' && Start[1] != '<' && Start[1] != '=')
|
|
- *I++ = '=';
|
|
+ *J++ = '=';
|
|
if (*Start == '>' && Start[1] != '>' && Start[1] != '=')
|
|
- *I++ = '=';
|
|
+ *J++ = '=';
|
|
}
|
|
|
|
- Result = AddCRC16(Result,S,I - S);
|
|
+ Result = AddCRC16(Result,S,J - S);
|
|
}
|
|
|
|
return Result;
|
|
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
|
|
--- a/cmdline/apt-get.cc
|
|
+++ b/cmdline/apt-get.cc
|
|
@@ -1752,12 +1752,12 @@ bool DoInstall(CommandLine &CmdL)
|
|
if ((*Cache)[I].Install() == false)
|
|
continue;
|
|
|
|
- const char **J;
|
|
- for (J = CmdL.FileList + 1; *J != 0; J++)
|
|
- if (strcmp(*J,I.Name()) == 0)
|
|
+ const char **K;
|
|
+ for (K = CmdL.FileList + 1; *K != 0; K++)
|
|
+ if (strcmp(*K,I.Name()) == 0)
|
|
break;
|
|
|
|
- if (*J == 0) {
|
|
+ if (*K == 0) {
|
|
List += string(I.Name()) + " ";
|
|
VersionsList += string(Cache[I].CandVersion) + "\n";
|
|
}
|
|
--
|
|
1.7.1
|
|
|