security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-26 01:52:45 +02:00
Code Activity

common/iobuf.c: Make control flow more obvious.

Browse Source 
* common/iobuf.c (iobuf_read): Make control flow more obvious.
(iobuf_get_filelength): Likewise.
(iobuf_get_fd): Likewise.
(iobuf_seek): Likewise.

--
Signed-off-by: Neal H. Walfield <neal@g10code.com>.
This commit is contained in:
Neal H. Walfield 2015-08-17 13:00:32 +02:00
parent c5da750cf3
commit 49f922286f
1 changed files with 78 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
common/iobuf.c
View File

@ -1992,11 +1992,13 @@ iobuf_read (iobuf_t a, void *buffer, unsigned int buflen)
return -1; /* eof */ return -1; /* eof */
break; break;
} }
else if (buf)
*buf = c;
if (buf) if (buf)
{
*buf = c;
buf++; buf++;
} }
}
return n; return n;
} }
@ -2220,8 +2222,12 @@ iobuf_get_filelength (iobuf_t a, int *overflow)
*overflow = 0; *overflow = 0;
/* Hmmm: file_filter may have already been removed */ /* Hmmm: file_filter may have already been removed */
for ( ; a; a = a->chain ) for ( ; a->chain; a = a->chain )
if ( !a->chain && a->filter == file_filter ) ;
if (a->filter != file_filter)
return 0;
{ {
file_filter_ctx_t *b = a->filter_ov; file_filter_ctx_t *b = a->filter_ov;
gnupg_fd_t fp = b->fp; gnupg_fd_t fp = b->fp;
@ -2274,7 +2280,6 @@ iobuf_get_filelength (iobuf_t a, int *overflow)
return st.st_size; return st.st_size;
log_error("fstat() failed: %s\n", strerror(errno) ); log_error("fstat() failed: %s\n", strerror(errno) );
#endif #endif
break/*the for loop*/;
} }
return 0; return 0;
@ -2284,16 +2289,18 @@ iobuf_get_filelength (iobuf_t a, int *overflow)
int int
iobuf_get_fd (iobuf_t a) iobuf_get_fd (iobuf_t a)
{ {
for ( ; a; a = a->chain ) for (; a->chain; a = a->chain)
if (!a->chain && a->filter == file_filter) ;
if (a->filter != file_filter)
return -1;
{ {
file_filter_ctx_t *b = a->filter_ov; file_filter_ctx_t *b = a->filter_ov;
gnupg_fd_t fp = b->fp; gnupg_fd_t fp = b->fp;
return FD2INT (fp); return FD2INT (fp);
} }
return -1;
} }
@ -2341,16 +2348,15 @@ iobuf_seek (iobuf_t a, off_t newpos)
if (a->use != IOBUF_TEMP) if (a->use != IOBUF_TEMP)
{ {
for (; a; a = a->chain) /* Find the last filter in the pipeline. */
{ for (; a->chain; a = a->chain)
if (!a->chain && a->filter == file_filter) ;
{
b = a->filter_ov; if (a->filter != file_filter)
break;
}
}
if (!a)
return -1; return -1;
b = a->filter_ov;
#ifdef HAVE_W32_SYSTEM #ifdef HAVE_W32_SYSTEM
if (SetFilePointer (b->fp, newpos, NULL, FILE_BEGIN) == 0xffffffff) if (SetFilePointer (b->fp, newpos, NULL, FILE_BEGIN) == 0xffffffff)
{ {