From 3ec3021ee15f0e45b378e4589ad2fdf0344a63de Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Wed, 21 Dec 2016 23:51:14 -0800 Subject: Ditch our own snprintf/vsnprintf (C99). Symbol naming fixes for inproc. --- src/core/panic.c | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) (limited to 'src/core/panic.c') diff --git a/src/core/panic.c b/src/core/panic.c index 822c0904..65eb0747 100644 --- a/src/core/panic.c +++ b/src/core/panic.c @@ -1,15 +1,16 @@ -/* - * Copyright 2016 Garrett D'Amore - * - * This software is supplied under the terms of the MIT License, a - * copy of which should be located in the distribution where this - * file was obtained (LICENSE.txt). A copy of the license may also be - * found online at https://opensource.org/licenses/MIT. - */ +// +// Copyright 2016 Garrett D'Amore +// +// This software is supplied under the terms of the MIT License, a +// copy of which should be located in the distribution where this +// file was obtained (LICENSE.txt). A copy of the license may also be +// found online at https://opensource.org/licenses/MIT. +// #include #include #include +#include #ifdef NNG_HAVE_BACKTRACE #include @@ -17,11 +18,11 @@ #include "core/nng_impl.h" -/* - * Panic handling. - */ +// +// Panic handling. +// static void -show_backtrace(void) +nni_show_backtrace(void) { #if NNG_HAVE_BACKTRACE void *frames[50]; @@ -43,13 +44,13 @@ show_backtrace(void) } -/* - * nni_panic shows a panic message, a possible stack bracktrace, then aborts - * the process/program. This should only be called when a condition arises - * that should not be possible, e.g. a programming assertion failure. It should - * not be called in situations such as ENOMEM, as nni_panic is fairly rude - * to any application it may be called from within. - */ +// +// nni_panic shows a panic message, a possible stack bracktrace, then aborts +// the process/program. This should only be called when a condition arises +// that should not be possible, e.g. a programming assertion failure. It should +// not be called in situations such as ENOMEM, as nni_panic is fairly rude +// to any application it may be called from within. +// void nni_panic(const char *fmt, ...) { @@ -58,15 +59,15 @@ nni_panic(const char *fmt, ...) va_list va; va_start(va, fmt); - (void) nni_snprintf(fbuf, sizeof (buf), "panic: %s", fmt); - (void) nni_vsnprintf(buf, sizeof (buf), fbuf, va); + (void) snprintf(fbuf, sizeof (fbuf), "panic: %s", fmt); + (void) vsnprintf(buf, sizeof (buf), fbuf, va); va_end(va); nni_println(buf); nni_println("This message is indicative of a BUG."); nni_println("Report this at http://github.com/nanomsg/nanomsg"); - show_backtrace(); + nni_show_backtrace(); nni_plat_abort(); } -- cgit v1.2.3-70-g09d2