aboutsummaryrefslogtreecommitdiffstats
path: root/extension
diff options
context:
space:
mode:
Diffstat (limited to 'extension')
-rw-r--r--extension/ChangeLog4
-rw-r--r--extension/readdir.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/extension/ChangeLog b/extension/ChangeLog
index 31a070d8..c3bbc8ea 100644
--- a/extension/ChangeLog
+++ b/extension/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-29 Andrew J. Schorr <aschorr@telemetry-investments.com>
+
+ * readdir.c (dir_get_record): Adjust to new interface for RT.
+
2012-07-29 Arnold D. Robbins <arnold@skeeve.com>
* readdir.c (dir_take_control_of): Print error message and
diff --git a/extension/readdir.c b/extension/readdir.c
index 99073a2d..bba07ef4 100644
--- a/extension/readdir.c
+++ b/extension/readdir.c
@@ -120,13 +120,13 @@ typedef struct open_directory {
/* dir_get_record --- get one record at a time out of a directory */
static int
-dir_get_record(char **out, struct iobuf_public *iobuf, int *errcode)
+dir_get_record(char **out, struct iobuf_public *iobuf, int *errcode,
+ char **rt_start, size_t *rt_len)
{
DIR *dp;
struct dirent *dirent;
size_t len;
open_directory_t *the_dir;
- static const awk_value_t null_val = { AWK_UNDEFINED, { { 0, 0 } } };
/*
* The caller sets *errcode to 0, so we should set it only if an
@@ -136,7 +136,6 @@ dir_get_record(char **out, struct iobuf_public *iobuf, int *errcode)
if (out == NULL || iobuf == NULL || iobuf->opaque == NULL)
return EOF;
- set_RT((awk_value_t *) & null_val);
the_dir = (open_directory_t *) iobuf->opaque;
dp = the_dir->dp;
/*
@@ -159,6 +158,7 @@ dir_get_record(char **out, struct iobuf_public *iobuf, int *errcode)
*out = the_dir->buf;
len = strlen(the_dir->buf);
+ *rt_len = 0; /* set RT to "" */
return len;
}