From 634aeeb9d58b01f9de6632a014a063ef0c4cf31e Mon Sep 17 00:00:00 2001 From: Chuck Miller Date: Fri, 25 Dec 2009 05:00:31 -0500 Subject: Used the "indent" C formatting program from GNU to do some clean ups The command options used was: -nbad -bap -sc -bl -blf -bli0 -cli4 -cbi0 -di5 -nbc -bls -ip2 -nut -ts4 -bap -i4 -sob -npsl --- src/common/nullpo.c | 110 +++++++++++++++++++++++++--------------------------- 1 file changed, 53 insertions(+), 57 deletions(-) (limited to 'src/common/nullpo.c') diff --git a/src/common/nullpo.c b/src/common/nullpo.c index 5fbf5fc..daeca9f 100644 --- a/src/common/nullpo.c +++ b/src/common/nullpo.c @@ -4,87 +4,83 @@ #include "nullpo.h" // #include "logs.h" // 布石してみる -static void nullpo_info_core(const char *file, int line, const char *func, - const char *fmt, va_list ap); +static void nullpo_info_core (const char *file, int line, const char *func, + const char *fmt, va_list ap); /*====================================== * Nullチェック 及び 情報出力 *-------------------------------------- */ -int nullpo_chk_f(const char *file, int line, const char *func, const void *target, - const char *fmt, ...) +int nullpo_chk_f (const char *file, int line, const char *func, + const void *target, const char *fmt, ...) { - va_list ap; - - if (target != NULL) - return 0; - - va_start(ap, fmt); - nullpo_info_core(file, line, func, fmt, ap); - va_end(ap); - return 1; + va_list ap; + + if (target != NULL) + return 0; + + va_start (ap, fmt); + nullpo_info_core (file, line, func, fmt, ap); + va_end (ap); + return 1; } -int nullpo_chk(const char *file, int line, const char *func, const void *target) +int nullpo_chk (const char *file, int line, const char *func, + const void *target) { - if (target != NULL) - return 0; - - nullpo_info_core(file, line, func, NULL, NULL); - return 1; -} + if (target != NULL) + return 0; + nullpo_info_core (file, line, func, NULL, NULL); + return 1; +} /*====================================== * nullpo情報出力(外部呼出し向けラッパ) *-------------------------------------- */ -void nullpo_info_f(const char *file, int line, const char *func, - const char *fmt, ...) +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_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) +void nullpo_info (const char *file, int line, const char *func) { - nullpo_info_core(file, line, func, NULL, NULL); + nullpo_info_core (file, line, func, NULL, NULL); } - /*====================================== * nullpo情報出力(Main) *-------------------------------------- */ -static void nullpo_info_core(const char *file, int line, const char *func, - const char *fmt, va_list ap) +static void nullpo_info_core (const char *file, int line, const char *func, + const char *fmt, va_list ap) { - if (file == NULL) - file = "??"; - - func = - func == NULL ? "unknown": - func[0] == '\0' ? "unknown": - func; - - printf("--- nullpo info --------------------------------------------\n"); - printf("%s:%d: in func `%s'\n", file, line, func); - if (fmt != NULL) - { - if (fmt[0] != '\0') - { - vprintf(fmt, ap); - - // 最後に改行したか確認 - if (fmt[strlen(fmt)-1] != '\n') - printf("\n"); - } - } - printf("--- end nullpo info ----------------------------------------\n"); - - // ここらでnullpoログをファイルに書き出せたら - // まとめて提出できるなと思っていたり。 + if (file == NULL) + file = "??"; + + func = func == NULL ? "unknown" : func[0] == '\0' ? "unknown" : func; + + printf ("--- nullpo info --------------------------------------------\n"); + printf ("%s:%d: in func `%s'\n", file, line, func); + if (fmt != NULL) + { + if (fmt[0] != '\0') + { + vprintf (fmt, ap); + + // 最後に改行したか確認 + if (fmt[strlen (fmt) - 1] != '\n') + printf ("\n"); + } + } + printf ("--- end nullpo info ----------------------------------------\n"); + + // ここらでnullpoログをファイルに書き出せたら + // まとめて提出できるなと思っていたり。 } -- cgit v1.2.3-70-g09d2