From: Michael Stapelberg Date: Mon, 29 Nov 2010 21:28:23 +0000 (+0100) Subject: log.c: fix indenting X-Git-Tag: tree-pr1~6 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5625a2f17f14e0a789334e4bb2b1bb8b2714336f;p=i3%2Fi3 log.c: fix indenting --- diff --git a/src/log.c b/src/log.c index a899efcb..0371e9be 100644 --- a/src/log.c +++ b/src/log.c @@ -1,9 +1,9 @@ /* - * vim:ts=8:expandtab + * vim:ts=4:sw=4:expandtab * * i3 - an improved dynamic tiling window manager * - * © 2009 Michael Stapelberg and contributors + * © 2009-2010 Michael Stapelberg and contributors * * See file LICENSE for license information. * @@ -24,37 +24,37 @@ static uint64_t loglevel = 0; static bool verbose = true; -/** +/* * Set verbosity of i3. If verbose is set to true, informative messages will * be printed to stdout. If verbose is set to false, only errors will be * printed. * */ void set_verbosity(bool _verbose) { - verbose = _verbose; + verbose = _verbose; } -/** +/* * Enables the given loglevel. * */ void add_loglevel(const char *level) { - /* Handle the special loglevel "all" */ - if (strcasecmp(level, "all") == 0) { - loglevel = UINT64_MAX; - return; - } - - for (int i = 0; i < sizeof(loglevels) / sizeof(char*); i++) { - if (strcasecmp(loglevels[i], level) != 0) - continue; - - /* The position in the array (plus one) is the amount of times - * which we need to shift 1 to the left to get our bitmask for - * the specific loglevel. */ - loglevel |= (1 << (i+1)); - break; - } + /* Handle the special loglevel "all" */ + if (strcasecmp(level, "all") == 0) { + loglevel = UINT64_MAX; + return; + } + + for (int i = 0; i < sizeof(loglevels) / sizeof(char*); i++) { + if (strcasecmp(loglevels[i], level) != 0) + continue; + + /* The position in the array (plus one) is the amount of times + * which we need to shift 1 to the left to get our bitmask for + * the specific loglevel. */ + loglevel |= (1 << (i+1)); + break; + } } /* @@ -63,44 +63,44 @@ void add_loglevel(const char *level) { * */ void vlog(char *fmt, va_list args) { - char timebuf[64]; - - /* Get current time */ - time_t t = time(NULL); - /* Convert time to local time (determined by the locale) */ - struct tm *tmp = localtime(&t); - /* Generate time prefix */ - strftime(timebuf, sizeof(timebuf), "%x %X - ", tmp); - printf("%s", timebuf); - vprintf(fmt, args); + char timebuf[64]; + + /* Get current time */ + time_t t = time(NULL); + /* Convert time to local time (determined by the locale) */ + struct tm *tmp = localtime(&t); + /* Generate time prefix */ + strftime(timebuf, sizeof(timebuf), "%x %X - ", tmp); + printf("%s", timebuf); + vprintf(fmt, args); } -/** +/* * Logs the given message to stdout while prefixing the current time to it, * but only if verbose mode is activated. * */ void verboselog(char *fmt, ...) { - va_list args; + va_list args; - if (!verbose) - return; + if (!verbose) + return; - va_start(args, fmt); - vlog(fmt, args); - va_end(args); + va_start(args, fmt); + vlog(fmt, args); + va_end(args); } -/** +/* * Logs the given message to stdout while prefixing the current time to it. * */ void errorlog(char *fmt, ...) { - va_list args; + va_list args; - va_start(args, fmt); - vlog(fmt, args); - va_end(args); + va_start(args, fmt); + vlog(fmt, args); + va_end(args); } /* @@ -110,12 +110,12 @@ void errorlog(char *fmt, ...) { * */ void debuglog(uint64_t lev, char *fmt, ...) { - va_list args; + va_list args; - if ((loglevel & lev) == 0) - return; + if ((loglevel & lev) == 0) + return; - va_start(args, fmt); - vlog(fmt, args); - va_end(args); + va_start(args, fmt); + vlog(fmt, args); + va_end(args); }