diff options
author | Ben Longbons <b.r.longbons@gmail.com> | 2012-12-13 16:25:50 -0800 |
---|---|---|
committer | Ben Longbons <b.r.longbons@gmail.com> | 2012-12-14 16:18:22 -0800 |
commit | 069f39e8a1ebee3e4a4ce8302d0099842876782b (patch) | |
tree | 57d8de5f57d65878f8ef560e2884b9dee08e9323 /src/common/nullpo.cpp | |
parent | f9563edf69f083287630f4b17db70d97524196d6 (diff) | |
download | tmwa-069f39e8a1ebee3e4a4ce8302d0099842876782b.tar.gz tmwa-069f39e8a1ebee3e4a4ce8302d0099842876782b.tar.bz2 tmwa-069f39e8a1ebee3e4a4ce8302d0099842876782b.tar.xz tmwa-069f39e8a1ebee3e4a4ce8302d0099842876782b.zip |
Some formatting fixes before I go insane
Also delete the French translation from ladmin.
Diffstat (limited to 'src/common/nullpo.cpp')
-rw-r--r-- | src/common/nullpo.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/common/nullpo.cpp b/src/common/nullpo.cpp index 67c839f..ad52009 100644 --- a/src/common/nullpo.cpp +++ b/src/common/nullpo.cpp @@ -3,13 +3,13 @@ #include <string.h> #include "nullpo.hpp" -static void nullpo_info_core (const char *file, int line, const char *func); +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, +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, +bool nullpo_chk_f(const char *file, int line, const char *func, const void *target, const char *fmt, ...) { va_list ap; @@ -17,55 +17,55 @@ bool nullpo_chk_f (const char *file, int line, const char *func, if (target) return 0; - va_start (ap, fmt); - nullpo_info_core (file, line, func, fmt, ap); - va_end (ap); + 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, +bool nullpo_chk(const char *file, int line, const char *func, const void *target) { if (target) return 0; - nullpo_info_core (file, line, func); + nullpo_info_core(file, line, func); return 1; } /// External functions -void nullpo_info_f (const char *file, int line, const char *func, +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); + 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) +void nullpo_info(const char *file, int line, const char *func) { - nullpo_info_core (file, line, func); + nullpo_info_core(file, line, func); } /// Actual output function -static void nullpo_info_core (const char *file, int line, const char *func) +static void nullpo_info_core(const char *file, int line, const char *func) { if (!file) file = "??"; if (!func || !*func) func = "unknown"; - fprintf (stderr, "%s:%d: in func `%s': NULL pointer\n", file, line, 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, +static void nullpo_info_core(const char *file, int line, const char *func, const char *fmt, va_list ap) { nullpo_info_core(file, line, func); if (fmt && *fmt) { - vfprintf (stderr, fmt, ap); - if (fmt[strlen (fmt) - 1] != '\n') + vfprintf(stderr, fmt, ap); + if (fmt[strlen(fmt) - 1] != '\n') fputc('\n', stderr); } } |