Purge some unused functions

1 files changed, 3 insertions, 30 deletions

diff --git a/src/common/nullpo.hpp b/src/common/nullpo.hpp
index 25ab2b9..b729d94 100644
--- a/src/common/nullpo.hpp
+++ b/src/common/nullpo.hpp
@@ -12,50 +12,23 @@
 
 # ifdef NULLPO_CHECK
 # define NLP_MARK __FILE__, __LINE__, __func__
-#  define nullpo_ret(t) \
-    if (nullpo_chk(NLP_MARK, t)) \
-        return 0;
-#  define nullpo_retv(t) \
-    if (nullpo_chk(NLP_MARK, t)) \
-        return;
 #  define nullpo_retr(ret, t) \
     if (nullpo_chk(NLP_MARK, t)) \
         return ret;
-#  define nullpo_ret_f(t, fmt, ...) \
-    if (nullpo_chk_f(NLP_MARK, t, fmt, ##__VA_ARGS__)) \
-        return 0;
-#  define nullpo_retv_f(t, fmt, ...) \
-    if (nullpo_chk_f(NLP_MARK, t, fmt, ##__VA_ARGS__)) \
-        return;
-#  define nullpo_retr_f(ret, t, fmt, ...) \
-    if (nullpo_chk_f(NLP_MARK, t, fmt, ##__VA_ARGS__)) \
-        return ret;
 # else // NULLPO_CHECK
-#  define nullpo_ret(t) t;
-#  define nullpo_retv(t) t;
 #  define nullpo_retr(ret, t) t;
-#  define nullpo_ret_f(t, fmt, ...) t;
-#  define nullpo_retv_f(t, fmt, ...) t;
-#  define nullpo_retr_f(ret, t, fmt, ...) t;
 # endif // NULLPO_CHECK
 
+# define nullpo_ret(t) nullpo_retr(0, t)
+# define nullpo_retv(t) nullpo_retr(, t)
+
 # include "sanity.hpp"
 
 /// Used by macros in this header
 bool nullpo_chk(const char *file, int line, const char *func,
                  const void *target);
 
-/// Used by macros in this header
-bool nullpo_chk_f(const char *file, int line, const char *func,
-                   const void *target, const char *fmt, ...)
-    __attribute__((format(printf, 5, 6)));
-
 /// Used only by map/battle.c
 void nullpo_info(const char *file, int line, const char *func);
 
-/// Not used
-void nullpo_info_f(const char *file, int line, const char *func,
-                    const char *fmt, ...)
-    __attribute__((format(printf, 4, 5)));
-
 #endif // NULLPO_HPP