From 57f64f4e2ff41bd7003aa49f336b8a32d0f73532 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= Date: Mon, 12 May 2003 19:22:47 +0000 Subject: [PATCH] Rename a few functions to avoid stealing common words (error, log, debug etc.) from the application namespace for programs that use pam_ssh(8). Use #defines to avoid changing the actual source code. Approved by: re (rwatson) --- crypto/openssh/log.h | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/crypto/openssh/log.h b/crypto/openssh/log.h index 917fafa69179..383a1cb316d4 100644 --- a/crypto/openssh/log.h +++ b/crypto/openssh/log.h @@ -1,4 +1,5 @@ /* $OpenBSD: log.h,v 1.8 2002/07/19 15:43:33 markus Exp $ */ +/* $FreeBSD$ */ /* * Author: Tatu Ylonen @@ -53,13 +54,21 @@ void log_init(char *, LogLevel, SyslogFacility, int); SyslogFacility log_facility_number(char *); LogLevel log_level_number(char *); -void fatal(const char *, ...) __attribute__((format(printf, 1, 2))); -void error(const char *, ...) __attribute__((format(printf, 1, 2))); -void log(const char *, ...) __attribute__((format(printf, 1, 2))); -void verbose(const char *, ...) __attribute__((format(printf, 1, 2))); -void debug(const char *, ...) __attribute__((format(printf, 1, 2))); -void debug2(const char *, ...) __attribute__((format(printf, 1, 2))); -void debug3(const char *, ...) __attribute__((format(printf, 1, 2))); +#define fatal ssh_fatal +#define error ssh_error +#define log ssh_log +#define verbose ssh_verbose +#define debug ssh_debug +#define debug2 ssh_debug2 +#define debug3 ssh_debug3 + +void ssh_fatal(const char *, ...) __attribute__((format(printf, 1, 2))); +void ssh_error(const char *, ...) __attribute__((format(printf, 1, 2))); +void ssh_log(const char *, ...) __attribute__((format(printf, 1, 2))); +void ssh_verbose(const char *, ...) __attribute__((format(printf, 1, 2))); +void ssh_debug(const char *, ...) __attribute__((format(printf, 1, 2))); +void ssh_debug2(const char *, ...) __attribute__((format(printf, 1, 2))); +void ssh_debug3(const char *, ...) __attribute__((format(printf, 1, 2))); void fatal_cleanup(void); void fatal_add_cleanup(void (*) (void *), void *);