summaryrefslogtreecommitdiff
path: root/src/utils
diff options
context:
space:
mode:
Diffstat (limited to 'src/utils')
-rw-r--r--src/utils/copynpaste.cpp2
-rw-r--r--src/utils/dumpsizes.cpp2
-rw-r--r--src/utils/itemxmlutils.cpp4
-rw-r--r--src/utils/pnglib.cpp8
-rw-r--r--src/utils/sdl2logger.cpp4
-rw-r--r--src/utils/sdlhelper.cpp4
-rw-r--r--src/utils/translation/translationmanager.cpp6
-rw-r--r--src/utils/xml/libxml.cpp10
-rw-r--r--src/utils/xml/pugixml.cpp6
-rw-r--r--src/utils/xml/tinyxml2.cpp6
10 files changed, 26 insertions, 26 deletions
diff --git a/src/utils/copynpaste.cpp b/src/utils/copynpaste.cpp
index 3b2b4ae8a..942801de2 100644
--- a/src/utils/copynpaste.cpp
+++ b/src/utils/copynpaste.cpp
@@ -387,7 +387,7 @@ bool retrieveBuffer(std::string& text, size_t& pos)
{
SDL_SysWMinfo info;
- SDL_VERSION(&info.version);
+ SDL_VERSION(&info.version)
if (SDL::getWindowWMInfo(mainGraphics->getWindow(), &info))
{
Display *const dpy = info.info.x11.display;
diff --git a/src/utils/dumpsizes.cpp b/src/utils/dumpsizes.cpp
index f1a9a613a..8275133a5 100644
--- a/src/utils/dumpsizes.cpp
+++ b/src/utils/dumpsizes.cpp
@@ -27,7 +27,7 @@
#include "debug.h"
#define dumpSize(str) \
- logger->log(" sizeof("#str"): %d", CAST_S32(sizeof(str)));
+ logger->log(" sizeof("#str"): %d", CAST_S32(sizeof(str)))
void dumpSizes()
{
diff --git a/src/utils/itemxmlutils.cpp b/src/utils/itemxmlutils.cpp
index 8ecbeeda6..ac8e48e2b 100644
--- a/src/utils/itemxmlutils.cpp
+++ b/src/utils/itemxmlutils.cpp
@@ -81,7 +81,7 @@ void readItemStatsString(std::string &effect,
{
if (translator == nullptr)
{
- reportAlways("called readItemStatsString without translator");
+ reportAlways("called readItemStatsString without translator")
return;
}
@@ -102,7 +102,7 @@ void readItemStatsVector(STD_VECTOR<std::string> &effect,
{
if (translator == nullptr)
{
- reportAlways("called readItemStatsVector without translator");
+ reportAlways("called readItemStatsVector without translator")
return;
}
diff --git a/src/utils/pnglib.cpp b/src/utils/pnglib.cpp
index 4393be3e2..6d591515d 100644
--- a/src/utils/pnglib.cpp
+++ b/src/utils/pnglib.cpp
@@ -47,7 +47,7 @@ bool PngLib::writePNG(SDL_Surface *const surface,
nullptr, nullptr, nullptr);
if (png_ptr == nullptr)
{
- reportAlways("Had trouble creating png_structp");
+ reportAlways("Had trouble creating png_structp")
return false;
}
@@ -55,14 +55,14 @@ bool PngLib::writePNG(SDL_Surface *const surface,
if (info_ptr == nullptr)
{
png_destroy_write_struct(&png_ptr, static_cast<png_infopp>(nullptr));
- reportAlways("Could not create png_info");
+ reportAlways("Could not create png_info")
return false;
}
if (setjmp(png_jmpbuf(png_ptr)))
{
png_destroy_write_struct(&png_ptr, &info_ptr);
- reportAlways("problem writing to %s", filename.c_str());
+ reportAlways("problem writing to %s", filename.c_str())
return false;
}
@@ -70,7 +70,7 @@ bool PngLib::writePNG(SDL_Surface *const surface,
if (fp == nullptr)
{
reportAlways("could not open file %s for writing",
- filename.c_str());
+ filename.c_str())
return false;
}
diff --git a/src/utils/sdl2logger.cpp b/src/utils/sdl2logger.cpp
index 16d8aa7d0..8bba68d6d 100644
--- a/src/utils/sdl2logger.cpp
+++ b/src/utils/sdl2logger.cpp
@@ -117,7 +117,7 @@ static void logCallback(void *userData A_UNUSED,
}
reportAlways("%s %s",
message.c_str(),
- msg);
+ msg)
}
static SDL_AssertState assertCallback(const SDL_AssertData *data,
@@ -128,7 +128,7 @@ static SDL_AssertState assertCallback(const SDL_AssertData *data,
data->function,
data->filename,
data->linenum,
- data->condition);
+ data->condition)
return SDL_ASSERTION_IGNORE;
}
diff --git a/src/utils/sdlhelper.cpp b/src/utils/sdlhelper.cpp
index 474840d2a..7e10352f4 100644
--- a/src/utils/sdlhelper.cpp
+++ b/src/utils/sdlhelper.cpp
@@ -128,7 +128,7 @@ void *SDL::createGLContext(SDL_Surface *const window A_UNUSED,
const int profile)
{
SDL_SysWMinfo info;
- SDL_VERSION(&info.version);
+ SDL_VERSION(&info.version)
SDL_GetWMInfo(&info);
void *context = GlxHelper::createContext(info.info.x11.window,
info.info.x11.display, major, minor, profile);
@@ -162,7 +162,7 @@ void *SDL::createGLContext(SDL_Surface *const window A_UNUSED,
void SDL::makeCurrentContext(void *const context)
{
SDL_SysWMinfo info;
- SDL_VERSION(&info.version);
+ SDL_VERSION(&info.version)
SDL_GetWMInfo(&info);
GlxHelper::makeCurrent(info.info.x11.window,
info.info.x11.display,
diff --git a/src/utils/translation/translationmanager.cpp b/src/utils/translation/translationmanager.cpp
index 5b1c2d67a..0f691f5f8 100644
--- a/src/utils/translation/translationmanager.cpp
+++ b/src/utils/translation/translationmanager.cpp
@@ -66,9 +66,9 @@ void TranslationManager::loadGettextLang()
void TranslationManager::close()
{
- delete2(translator);
- delete2(dictionary);
- delete2(reverseDictionary);
+ delete2(translator)
+ delete2(dictionary)
+ delete2(reverseDictionary)
}
PoDict *TranslationManager::loadLang(const LangVect &lang,
diff --git a/src/utils/xml/libxml.cpp b/src/utils/xml/libxml.cpp
index 7fcdfd7fc..a4c1ea7ba 100644
--- a/src/utils/xml/libxml.cpp
+++ b/src/utils/xml/libxml.cpp
@@ -118,7 +118,7 @@ namespace XML
if (size < 0)
{
reportAlways("Error loading XML file %s",
- filename.c_str());
+ filename.c_str())
}
else
{
@@ -131,7 +131,7 @@ namespace XML
else if (skipError == SkipError_false)
{
reportAlways("Error loading XML file %s",
- filename.c_str());
+ filename.c_str())
}
}
@@ -142,12 +142,12 @@ namespace XML
if (mDoc == nullptr)
{
- reportAlways("Error parsing XML file %s", filename.c_str());
+ reportAlways("Error parsing XML file %s", filename.c_str())
}
}
else if (skipError == SkipError_false)
{
- reportAlways("Error loading XML file %s", filename.c_str());
+ reportAlways("Error loading XML file %s", filename.c_str())
}
mIsValid = valid;
BLOCK_END("XML::Document::Document")
@@ -304,7 +304,7 @@ namespace XML
void initXML()
{
xmlInitParser();
- LIBXML_TEST_VERSION;
+ LIBXML_TEST_VERSION
// Suppress libxml2 error messages
xmlSetGenericErrorFunc(nullptr, &xmlErrorLogger);
diff --git a/src/utils/xml/pugixml.cpp b/src/utils/xml/pugixml.cpp
index 4919b34a8..dfc40a970 100644
--- a/src/utils/xml/pugixml.cpp
+++ b/src/utils/xml/pugixml.cpp
@@ -96,7 +96,7 @@ namespace XML
if (size < 0)
{
reportAlways("Error loading XML file %s",
- filename.c_str());
+ filename.c_str())
}
else
{
@@ -109,7 +109,7 @@ namespace XML
else if (skipError == SkipError_false)
{
reportAlways("Error loading XML file %s",
- filename.c_str());
+ filename.c_str())
}
}
@@ -135,7 +135,7 @@ namespace XML
}
else if (skipError == SkipError_false)
{
- reportAlways("Error loading %s", filename.c_str());
+ reportAlways("Error loading %s", filename.c_str())
}
mIsValid = valid;
BLOCK_END("XML::Document::Document")
diff --git a/src/utils/xml/tinyxml2.cpp b/src/utils/xml/tinyxml2.cpp
index 48ea9c891..99fa09001 100644
--- a/src/utils/xml/tinyxml2.cpp
+++ b/src/utils/xml/tinyxml2.cpp
@@ -95,7 +95,7 @@ namespace XML
if (size < 0)
{
reportAlways("Error loading XML file %s",
- filename.c_str());
+ filename.c_str())
}
else
{
@@ -108,7 +108,7 @@ namespace XML
else if (skipError == SkipError_false)
{
reportAlways("Error loading XML file %s",
- filename.c_str());
+ filename.c_str())
}
}
@@ -128,7 +128,7 @@ namespace XML
}
else if (skipError == SkipError_false)
{
- reportAlways("Error loading %s", filename.c_str());
+ reportAlways("Error loading %s", filename.c_str())
}
mIsValid = valid;
BLOCK_END("XML::Document::Document")
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-05 20:30:53 +0000