Группа :: Сети/WWW
Пакет: hammerhead
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: hammerhead-2.1.3-alt-gcc4.3_fix.patch
Скачать
Скачать
Fix error and warnings when building with GCC 4.3
--- src/config.cc
+++ src/config.cc
@@ -61,7 +61,7 @@ int SelectOn = SO_SCN; /* select on scenarios */
int LogTimeFormat = TF_STRING;
-char *SO_Names[] = {
+const char* SO_Names[] = {
"",
"scenario",
"sequence"
--- src/config.h
+++ src/config.h
@@ -47,7 +47,7 @@
#endif
#endif
-extern char *SO_Names[];
+extern const char* SO_Names[];
extern int DNSTTLExpired;
extern int DNSTimeToLive;
--- src/if.h
+++ src/if.h
@@ -12,6 +12,7 @@
#ifndef _IF_H
#define _IF_H
+#include <cstring>
#include <stdio.h>
#include <errno.h>
#ifdef __WIN32__
--- src/scenario.cc
+++ src/scenario.cc
@@ -185,7 +185,7 @@ bool Scenario::Restore(const char * nme, FILE * fp)
next.push_back(strP);
break;
case 'T': /* think time (milliseconds) */
- if (buf == "_exit")
+ if (strcmp(buf,"_exit") == 0)
{
// it's an exiting scenario
terminate = true;
--- src/str.cc
+++ src/str.cc
@@ -309,7 +309,7 @@ string topntail(const string& str)
string lowercase(const string& instr)
{
string InStr = instr;
- transform(InStr.begin(), InStr.end(), InStr.begin(), (int(*)(int))tolower);
+ std::transform(InStr.begin(), InStr.end(), InStr.begin(), (int(*)(int)) tolower);
return InStr;
}
--- utils/convertLog.cc
+++ utils/convertLog.cc
@@ -12,9 +12,10 @@
// Purpose: Convert a log file into a set of scenarios
//
+#include <cstdlib>
#include <time.h>
#include <stdio.h>
-#include <iostream.h>
+#include <iostream>
#include <string.h>
#include <sys/types.h>
@@ -69,7 +70,7 @@ printScenario(FILE *outF, const String& ipA, const String& ipR, long thinkT, int
}
-main(int argc, char *argv[])
+int main(int argc, char *argv[])
{
if (argc != 3)
{
@@ -263,4 +264,5 @@ main(int argc, char *argv[])
}
delete allElements;
cerr << "\n\n";
+ return 0;
}
--- utils/strptime.cc
+++ utils/strptime.cc
@@ -404,11 +404,13 @@ strptime_internal (const char * buf, const char * format,
*decided = raw;
}
#endif
- if (!match_string (HERE_AM_STR, rp))
- if (match_string (HERE_PM_STR, rp))
- is_pm = 1;
- else
- return NULL;
+ if (!match_string (HERE_AM_STR, rp))
+ {
+ if (match_string (HERE_PM_STR, rp))
+ is_pm = 1;
+ else
+ return NULL;
+ }
break;
case 'r':
#ifdef _NL_CURRENT