summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-01-23 02:46:39 +0300
committerAndrei Karas <akaras@inbox.ru>2012-01-23 14:40:54 +0300
commitfcddd8c0dab52900ded0c4faafd635aa6416425f (patch)
treefd6b46caac9adb95654c84daaf9f476895a7d4b0
parent35bce2462822ebbab20231f05a9efe689455d736 (diff)
downloadplus-fcddd8c0dab52900ded0c4faafd635aa6416425f.tar.gz
plus-fcddd8c0dab52900ded0c4faafd635aa6416425f.tar.bz2
plus-fcddd8c0dab52900ded0c4faafd635aa6416425f.tar.xz
plus-fcddd8c0dab52900ded0c4faafd635aa6416425f.zip
Add false and true condition logging.
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/debug.h13
-rw-r--r--src/utils/checkutils.cpp39
-rw-r--r--src/utils/checkutils.h30
5 files changed, 86 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 18379fdf0..fd56c9cba 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -443,6 +443,8 @@ SET(SRCS
resources/wallpaper.h
utils/base64.cpp
utils/base64.h
+ utils/checkutils.cpp
+ utils/checkutils.h
utils/copynpaste.cpp
utils/copynpaste.h
utils/dtor.h
diff --git a/src/Makefile.am b/src/Makefile.am
index ead1224d6..6948bfcc4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -448,6 +448,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
resources/wallpaper.h \
utils/base64.cpp \
utils/base64.h \
+ utils/checkutils.cpp \
+ utils/checkutils.h \
utils/copynpaste.cpp \
utils/copynpaste.h \
utils/dtor.h \
diff --git a/src/debug.h b/src/debug.h
index 4b3934922..64a83e51c 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -23,6 +23,19 @@
//#define DEBUG_JOYSTICK 1
#ifdef ENABLE_MEM_DEBUG
+
//define _DEBUG_NEW_EMULATE_MALLOC 1
#include "debug/debug_new.h"
+
+#define reportFalse(val) reportFalse1(val, __FILE__, __LINE__)
+#define reportFalse1(val, file, line) reportFalseReal(val, file, line)
+
+#define reportTrue(val) reportTrue1(val, __FILE__, __LINE__)
+#define reportTrue1(val, file, line) reportTrueReal(val, file, line)
+
+#else
+
+#define reportFalse(val) (val)
+#define reportTrue(val) (val)
+
#endif
diff --git a/src/utils/checkutils.cpp b/src/utils/checkutils.cpp
new file mode 100644
index 000000000..64bb42d0c
--- /dev/null
+++ b/src/utils/checkutils.cpp
@@ -0,0 +1,39 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2012 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "utils/checkutils.h"
+
+#include <string.h>
+
+#include "logger.h"
+
+bool reportFalseReal(bool val, const char* file, unsigned line)
+{
+ if (!val)
+ logger->log("Debug: false value at %s:%u", file, line);
+ return val;
+}
+
+bool reportTrueReal(bool val, const char* file, unsigned line)
+{
+ if (val)
+ logger->log("Debug: true value at %s:%u", file, line);
+ return val;
+}
diff --git a/src/utils/checkutils.h b/src/utils/checkutils.h
new file mode 100644
index 000000000..6791ff7e0
--- /dev/null
+++ b/src/utils/checkutils.h
@@ -0,0 +1,30 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2012 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UTILS_CHECKUTILS_H
+#define UTILS_CHECKUTILS_H
+
+#include <string>
+
+bool reportFalseReal(bool val, const char* file, unsigned line);
+
+bool reportTrueReal(bool val, const char* file, unsigned line);
+
+#endif // UTILS_CHECKUTILS_H