security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-08 23:37:47 +02:00
Code Activity

Remove trailing white space from two files.

Browse Source 
--
This commit is contained in:
Werner Koch 2014-08-12 10:36:30 +02:00
parent 5860cc7938
commit 90397c9343
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
g10/openfile.c
View File

@ -144,7 +144,7 @@ ask_outfile_name( const char *name, size_t namelen )
if ( opt.batch )
return NULL;
defname = name && namelen? make_printable_string (name, namelen, 0) : NULL;
s = _("Enter new filename");
@ -159,9 +159,9 @@ ask_outfile_name( const char *name, size_t namelen )
cpr_kill_prompt ();
tty_disable_completion ();
xfree (prompt);
if ( !*fname )
if ( !*fname )
{
xfree (fname);
xfree (fname);
fname = defname;
defname = NULL;
}
@ -197,7 +197,7 @@ open_outfile( const char *iname, int mode, IOBUF *a )
else {
char *buf = NULL;
const char *name;
if ( opt.dry_run )
{
#ifdef HAVE_W32_SYSTEM
@ -222,7 +222,7 @@ open_outfile( const char *iname, int mode, IOBUF *a )
char *dot;
const char *newsfx = mode==1 ? ".asc" :
mode==2 ? ".sig" : ".gpg";
buf = xmalloc(strlen(iname)+4+1);
strcpy(buf,iname);
dot = strchr(buf, '.' );
@ -259,7 +259,7 @@ open_outfile( const char *iname, int mode, IOBUF *a )
xfree (buf);
name = buf = tmp;
}
if( !rc )
{
if (is_secured_filename (name) )
@ -385,7 +385,7 @@ copy_options_file( const char *destdir )
;
else if (c == '#')
esc = 2;
else
else
any_option = 1;
}
}
@ -431,6 +431,6 @@ try_make_homedir (const char *fname)
else if (!opt.quiet )
log_info ( _("directory `%s' created\n"), fname );
copy_options_file( fname );
}
}

10
sm/gpgsm.h
View File

@ -75,7 +75,7 @@ struct
char *outfile; /* name of output file */
int with_key_data;/* include raw key in the column delimted output */
int fingerprint; /* list fingerprints in all key listings */
int with_md5_fingerprint; /* Also print an MD5 fingerprint for
@ -170,11 +170,11 @@ struct server_control_s
int no_server; /* We are not running under server control */
int status_fd; /* Only for non-server mode */
struct server_local_s *server_local;
audit_ctx_t audit; /* NULL or a context for the audit subsystem. */
int agent_seen; /* Flag indicating that the gpg-agent has been
accessed. */
int with_colons; /* Use column delimited output format */
int with_chain; /* Include the certifying certs in a listing */
int with_validation;/* Validate each key while listing. */
@ -203,7 +203,7 @@ typedef struct base64_context_s *Base64Context;
/* An object to keep a list of certificates. */
struct certlist_s
struct certlist_s
{
struct certlist_s *next;
ksba_cert_t cert;
@ -386,7 +386,7 @@ int gpgsm_scd_pksign (ctrl_t ctrl, const char *keyid, const char *desc,
unsigned char *digest, size_t digestlen, int digestalgo,
unsigned char **r_buf, size_t *r_buflen);
int gpgsm_agent_pkdecrypt (ctrl_t ctrl, const char *keygrip, const char *desc,
ksba_const_sexp_t ciphertext,
ksba_const_sexp_t ciphertext,
char **r_buf, size_t *r_buflen);
int gpgsm_agent_genkey (ctrl_t ctrl,
ksba_const_sexp_t keyparms, ksba_sexp_t *r_pubkey);