Purge some unused functions

3 files changed, 11 insertions, 90 deletions

diff --git a/src/common/nullpo.cpp b/src/common/nullpo.cpp
index 53ed37d..8aa2e6e 100644
--- a/src/common/nullpo.cpp
+++ b/src/common/nullpo.cpp
@@ -1,58 +1,10 @@
 #include "nullpo.hpp"
 
-#include <cstdarg>  // exception to "no va_list" rule
 #include <cstdio>
 #include <cstring>
 
-static
-void nullpo_info_core(const char *file, int line, const char *func);
-__attribute__((format(printf, 4, 0)))
-static
-void nullpo_info_core(const char *file, int line, const char *func,
-                              const char *fmt, va_list ap);
-
-/// Null check and print format
-bool nullpo_chk_f(const char *file, int line, const char *func,
-                   const void *target, const char *fmt, ...)
-{
-    va_list ap;
-
-    if (target)
-        return 0;
-
-    va_start(ap, fmt);
-    nullpo_info_core(file, line, func, fmt, ap);
-    va_end(ap);
-    return 1;
-}
-bool nullpo_chk(const char *file, int line, const char *func,
-                 const void *target)
-{
-    if (target)
-        return 0;
-
-    nullpo_info_core(file, line, func);
-    return 1;
-}
-
-/// External functions
-void nullpo_info_f(const char *file, int line, const char *func,
-                    const char *fmt, ...)
-{
-    va_list ap;
-
-    va_start(ap, fmt);
-    nullpo_info_core(file, line, func, fmt, ap);
-    va_end(ap);
-}
-void nullpo_info(const char *file, int line, const char *func)
-{
-    nullpo_info_core(file, line, func);
-}
-
 /// Actual output function
-static
-void nullpo_info_core(const char *file, int line, const char *func)
+void nullpo_info(const char *file, int line, const char *func)
 {
     if (!file)
         file = "??";
@@ -62,15 +14,12 @@ void nullpo_info_core(const char *file, int line, const char *func)
     fprintf(stderr, "%s:%d: in func `%s': NULL pointer\n", file, line, func);
 }
 
-static
-void nullpo_info_core(const char *file, int line, const char *func,
-                              const char *fmt, va_list ap)
+bool nullpo_chk(const char *file, int line, const char *func,
+                 const void *target)
 {
-    nullpo_info_core(file, line, func);
-    if (fmt && *fmt)
-    {
-        vfprintf(stderr, fmt, ap);
-        if (fmt[strlen(fmt) - 1] != '\n')
-            fputc('\n', stderr);
-    }
+    if (target)
+        return 0;
+
+    nullpo_info(file, line, func);
+    return 1;
 }
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
diff --git a/src/common/socket.hpp b/src/common/socket.hpp
index 08dc3f6..ac7fbae 100644
--- a/src/common/socket.hpp
+++ b/src/common/socket.hpp
@@ -20,7 +20,6 @@
 /// Done reading
 void RFIFOSKIP(int fd, size_t len);
 /// Internal - clean up by discarding handled bytes
-// Atm this is also called in char/char.c, but that is unnecessary
 # define RFIFOFLUSH(fd) (memmove(session[fd]->rdata,RFIFOP(fd,0),RFIFOREST(fd)),\
 session[fd]->rdata_size=RFIFOREST(fd),\
 session[fd]->rdata_pos=0)