diff options
| author | Marcus Brinkmann <[email protected]> | 2003-08-18 19:17:08 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2003-08-18 19:17:08 +0000 |
| commit | c93237c3a4cb4ecc579033c31a56cf447c277be3 (patch) | |
| tree | 0dc8fcc413d8ffe64ed9f5ef44e825063b0878cd /assuan/assuan-util.c | |
| parent | 2003-08-15 Marcus Brinkmann <[email protected]> (diff) | |
| download | gpgme-c93237c3a4cb4ecc579033c31a56cf447c277be3.tar.gz gpgme-c93237c3a4cb4ecc579033c31a56cf447c277be3.zip | |
2003-08-18 Marcus Brinkmann <[email protected]>
* configure.ac: If building Assuan, check for funopen and
fopencookie, and make isascii, putc_unlocked and memrchr
replacement functions.
assuan/
Update to the latest assuan version.
gpgme/
2003-08-18 Marcus Brinkmann <[email protected]>
* funopen.c, putc_unlocked.c, isascii.c, memrchr.c: New files.
* fopencookie.c: File removed.
Diffstat (limited to 'assuan/assuan-util.c')
| -rw-r--r-- | assuan/assuan-util.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/assuan/assuan-util.c b/assuan/assuan-util.c index 76f7f065..fc0beedb 100644 --- a/assuan/assuan-util.c +++ b/assuan/assuan-util.c @@ -1,5 +1,5 @@ /* assuan-util.c - Utility functions for Assuan - * Copyright (C) 2001, 2002 Free Software Foundation, Inc. + * Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. * * This file is part of Assuan. * @@ -26,10 +26,6 @@ #include "assuan-defs.h" -#ifdef HAVE_JNLIB_LOGGING -#include "../jnlib/logging.h" -#endif - static void *(*alloc_func)(size_t n) = malloc; static void *(*realloc_func)(void *p, size_t n) = realloc; static void (*free_func)(void*) = free; @@ -159,18 +155,13 @@ _assuan_log_print_buffer (FILE *fp, const void *buffer, size_t length) } } - /* Log a user supplied string. Escapes non-printable before printing. */ void _assuan_log_sanitized_string (const char *string) { const unsigned char *s = string; -#ifdef HAVE_JNLIB_LOGGING - FILE *fp = log_get_stream (); -#else - FILE *fp = stderr; -#endif + FILE *fp = assuan_get_assuan_log_stream (); if (! *s) return; @@ -226,5 +217,3 @@ _assuan_log_sanitized_string (const char *string) funlockfile (fp); #endif } - - |