diff options
author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2010-12-16 17:30:42 +0100 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2010-12-16 17:30:42 +0100 |
commit | 6eb6bbfe8e504a611145f454f4045e8f49fd5e44 (patch) | |
tree | baba850cc86ee2d9d61de89da1cdfe408ad8694a /lib/opencdk/literal.c | |
parent | bdcfdac13179eccee6294402f2654fece149f82b (diff) | |
download | gnutls-6eb6bbfe8e504a611145f454f4045e8f49fd5e44.tar.gz |
Indented code. Use same indentation but with -nut to avoid usage of tabs. In several editors tabs can be configured not to be 8 spaces and this produces artifacts with the current indentation that is a mixture of tabs and spaces.
Diffstat (limited to 'lib/opencdk/literal.c')
-rw-r--r-- | lib/opencdk/literal.c | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/lib/opencdk/literal.c b/lib/opencdk/literal.c index 769f117e74..4c8f966124 100644 --- a/lib/opencdk/literal.c +++ b/lib/opencdk/literal.c @@ -104,16 +104,16 @@ literal_decode (void *data, FILE * in, FILE * out) from the original name and cut off the OpenPGP extension. If this is not possible, we return an error. */ if (!stristr (pfx->orig_filename, ".gpg") && - !stristr (pfx->orig_filename, ".pgp") && - !stristr (pfx->orig_filename, ".asc")) - { - cdk_pkt_release (pkt); - cdk_stream_close (si); - cdk_stream_close (so); - _cdk_log_debug - ("literal filter: no file name and no PGP extension\n"); - return CDK_Inv_Mode; - } + !stristr (pfx->orig_filename, ".pgp") && + !stristr (pfx->orig_filename, ".asc")) + { + cdk_pkt_release (pkt); + cdk_stream_close (si); + cdk_stream_close (so); + _cdk_log_debug + ("literal filter: no file name and no PGP extension\n"); + return CDK_Inv_Mode; + } _cdk_log_debug ("literal filter: derrive file name from original\n"); pfx->filename = dup_trim_filename (pfx->orig_filename); pfx->filename[strlen (pfx->filename) - 4] = '\0'; @@ -122,29 +122,29 @@ literal_decode (void *data, FILE * in, FILE * out) while (!feof (in)) { _cdk_log_debug ("literal_decode: part on %d size %lu\n", - (int) pfx->blkmode.on, pfx->blkmode.size); + (int) pfx->blkmode.on, pfx->blkmode.size); if (pfx->blkmode.on) - bufsize = pfx->blkmode.size; + bufsize = pfx->blkmode.size; else - bufsize = pt->len < DIM (buf) ? pt->len : DIM (buf); + bufsize = pt->len < DIM (buf) ? pt->len : DIM (buf); nread = cdk_stream_read (pt->buf, buf, bufsize); if (nread == EOF) - { - rc = CDK_File_Error; - break; - } + { + rc = CDK_File_Error; + break; + } if (pfx->md_initialized) - _gnutls_hash (&pfx->md, buf, nread); + _gnutls_hash (&pfx->md, buf, nread); cdk_stream_write (so, buf, nread); pt->len -= nread; if (pfx->blkmode.on) - { - pfx->blkmode.size = _cdk_pkt_read_len (in, &pfx->blkmode.on); - if ((ssize_t) pfx->blkmode.size == EOF) - return CDK_Inv_Packet; - } + { + pfx->blkmode.size = _cdk_pkt_read_len (in, &pfx->blkmode.on); + if ((ssize_t) pfx->blkmode.size == EOF) + return CDK_Inv_Packet; + } if (pt->len <= 0 && !pfx->blkmode.on) - break; + break; } cdk_stream_close (si); @@ -191,7 +191,7 @@ literal_encode (void *data, FILE * in, FILE * out) { pfx->filename = cdk_strdup ("_CONSOLE"); if (!pfx->filename) - return CDK_Out_Of_Core; + return CDK_Out_Of_Core; } rc = _cdk_stream_fpopen (in, STREAMCTL_READ, &si); @@ -237,14 +237,14 @@ _cdk_filter_literal (void *data, int ctl, FILE * in, FILE * out) { literal_filter_t *pfx = data; if (pfx) - { - _cdk_log_debug ("free literal filter\n"); - cdk_free (pfx->filename); - pfx->filename = NULL; - cdk_free (pfx->orig_filename); - pfx->orig_filename = NULL; - return 0; - } + { + _cdk_log_debug ("free literal filter\n"); + cdk_free (pfx->filename); + pfx->filename = NULL; + cdk_free (pfx->orig_filename); + pfx->orig_filename = NULL; + return 0; + } } return CDK_Inv_Mode; } @@ -264,7 +264,7 @@ text_encode (void *data, FILE * in, FILE * out) { s = fgets (buf, DIM (buf) - 1, in); if (!s) - break; + break; _cdk_trim_string (buf, 1); fwrite (buf, 1, strlen (buf), out); } @@ -287,7 +287,7 @@ text_decode (void *data, FILE * in, FILE * out) { s = fgets (buf, DIM (buf) - 1, in); if (!s) - break; + break; _cdk_trim_string (buf, 0); fwrite (buf, 1, strlen (buf), out); fwrite (tfx->lf, 1, strlen (tfx->lf), out); @@ -308,10 +308,10 @@ _cdk_filter_text (void *data, int ctl, FILE * in, FILE * out) { text_filter_t *tfx = data; if (tfx) - { - _cdk_log_debug ("free text filter\n"); - tfx->lf = NULL; - } + { + _cdk_log_debug ("free text filter\n"); + tfx->lf = NULL; + } } return CDK_Inv_Mode; } |