aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeal H. Walfield <[email protected]>2016-02-23 19:36:07 +0000
committerNeal H. Walfield <[email protected]>2016-02-23 19:49:47 +0000
commit903466e124841cb29f518afa6b7706d490737ac3 (patch)
treeafde9e1d3e16609068054bf2ea3d3fec0747b77b
parentg13: Add commands --suspend and --remove. (diff)
downloadgnupg-903466e124841cb29f518afa6b7706d490737ac3.tar.gz
gnupg-903466e124841cb29f518afa6b7706d490737ac3.zip
common: More accurately name function.
* common/iobuf.c (iobuf_set_partial_block_mode): Rename from this... (iobuf_set_partial_body_length_mode): ... to this. Update callers. -- Signed-off-by: Neal H. Walfield <[email protected]>
-rw-r--r--common/iobuf.c2
-rw-r--r--common/iobuf.h2
-rw-r--r--g10/build-packet.c4
-rw-r--r--g10/parse-packet.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/common/iobuf.c b/common/iobuf.c
index f5bbfb2d2..6a9060a0e 100644
--- a/common/iobuf.c
+++ b/common/iobuf.c
@@ -2513,7 +2513,7 @@ iobuf_get_fname_nonnull (iobuf_t a)
* LEN is the first length byte on read, but ignored on writes.
*/
void
-iobuf_set_partial_block_mode (iobuf_t a, size_t len)
+iobuf_set_partial_body_length_mode (iobuf_t a, size_t len)
{
block_filter_ctx_t *ctx = xcalloc (1, sizeof *ctx);
diff --git a/common/iobuf.h b/common/iobuf.h
index 8ba02b3b4..785efdc82 100644
--- a/common/iobuf.h
+++ b/common/iobuf.h
@@ -592,7 +592,7 @@ const char *iobuf_get_fname_nonnull (iobuf_t a);
length headers (see Section 4.2.2.4 of RFC 4880). Concretely, it
just returns / writes the data and finishes the packet with an
EOF. */
-void iobuf_set_partial_block_mode (iobuf_t a, size_t len);
+void iobuf_set_partial_body_length_mode (iobuf_t a, size_t len);
/* If PARTIAL is set, then read from the pipeline until the first EOF
is returned.
diff --git a/g10/build-packet.c b/g10/build-packet.c
index 42452086d..4dec5b94f 100644
--- a/g10/build-packet.c
+++ b/g10/build-packet.c
@@ -551,7 +551,7 @@ do_plaintext( IOBUF out, int ctb, PKT_plaintext *pt )
}
wipememory(buf,1000); /* burn the buffer */
if( (ctb&0x40) && !pt->len )
- iobuf_set_partial_block_mode(out, 0 ); /* turn off partial */
+ iobuf_set_partial_body_length_mode(out, 0 ); /* turn off partial */
if( pt->len && n != pt->len )
log_error("do_plaintext(): wrote %lu bytes but expected %lu bytes\n",
(ulong)n, (ulong)pt->len );
@@ -1334,7 +1334,7 @@ write_new_header( IOBUF out, int ctb, u32 len, int hdrlen )
if( iobuf_put(out, ctb ) )
return -1;
if( !len ) {
- iobuf_set_partial_block_mode(out, 512 );
+ iobuf_set_partial_body_length_mode(out, 512 );
}
else {
if( len < 192 ) {
diff --git a/g10/parse-packet.c b/g10/parse-packet.c
index 38cd8c9c8..1be49b12a 100644
--- a/g10/parse-packet.c
+++ b/g10/parse-packet.c
@@ -581,7 +581,7 @@ parse (IOBUF inp, PACKET * pkt, int onlykeypkts, off_t * retpos,
case PKT_ENCRYPTED:
case PKT_ENCRYPTED_MDC:
case PKT_COMPRESSED:
- iobuf_set_partial_block_mode (inp, c & 0xff);
+ iobuf_set_partial_body_length_mode (inp, c & 0xff);
pktlen = 0; /* To indicate partial length. */
partial = 1;
break;