security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Forkuj 0
kopia lustrzana git://git.gnupg.org/gnupg.git zsynchronizowano 2025-07-02 22:46:30 +02:00
Kod Aktywność

common: Rename log and gcc attribute macros (jnlib merge).

Przeglądaj źródła 
* common/logging.h: Rename JNLIB_LOG_* to GPGRT_LOG_*.
* common/mischelp.h: Rename JNLIB_GCC_* to GPGRT_GCC_*.
--

JNLIB has no more meaning.  Thus we switch to a GPGRT_ prefix in
anticipation that some code may eventually be moved to libgpg-error.

Signed-off-by: Werner Koch <wk@gnupg.org>
Ten commit jest zawarty w:
Werner Koch 2015-04-24 15:49:18 +02:00
rodzic 575230d91b
commit 26d7e0d7ac
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: E3FDFF218E45B72B
21 zmienionych plików z 112 dodań i 112 usunięć
Pobierz plik łatki Pobierz plik zmian Rozwiń wszystkie pliki Zwiń wszystkie pliki

44
common/logging.h
Wyświetl plik

@ -48,8 +48,8 @@ int log_test_fd (int fd);
int log_get_fd(void);
estream_t log_get_stream (void);
#ifdef JNLIB_GCC_M_FUNCTION
void bug_at( const char *file, int line, const char *func ) JNLIB_GCC_A_NR;
#ifdef GPGRT_GCC_M_FUNCTION
void bug_at( const char *file, int line, const char *func ) GPGRT_GCC_A_NR;
# define BUG() bug_at( __FILE__ , __LINE__, __FUNCTION__ )
#else
void bug_at( const char *file, int line );
@ -57,34 +57,34 @@ estream_t log_get_stream (void);
#endif
/* Flag values for log_set_prefix. */
#define JNLIB_LOG_WITH_PREFIX 1
#define JNLIB_LOG_WITH_TIME 2
#define JNLIB_LOG_WITH_PID 4
#define JNLIB_LOG_RUN_DETACHED 256
#define JNLIB_LOG_NO_REGISTRY 512
#define GPGRT_LOG_WITH_PREFIX 1
#define GPGRT_LOG_WITH_TIME 2
#define GPGRT_LOG_WITH_PID 4
#define GPGRT_LOG_RUN_DETACHED 256
#define GPGRT_LOG_NO_REGISTRY 512
/* Log levels as used by log_log. */
enum jnlib_log_levels {
JNLIB_LOG_BEGIN,
JNLIB_LOG_CONT,
JNLIB_LOG_INFO,
JNLIB_LOG_WARN,
JNLIB_LOG_ERROR,
JNLIB_LOG_FATAL,
JNLIB_LOG_BUG,
JNLIB_LOG_DEBUG
GPGRT_LOG_BEGIN,
GPGRT_LOG_CONT,
GPGRT_LOG_INFO,
GPGRT_LOG_WARN,
GPGRT_LOG_ERROR,
GPGRT_LOG_FATAL,
GPGRT_LOG_BUG,
GPGRT_LOG_DEBUG
};
void log_log (int level, const char *fmt, ...) JNLIB_GCC_A_PRINTF(2,3);
void log_log (int level, const char *fmt, ...) GPGRT_GCC_A_PRINTF(2,3);
void log_logv (int level, const char *fmt, va_list arg_ptr);
void log_string (int level, const char *string);
void log_bug( const char *fmt, ... ) JNLIB_GCC_A_NR_PRINTF(1,2);
void log_fatal( const char *fmt, ... ) JNLIB_GCC_A_NR_PRINTF(1,2);
void log_error( const char *fmt, ... ) JNLIB_GCC_A_PRINTF(1,2);
void log_info( const char *fmt, ... ) JNLIB_GCC_A_PRINTF(1,2);
void log_debug( const char *fmt, ... ) JNLIB_GCC_A_PRINTF(1,2);
void log_printf( const char *fmt, ... ) JNLIB_GCC_A_PRINTF(1,2);
void log_bug( const char *fmt, ... ) GPGRT_GCC_A_NR_PRINTF(1,2);
void log_fatal( const char *fmt, ... ) GPGRT_GCC_A_NR_PRINTF(1,2);
void log_error( const char *fmt, ... ) GPGRT_GCC_A_PRINTF(1,2);
void log_info( const char *fmt, ... ) GPGRT_GCC_A_PRINTF(1,2);
void log_debug( const char *fmt, ... ) GPGRT_GCC_A_PRINTF(1,2);
void log_printf( const char *fmt, ... ) GPGRT_GCC_A_PRINTF(1,2);
void log_flush (void);
/* Print a hexdump of BUFFER. With TEXT passes as NULL print just the