mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
fixed clearsig stuff
This commit is contained in:
parent
ccb3140ab2
commit
5aed77d1db
28 changed files with 1428 additions and 584 deletions
|
@ -73,6 +73,15 @@ print_prefix(const char *text)
|
|||
fprintf(stderr, "?%s: %s", pidstring, text );
|
||||
}
|
||||
|
||||
static void
|
||||
print_prefix_f(const char *text, const char *fname)
|
||||
{
|
||||
if( pgm_name )
|
||||
fprintf(stderr, "%s%s:%s: %s", pgm_name, pidstring, fname, text );
|
||||
else
|
||||
fprintf(stderr, "?%s:%s: %s", pidstring, fname, text );
|
||||
}
|
||||
|
||||
void
|
||||
g10_log_info( const char *fmt, ... )
|
||||
{
|
||||
|
@ -84,6 +93,17 @@ g10_log_info( const char *fmt, ... )
|
|||
va_end(arg_ptr);
|
||||
}
|
||||
|
||||
void
|
||||
g10_log_info_f( const char *fname, const char *fmt, ... )
|
||||
{
|
||||
va_list arg_ptr ;
|
||||
|
||||
print_prefix_f("", fname);
|
||||
va_start( arg_ptr, fmt ) ;
|
||||
vfprintf(stderr,fmt,arg_ptr) ;
|
||||
va_end(arg_ptr);
|
||||
}
|
||||
|
||||
void
|
||||
g10_log_error( const char *fmt, ... )
|
||||
{
|
||||
|
@ -96,6 +116,18 @@ g10_log_error( const char *fmt, ... )
|
|||
errorcount++;
|
||||
}
|
||||
|
||||
void
|
||||
g10_log_error_f( const char *fname, const char *fmt, ... )
|
||||
{
|
||||
va_list arg_ptr ;
|
||||
|
||||
print_prefix_f("", fname);
|
||||
va_start( arg_ptr, fmt ) ;
|
||||
vfprintf(stderr,fmt,arg_ptr) ;
|
||||
va_end(arg_ptr);
|
||||
errorcount++;
|
||||
}
|
||||
|
||||
void
|
||||
g10_log_fatal( const char *fmt, ... )
|
||||
{
|
||||
|
@ -109,6 +141,19 @@ g10_log_fatal( const char *fmt, ... )
|
|||
exit(2);
|
||||
}
|
||||
|
||||
void
|
||||
g10_log_fatal_f( const char *fname, const char *fmt, ... )
|
||||
{
|
||||
va_list arg_ptr ;
|
||||
|
||||
print_prefix_f("fatal: ", fname);
|
||||
va_start( arg_ptr, fmt ) ;
|
||||
vfprintf(stderr,fmt,arg_ptr) ;
|
||||
va_end(arg_ptr);
|
||||
secmem_dump_stats();
|
||||
exit(2);
|
||||
}
|
||||
|
||||
void
|
||||
g10_log_bug( const char *fmt, ... )
|
||||
{
|
||||
|
@ -149,6 +194,17 @@ g10_log_debug( const char *fmt, ... )
|
|||
va_end(arg_ptr);
|
||||
}
|
||||
|
||||
void
|
||||
g10_log_debug_f( const char *fname, const char *fmt, ... )
|
||||
{
|
||||
va_list arg_ptr ;
|
||||
|
||||
print_prefix_f("DBG: ", fname);
|
||||
va_start( arg_ptr, fmt ) ;
|
||||
vfprintf(stderr,fmt,arg_ptr) ;
|
||||
va_end(arg_ptr);
|
||||
}
|
||||
|
||||
|
||||
|
||||
void
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue