jmq/prt-get
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix misc compile warnings

Browse Source
This commit is contained in:
John McQuah 2023-06-09 14:32:02 -04:00
parent 211fe43fd9
commit e504cf66d3
7 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/installtransaction.cpp
View File

@ -717,7 +717,7 @@ string InstallTransaction::getPkgmkSettingFromFile(const string& setting, const
if (p) { if (p) {
fgets(line, 256, p); fgets(line, 256, p);
value = StringHelper::stripWhiteSpace(line); value = StringHelper::stripWhiteSpace(line);
fclose(p); pclose(p);
} }
} }

14
src/package.cpp
View File

@ -124,7 +124,7 @@ const string& Package::maintainer() const
} }
/*! \return whether or not this package has a readme file */ /*! \return whether or not this package has a readme file */
const bool Package::hasReadme() const bool Package::hasReadme() const
{ {
load(); load();
return m_data->hasReadme; return m_data->hasReadme;
@ -137,12 +137,12 @@ string Package::versionReleaseString() const
return m_data->versionReleaseString; return m_data->versionReleaseString;
} }
const bool Package::hasPreInstall() const bool Package::hasPreInstall() const
{ {
return m_data->hasPreInstall; return m_data->hasPreInstall;
} }
const bool Package::hasPostInstall() const bool Package::hasPostInstall() const
{ {
return m_data->hasPostInstall; return m_data->hasPostInstall;
} }
@ -345,11 +345,9 @@ void Package::expandShellCommands(std::string& input,
pos = 0; pos = 0;
while ((pos = input.find(startTag[i], pos)) != string::npos) { while ((pos = input.find(startTag[i], pos)) != string::npos) {
if (unameBuf.release) { input = replaceAll(input,
input = replaceAll(input, startTag[i] + "uname -r" + endTag[i],
startTag[i] + "uname -r" + endTag[i], unameBuf.release);
unameBuf.release);
}
dpos = input.find(startTag[i] + "date"); dpos = input.find(startTag[i] + "date");
if (dpos != string::npos) { if (dpos != string::npos) {

6
src/package.h
View File

@ -52,9 +52,9 @@ public:
const std::string& url() const; const std::string& url() const;
const std::string& optionals() const; const std::string& optionals() const;
const std::string& maintainer() const; const std::string& maintainer() const;
const bool hasReadme() const; bool hasReadme() const;
const bool hasPreInstall() const; bool hasPreInstall() const;
const bool hasPostInstall() const; bool hasPostInstall() const;
std::string versionReleaseString() const; std::string versionReleaseString() const;

2
src/prtget.cpp
View File

@ -1676,7 +1676,7 @@ void PrtGet::current()
m_returnValue = 1; m_returnValue = 1;
} }
SignalHandler::HandlerResult PrtGet::handleSignal( int signal ) SignalHandler::HandlerResult PrtGet::handleSignal()
{ {
// TODO: second argument could also be true: // TODO: second argument could also be true:
// TODO: kill installtransaction // TODO: kill installtransaction

2
src/prtget.h
View File

@ -92,7 +92,7 @@ public:
int returnValue() const; int returnValue() const;
SignalHandler::HandlerResult handleSignal( int signal ); SignalHandler::HandlerResult handleSignal();
protected: protected:

2
src/signaldispatcher.cpp
View File

@ -36,7 +36,7 @@ void SignalDispatcher::dispatch( int signalNumber )
map<int, SignalHandler*>::iterator it = map<int, SignalHandler*>::iterator it =
SignalDispatcher::instance()->m_signalHandlers.find( signalNumber ); SignalDispatcher::instance()->m_signalHandlers.find( signalNumber );
if ( it != SignalDispatcher::instance()->m_signalHandlers.end() ) { if ( it != SignalDispatcher::instance()->m_signalHandlers.end() ) {
it->second->handleSignal( signalNumber ); it->second->handleSignal();
} else { } else {
cerr << "prt-get: caught signal " << signalNumber << endl; cerr << "prt-get: caught signal " << signalNumber << endl;
} }

2
src/signaldispatcher.h
View File

@ -28,7 +28,7 @@ public:
EXIT, /*!< signal handled, exit now */ EXIT, /*!< signal handled, exit now */
CONTINUE /*!< signal handled, don't exit */ CONTINUE /*!< signal handled, don't exit */
}; };
virtual HandlerResult handleSignal( int signalNumber ) = 0; virtual HandlerResult handleSignal() = 0;
}; };
/*! /*!