From 48d6c69b345096425644b7796a7bc6b36bf0e974 Mon Sep 17 00:00:00 2001 From: ajs Date: Fri, 26 Nov 2004 20:52:59 +0000 Subject: 2004-11-26 Andrew J. Schorr * log.c, log.h, memory.c: Change function name from zlog_backtrace_safe to the more self-explanatory zlog_backtrace_sigsafe. --- lib/ChangeLog | 5 +++++ lib/log.c | 4 ++-- lib/log.h | 2 +- lib/memory.c | 4 ++-- 4 files changed, 10 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/ChangeLog b/lib/ChangeLog index f2969e94..db1f560f 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,8 @@ +2004-11-26 Andrew J. Schorr + + * log.c, log.h, memory.c: Change function name from zlog_backtrace_safe + to the more self-explanatory zlog_backtrace_sigsafe. + 2004-11-26 Andrew J. Schorr * debug.[ch]: Remove unused files. diff --git a/lib/log.c b/lib/log.c index 6623b5c9..86e38339 100644 --- a/lib/log.c +++ b/lib/log.c @@ -226,14 +226,14 @@ zlog_signal(int signo, const char *action) } #undef DUMP - zlog_backtrace_safe(LOG_ERR); + zlog_backtrace_sigsafe(LOG_ERR); #undef LOC } /* Log a backtrace using only async-signal-safe functions. Needs to be enhanced to support syslog logging. */ void -zlog_backtrace_safe(int priority) +zlog_backtrace_sigsafe(int priority) { #ifdef HAVE_GLIBC_BACKTRACE void *array[20]; diff --git a/lib/log.h b/lib/log.h index 0df75e73..17b24cd7 100644 --- a/lib/log.h +++ b/lib/log.h @@ -132,6 +132,6 @@ extern void zlog_backtrace(int priority); called unless the program is about to exit or abort, since it messes up the state of zlog file pointers. This function needs to be enhanced to support syslog logging. */ -extern void zlog_backtrace_safe(int priority); +extern void zlog_backtrace_sigsafe(int priority); #endif /* _ZEBRA_LOG_H */ diff --git a/lib/memory.c b/lib/memory.c index 0d23e542..8e2c4faa 100644 --- a/lib/memory.c +++ b/lib/memory.c @@ -46,9 +46,9 @@ zerror (const char *fname, int type, size_t size) zlog_err ("%s : can't allocate memory for `%s' size %d: %s\n", fname, lookup (mstr, type), (int) size, safe_strerror(errno)); log_memstats(LOG_WARNING); - /* N.B. It might be preferable to call zlog_backtrace_safe here, since + /* N.B. It might be preferable to call zlog_backtrace_sigsafe here, since that function should definitely be safe in an OOM condition. But - unfortunately zlog_backtrace_safe does not support syslog logging at + unfortunately zlog_backtrace_sigsafe does not support syslog logging at this time... */ zlog_backtrace(LOG_WARNING); abort(); -- cgit v1.2.1