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

common/iobuf.c: Rename iobuf_flush and make it a static function.

Browse Source 
* common/iobuf.h (iobuf_flush): Remove prototype.
* common/iobuf.c (filter_flush): New static prototype.
(iobuf_flush): Rename...
(filter_flush): ... to this.  Make static.  Simplify code.  Update
callers.

--
Signed-off-by: Neal H. Walfield <neal@g10code.com>.
This commit is contained in:
Neal H. Walfield 2015-08-13 15:53:11 +02:00
parent 1f94646a86
commit 6d49a2b669
2 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
common/iobuf.c
View File

@ -164,6 +164,18 @@ static int special_names_enabled;
static int underflow (iobuf_t a, int clear_pending_eof); static int underflow (iobuf_t a, int clear_pending_eof);
static int translate_file_handle (int fd, int for_write); static int translate_file_handle (int fd, int for_write);
/* Sends any pending data to the filter's FILTER function. Note: this
works on the filter and not on the whole pipeline. That is,
iobuf_flush doesn't necessarily cause data to be written to any
underlying file; it just causes any data buffered at the filter A
to be sent to A's filter function.
If A is a IOBUF_TEMP filter, then this also enlarges the buffer by
IOBUF_BUFFER_SIZE.
May only be called on an IOBUF_OUTPUT or IOBUF_TEMP filters. */
static int filter_flush (iobuf_t a);
/* This is a replacement for strcmp. Under W32 it does not /* This is a replacement for strcmp. Under W32 it does not
@ -1143,8 +1155,8 @@ iobuf_close (iobuf_t a)
a_chain = a->chain; a_chain = a->chain;
if (a->use == IOBUF_OUTPUT && (rc = iobuf_flush (a))) if (a->use == IOBUF_OUTPUT && (rc = filter_flush (a)))
log_error ("iobuf_flush failed on close: %s\n", gpg_strerror (rc)); log_error ("filter_flush failed on close: %s\n", gpg_strerror (rc));
if (DBG_IOBUF) if (DBG_IOBUF)
log_debug ("iobuf-%d.%d: close '%s'\n", log_debug ("iobuf-%d.%d: close '%s'\n",
@ -1614,7 +1626,7 @@ iobuf_push_filter2 (iobuf_t a,
size_t dummy_len = 0; size_t dummy_len = 0;
int rc = 0; int rc = 0;
if (a->use == IOBUF_OUTPUT && (rc = iobuf_flush (a))) if (a->use == IOBUF_OUTPUT && (rc = filter_flush (a)))
return rc; return rc;
if (a->subno >= MAX_NESTING_FILTER) if (a->subno >= MAX_NESTING_FILTER)
@ -1717,9 +1729,9 @@ pop_filter (iobuf_t a, int (*f) (void *opaque, int control,
log_bug ("pop_filter(): filter function not found\n"); log_bug ("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 = iobuf_flush (b))) if (a->use == IOBUF_OUTPUT && (rc = filter_flush (b)))
{ {
log_error ("iobuf_flush failed in pop_filter: %s\n", gpg_strerror (rc)); log_error ("filter_flush failed in 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 */
@ -1923,36 +1935,33 @@ underflow (iobuf_t a, int clear_pending_eof)
} }
int static int
iobuf_flush (iobuf_t a) filter_flush (iobuf_t a)
{ {
size_t len; size_t len;
int rc; int rc;
if (a->use == IOBUF_TEMP) if (a->use == IOBUF_TEMP)
{ /* increase the temp buffer */ { /* increase the temp buffer */
unsigned char *newbuf;
size_t newsize = a->d.size + IOBUF_BUFFER_SIZE; size_t newsize = a->d.size + IOBUF_BUFFER_SIZE;
if (DBG_IOBUF) if (DBG_IOBUF)
log_debug ("increasing temp iobuf from %lu to %lu\n", log_debug ("increasing temp iobuf from %lu to %lu\n",
(ulong) a->d.size, (ulong) newsize); (ulong) a->d.size, (ulong) newsize);
newbuf = xmalloc (newsize);
memcpy (newbuf, a->d.buf, a->d.len); a->d.buf = xrealloc (a->d.buf, newsize);
xfree (a->d.buf);
a->d.buf = newbuf;
a->d.size = newsize; a->d.size = newsize;
return 0; return 0;
} }
else if (a->use != IOBUF_OUTPUT) else if (a->use != IOBUF_OUTPUT)
log_bug ("flush on non-output iobuf\n"); log_bug ("flush on non-output iobuf\n");
else if (!a->filter) else if (!a->filter)
log_bug ("iobuf_flush: no filter\n"); log_bug ("filter_flush: no filter\n");
len = a->d.len; len = a->d.len;
rc = a->filter (a->filter_ov, IOBUFCTRL_FLUSH, a->chain, a->d.buf, &len); rc = a->filter (a->filter_ov, IOBUFCTRL_FLUSH, a->chain, a->d.buf, &len);
if (!rc && len != a->d.len) if (!rc && len != a->d.len)
{ {
log_info ("iobuf_flush did not write all!\n"); log_info ("filter_flush did not write all!\n");
rc = GPG_ERR_INTERNAL; rc = GPG_ERR_INTERNAL;
} }
else if (rc) else if (rc)
@ -2093,7 +2102,7 @@ iobuf_writebyte (iobuf_t a, unsigned int c)
int rc; int rc;
if (a->d.len == a->d.size) if (a->d.len == a->d.size)
if ((rc=iobuf_flush (a))) if ((rc=filter_flush (a)))
return rc; return rc;
assert (a->d.len < a->d.size); assert (a->d.len < a->d.size);
@ -2122,7 +2131,7 @@ iobuf_write (iobuf_t a, const void *buffer, unsigned int buflen)
} }
if (buflen) if (buflen)
{ {
rc = iobuf_flush (a); rc = filter_flush (a);
if (rc) if (rc)
return rc; return rc;
} }

1
common/iobuf.h
View File

@ -138,7 +138,6 @@ int iobuf_push_filter2 (iobuf_t a,
int (*f) (void *opaque, int control, iobuf_t chain, int (*f) (void *opaque, int control, iobuf_t chain,
byte * buf, size_t * len), void *ov, byte * buf, size_t * len), void *ov,
int rel_ov); int rel_ov);
int iobuf_flush (iobuf_t a);
#define iobuf_set_error(a) do { (a)->error = 1; } while(0) #define iobuf_set_error(a) do { (a)->error = 1; } while(0)
#define iobuf_error(a) ((a)->error) #define iobuf_error(a) ((a)->error)