aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2014-08-12 08:36:30 +0000
committerWerner Koch <[email protected]>2014-08-12 14:03:02 +0000
commit90397c9343411bc52ed55d9710de875db70fac64 (patch)
tree5ac0a72df0bfa61ac0b35681830f9bfb58a66f04
parentjnlib: Fix typo in header inclusion protection macro. (diff)
downloadgnupg-90397c9343411bc52ed55d9710de875db70fac64.tar.gz
gnupg-90397c9343411bc52ed55d9710de875db70fac64.zip
Remove trailing white space from two files.
--
-rw-r--r--g10/openfile.c16
-rw-r--r--sm/gpgsm.h10
2 files changed, 13 insertions, 13 deletions
diff --git a/g10/openfile.c b/g10/openfile.c
index 55dd42c4b..db5cdc23a 100644
--- a/g10/openfile.c
+++ b/g10/openfile.c
@@ -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 );
-
+
}
}
diff --git a/sm/gpgsm.h b/sm/gpgsm.h
index c4a261bf2..1904bd403 100644
--- a/sm/gpgsm.h
+++ b/sm/gpgsm.h
@@ -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);