diff options
Diffstat (limited to 'extension')
| -rw-r--r-- | extension/ChangeLog | 6 | ||||
| -rw-r--r-- | extension/readdir.c | 31 |
2 files changed, 18 insertions, 19 deletions
diff --git a/extension/ChangeLog b/extension/ChangeLog index 1836b2cc..e2e0b635 100644 --- a/extension/ChangeLog +++ b/extension/ChangeLog @@ -1,3 +1,9 @@ +2012-07-26 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * readdir.c (dir_get_record): No need to set *errcode to 0. + (dir_take_control_of): Remove some paranoia -- no need to test for + NULL iobuf, and no need to check dir_can_take_file again. + 2012-07-25 Arnold D. Robbins <arnold@skeeve.com> * readdir.c: New file. diff --git a/extension/readdir.c b/extension/readdir.c index a39e0c3a..c838ea72 100644 --- a/extension/readdir.c +++ b/extension/readdir.c @@ -106,8 +106,10 @@ dir_get_record(char **out, struct iobuf_public *iobuf, int *errcode) if (out == NULL || iobuf == NULL || iobuf->opaque == NULL) return EOF; - if (errcode != NULL) - *errcode = 0; + /* + * The caller sets *errcode to 0, so we should set it only if an + * error occurs. + */ /* FIXME: Need stuff for setting RT */ dp = (DIR *) iobuf->opaque; @@ -152,32 +154,23 @@ dir_can_take_file(IOBUF_PUBLIC *iobuf) return (fd >= 0 && fstat(fd, & sbuf) >= 0 && S_ISDIR(sbuf.st_mode)); } -/* dir_take_control_of --- set up input parser */ +/* dir_take_control_of --- set up input parser. We can assume that dir_can_take_file just returned true, and no state has changed since then. */ static int dir_take_control_of(IOBUF_PUBLIC *iobuf) { struct stat sbuf; - int fd; - DIR *dp = NULL; + DIR *dp; - if (iobuf == NULL) + dp = fdopendir(iobuf->fd); + if (dp == NULL) return 0; - fd = iobuf->fd; - if (dir_can_take_file(iobuf)) { - dp = fdopendir(fd); - if (dp == NULL) - return 0; - - iobuf->opaque = dp; - iobuf->get_record = dir_get_record; - iobuf->close_func = dir_close; - - return 1; - } + iobuf->opaque = dp; + iobuf->get_record = dir_get_record; + iobuf->close_func = dir_close; - return 0; + return 1; } static awk_input_parser_t readdir_parser = { |