From e8b42e513fa97af5c9978eb95ea97712f0ea5bbb Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Fri, 28 Jun 2019 20:34:33 -0400 Subject: Merge everything into one file --- diag.c | 64 ---------------------------------------------------------------- 1 file changed, 64 deletions(-) delete mode 100644 diag.c (limited to 'diag.c') diff --git a/diag.c b/diag.c deleted file mode 100644 index bdbf98e..0000000 --- a/diag.c +++ /dev/null @@ -1,64 +0,0 @@ -/**************************************************************************** - * bfs * - * Copyright (C) 2019 Tavian Barnes * - * * - * Permission to use, copy, modify, and/or distribute this software for any * - * purpose with or without fee is hereby granted. * - * * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES * - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF * - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR * - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - ****************************************************************************/ - -#include "diag.h" -#include "cmdline.h" -#include "color.h" -#include "util.h" -#include -#include -#include -#include - -void bfs_error(const struct cmdline *cmdline, const char *format, ...) { - va_list args; - va_start(args, format); - bfs_verror(cmdline, format, args); - va_end(args); -} - -void bfs_warning(const struct cmdline *cmdline, const char *format, ...) { - va_list args; - va_start(args, format); - bfs_vwarning(cmdline, format, args); - va_end(args); -} - -void bfs_verror(const struct cmdline *cmdline, const char *format, va_list args) { - int error = errno; - - bfs_error_prefix(cmdline); - - errno = error; - cvfprintf(cmdline->cerr, format, args); -} - -void bfs_vwarning(const struct cmdline *cmdline, const char *format, va_list args) { - int error = errno; - - bfs_warning_prefix(cmdline); - - errno = error; - cvfprintf(cmdline->cerr, format, args); -} - -void bfs_error_prefix(const struct cmdline *cmdline) { - cfprintf(cmdline->cerr, "${bld}%s:${rs} ${er}error:${rs} ", xbasename(cmdline->argv[0])); -} - -void bfs_warning_prefix(const struct cmdline *cmdline) { - cfprintf(cmdline->cerr, "${bld}%s:${rs} ${wr}warning:${rs} ", xbasename(cmdline->argv[0])); -} -- cgit v1.2.3