diff options
| author | Werner Koch <[email protected]> | 2011-02-04 11:57:53 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2011-02-04 11:57:53 +0000 |
| commit | b008274afdbe375b32a7e66dbd073e200f6f0587 (patch) | |
| tree | 219e239d39cf06be3f03aa82fb572080ac163a15 /g13/create.c | |
| parent | Let autogen.sh check the git config (diff) | |
| download | gnupg-b008274afdbe375b32a7e66dbd073e200f6f0587.tar.gz gnupg-b008274afdbe375b32a7e66dbd073e200f6f0587.zip | |
Nuked almost all trailing white space.post-nuke-of-trailing-ws
We better do this once and for all instead of cluttering all future
commits with diffs of trailing white spaces. In the majority of cases
blank or single lines are affected and thus this change won't disturb
a git blame too much. For future commits the pre-commit scripts
checks that this won't happen again.
Diffstat (limited to 'g13/create.c')
| -rw-r--r-- | g13/create.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/g13/create.c b/g13/create.c index bde67579e..2b998e2b2 100644 --- a/g13/create.c +++ b/g13/create.c @@ -40,7 +40,7 @@ information which are to be stored encrypted in the crypto container header. On success the malloced blob is stored at R_BLOB and its length at R_BLOBLEN. On error an error code is returned - and (R_BLOB,R_BLOBLEN) are set to (NULL,0). + and (R_BLOB,R_BLOBLEN) are set to (NULL,0). The format of this blob is a sequence of tag-length-value tuples. All tuples have this format: @@ -123,7 +123,7 @@ encrypt_keyblob (ctrl_t ctrl, void *keyblob, size_t keybloblen, appropriate header. This fucntion is called with a lock file in place and after checking that the filename does not exists. */ static gpg_error_t -write_keyblob (const char *filename, +write_keyblob (const char *filename, const void *keyblob, size_t keybloblen) { gpg_error_t err; @@ -135,7 +135,7 @@ write_keyblob (const char *filename, if (!fp) { err = gpg_error_from_syserror (); - log_error ("error creating new container `%s': %s\n", + log_error ("error creating new container `%s': %s\n", filename, gpg_strerror (err)); return err; } @@ -197,18 +197,18 @@ write_keyblob (const char *filename, if (es_fclose (fp)) { err = gpg_error_from_syserror (); - log_error ("error closing `%s': %s\n", + log_error ("error closing `%s': %s\n", filename, gpg_strerror (err)); remove (filename); return err; } return 0; - + writeerr: err = gpg_error_from_syserror (); - log_error ("error writing header to `%s': %s\n", + log_error ("error writing header to `%s': %s\n", filename, gpg_strerror (err)); es_fclose (fp); remove (filename); @@ -301,7 +301,7 @@ g13_create_container (ctrl_t ctrl, const char *filename, strlist_t keys) keyblob = NULL; /* if (opt.verbose) */ /* dump_keyblob (tuples); */ - + /* Write out the header, the encrypted keyblob and some padding. */ err = write_keyblob (filename, enckeyblob, enckeybloblen); if (err) |