security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-03 12:11:33 +01:00
Code Activity

gpg: Rename pop_filter to iobuf_pop_filter and export it.

Browse Source 
* common/iobuf.c (pop_filter): Rename from this...
(iobuf_pop_filter): ... to this.  Don't mark it as static.

--
Signed-off-by: Neal H. Walfield <neal@g10code.com>
This commit is contained in:
Neal H. Walfield 2016-03-02 15:42:18 +01:00
parent 7eac4942b5
commit 1463f9b962
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
common/iobuf.c
View File

@ -1683,10 +1683,10 @@ iobuf_push_filter2 (iobuf_t a,
/**************** /****************
* Remove an i/o filter. * Remove an i/o filter.
*/ */
static int int
pop_filter (iobuf_t a, int (*f) (void *opaque, int control, iobuf_pop_filter (iobuf_t a, int (*f) (void *opaque, int control,
iobuf_t chain, byte * buf, size_t * len), iobuf_t chain, byte * buf, size_t * len),
void *ov) void *ov)
{ {
iobuf_t b; iobuf_t b;
size_t dummy_len = 0; size_t dummy_len = 0;
@ -1716,12 +1716,13 @@ pop_filter (iobuf_t a, int (*f) (void *opaque, int control,
if (b->filter == f && (!ov || b->filter_ov == ov)) if (b->filter == f && (!ov || b->filter_ov == ov))
break; break;
if (!b) if (!b)
log_bug ("pop_filter(): filter function not found\n"); log_bug ("iobuf_pop_filter(): filter function not found\n");
/* flush this stream if it is an output stream */ /* flush this stream if it is an output stream */
if (a->use == IOBUF_OUTPUT && (rc = filter_flush (b))) if (a->use == IOBUF_OUTPUT && (rc = filter_flush (b)))
{ {
log_error ("filter_flush failed in pop_filter: %s\n", gpg_strerror (rc)); log_error ("filter_flush failed in iobuf_pop_filter: %s\n",
gpg_strerror (rc));
return rc; return rc;
} }
/* and tell the filter to free it self */ /* and tell the filter to free it self */
@ -2268,7 +2269,7 @@ iobuf_flush_temp (iobuf_t temp)
if (temp->use == IOBUF_INPUT || temp->use == IOBUF_INPUT_TEMP) if (temp->use == IOBUF_INPUT || temp->use == IOBUF_INPUT_TEMP)
log_bug ("iobuf_flush_temp called on an input pipeline!\n"); log_bug ("iobuf_flush_temp called on an input pipeline!\n");
while (temp->chain) while (temp->chain)
pop_filter (temp, temp->filter, NULL); iobuf_pop_filter (temp, temp->filter, NULL);
} }
@ -2467,9 +2468,9 @@ iobuf_seek (iobuf_t a, off_t newpos)
/* remove filters, but the last */ /* remove filters, but the last */
if (a->chain) if (a->chain)
log_debug ("pop_filter called in iobuf_seek - please report\n"); log_debug ("iobuf_pop_filter called in iobuf_seek - please report\n");
while (a->chain) while (a->chain)
pop_filter (a, a->filter, NULL); iobuf_pop_filter (a, a->filter, NULL);
return 0; return 0;
} }
@ -2536,11 +2537,11 @@ iobuf_set_partial_body_length_mode (iobuf_t a, size_t len)
/* Disable partial body length mode. */ /* Disable partial body length mode. */
{ {
if (a->use == IOBUF_INPUT) if (a->use == IOBUF_INPUT)
log_debug ("pop_filter called in set_partial_block_mode" log_debug ("iobuf_pop_filter called in set_partial_block_mode"
" - please report\n"); " - please report\n");
log_assert (a->filter == block_filter); log_assert (a->filter == block_filter);
pop_filter (a, block_filter, NULL); iobuf_pop_filter (a, block_filter, NULL);
} }
else else
/* Enabled partial body length mode. */ /* Enabled partial body length mode. */

7
common/iobuf.h
View File

@ -421,6 +421,13 @@ int iobuf_push_filter2 (iobuf_t a,
byte * buf, size_t * len), void *ov, byte * buf, size_t * len), void *ov,
int rel_ov); int rel_ov);
/* Pop the top filter. The top filter must have the filter function F
and the cookie OV. The cookie check is ignored if OV is NULL. */
int iobuf_pop_filter (iobuf_t a,
int (*f) (void *opaque, int control,
iobuf_t chain, byte * buf, size_t * len),
void *ov);
/* Used for debugging. Prints out the chain using log_debug if /* Used for debugging. Prints out the chain using log_debug if
IOBUF_DEBUG_MODE is not 0. */ IOBUF_DEBUG_MODE is not 0. */
int iobuf_print_chain (iobuf_t a); int iobuf_print_chain (iobuf_t a);