File licq-1.3.6-gcc44.patch of Package licq
Index: licq-1.3.6/src/licq.cpp
===================================================================
--- licq-1.3.6.orig/src/licq.cpp
+++ licq-1.3.6/src/licq.cpp
@@ -183,14 +183,14 @@ extern "C" void DisplayFatalError(const
/*-----Helper functions for CLicq::UpgradeLicq-----------------------------*/
int SelectUserUtility(const struct dirent *d)
{
- char *pcDot = strrchr(d->d_name, '.');
+ const char *pcDot = strrchr(d->d_name, '.');
if (pcDot == NULL) return (0);
return (strcmp(pcDot, ".uin") == 0);
}
int SelectHistoryUtility(const struct dirent *d)
{
- char *pcDot = strchr(d->d_name, '.');
+ const char *pcDot = strchr(d->d_name, '.');
if (pcDot == NULL) return (0);
return (strcmp(pcDot, ".history") == 0 ||
strcmp(pcDot, ".history.removed") == 0);
Index: licq-1.3.6/src/icqpacket.cpp
===================================================================
--- licq-1.3.6.orig/src/icqpacket.cpp
+++ licq-1.3.6/src/icqpacket.cpp
@@ -5874,7 +5874,7 @@ CPX_FileTransfer::CPX_FileTransfer(Const
}
// Remove path from filename (if it exists)
- char *pcEndOfPath = strrchr(_szFilename, '/');
+ const char *pcEndOfPath = strrchr(_szFilename, '/');
if (pcEndOfPath != NULL)
m_szFilename = strdup(pcEndOfPath + 1);
else
Index: licq-1.3.6/src/utility.cpp
===================================================================
--- licq-1.3.6.orig/src/utility.cpp
+++ licq-1.3.6/src/utility.cpp
@@ -46,7 +46,7 @@ using namespace std;
//=====CUtilityManager==========================================================
int SelectUtility(const struct dirent *d)
{
- char *pcDot = strrchr(d->d_name, '.');
+ const char *pcDot = strrchr(d->d_name, '.');
if (pcDot == NULL) return (0);
return (strcmp(pcDot, ".utility") == 0);
}
Index: licq-1.3.6/src/translate.cpp
===================================================================
--- licq-1.3.6.orig/src/translate.cpp
+++ licq-1.3.6/src/translate.cpp
@@ -76,7 +76,7 @@ void CTranslator::setDefaultTranslationM
bool CTranslator::setTranslationMap(const char* mapFileName)
{
// Map name is the file name with no path
- char* sep = strrchr(mapFileName, '/');
+ const char* sep = strrchr(mapFileName, '/');
const char* mapName = (sep == NULL ? mapFileName : sep + 1);
if (strcmp(mapName, "LATIN_1") == 0)
Index: licq-1.3.6/src/file.cpp
===================================================================
--- licq-1.3.6.orig/src/file.cpp
+++ licq-1.3.6/src/file.cpp
@@ -552,7 +552,7 @@ char *CIniFile::GetDataFromLine(char *_s
bool bTrim, int _nMax)
{
//static char s_szData[MAX_LINE_LEN];
- char *szPostEquals;
+ const char *szPostEquals;
char szData[MAX_LINE_LEN];
int nMax = (_nMax > 0 ? _nMax : MAX_LINE_LEN);
Index: licq-1.3.6/src/icqd-filetransfer.cpp
===================================================================
--- licq-1.3.6.orig/src/icqd-filetransfer.cpp
+++ licq-1.3.6/src/icqd-filetransfer.cpp
@@ -102,7 +102,7 @@ CPFile_Info::CPFile_Info(const char *_sz
m_bValid = true;
m_nError = 0;
- char *pcNoPath = NULL;
+ const char *pcNoPath = NULL;
struct stat buf;
// Remove any path from the filename
Index: licq-1.3.6/src/rtf.cc
===================================================================
--- licq-1.3.6.orig/src/rtf.cc
+++ licq-1.3.6/src/rtf.cc
@@ -2141,7 +2141,7 @@ void Level::setText(const char *str)
return;
}
if (m_bFontName){
- char *pp = strchr(str, ';');
+ const char *pp = strchr(str, ';');
unsigned size = strlen(pp);
if (pp){
size = (pp - str);
Index: licq-1.3.6/src/rtf.ll
===================================================================
--- licq-1.3.6.orig/src/rtf.ll
+++ licq-1.3.6/src/rtf.ll
@@ -541,7 +541,7 @@ void Level::setText(const char *str)
return;
}
if (m_bFontName){
- char *pp = strchr(str, ';');
+ const char *pp = strchr(str, ';');
unsigned size = strlen(pp);
if (pp){
size = (pp - str);
Index: licq-1.3.6/plugins/msn/src/msn-ssl.cpp
===================================================================
--- licq-1.3.6.orig/plugins/msn/src/msn-ssl.cpp
+++ licq-1.3.6/plugins/msn/src/msn-ssl.cpp
@@ -68,7 +68,7 @@ void CMSN::ProcessSSLServerPacket(CMSNBu
if (strFirstLine == "HTTP/1.1 200 OK")
{
m_pSSLPacket->ParseHeaders();
- char *fromPP = strstr(m_pSSLPacket->GetValue("Authentication-Info").c_str(), "from-PP=");
+ const char *fromPP = strstr(m_pSSLPacket->GetValue("Authentication-Info").c_str(), "from-PP=");
char *tag;
if (fromPP == 0)
@@ -76,7 +76,7 @@ void CMSN::ProcessSSLServerPacket(CMSNBu
else
{
fromPP+= 9; // skip to the tag
- char *endTag = strchr(fromPP, '\'');
+ const char *endTag = strchr(fromPP, '\'');
tag = strndup(fromPP, endTag - fromPP); // Thanks, this is all we need
}
@@ -146,7 +146,7 @@ void CMSN::ProcessNexusPacket(CMSNBuffer
m_pNexusBuff->ParseHeaders();
- char *szLogin = strstr(m_pNexusBuff->GetValue("PassportURLs").c_str(), "DALogin=");
+ const char *szLogin = strstr(m_pNexusBuff->GetValue("PassportURLs").c_str(), "DALogin=");
szLogin += 8; // skip to the tag
//char *szEndURL = strchr(szLogin, '/');
//char *szServer = strndup(szLogin, szEndURL - szLogin); // this is all we need
Index: licq-1.3.6/plugins/msn/src/msn-sb.cpp
===================================================================
--- licq-1.3.6.orig/plugins/msn/src/msn-sb.cpp
+++ licq-1.3.6/plugins/msn/src/msn-sb.cpp
@@ -441,7 +441,7 @@ bool CMSN::MSNSBConnectStart(const strin
const char *szParam = strServer.c_str();
char szServer[16];
char *szPort;
- if ((szPort = strchr(szParam, ':')))
+ if ((szPort = (char*)strchr(szParam, ':')))
{
strncpy(szServer, szParam, szPort - szParam);
szServer[szPort - szParam] = '\0';
@@ -504,7 +504,7 @@ bool CMSN::MSNSBConnectAnswer(const stri
const char *szParam = strServer.c_str();
char szServer[16];
char *szPort;
- if ((szPort = strchr(szParam, ':')))
+ if ((szPort = (char*)strchr(szParam, ':')))
{
strncpy(szServer, szParam, szPort - szParam);
szServer[szPort - szParam] = '\0';
Index: licq-1.3.6/plugins/msn/src/msn-srv.cpp
===================================================================
--- licq-1.3.6.orig/plugins/msn/src/msn-srv.cpp
+++ licq-1.3.6/plugins/msn/src/msn-srv.cpp
@@ -76,7 +76,7 @@ void CMSN::ProcessServerPacket(CMSNBuffe
const char *szParam = strServer.c_str();
char szNewServer[16];
char *szPort;
- if ((szPort = strchr(szParam, ':')))
+ if ((szPort = (char*)strchr(szParam, ':')))
{
strncpy(szNewServer, szParam, szPort - szParam);
szNewServer[szPort - szParam] = '\0';
