--- var.c 2001/12/14 13:42:56 1.49
+++ var.c 2001/12/14 13:47:01 1.50
@@ -690,7 +690,7 @@
size_t len, buffer_size;
int failed = 0;
int rc;
- int index = 0;
+ int idx = 0;
tokenbuf_t name;
tokenbuf_t tmp;
@@ -747,7 +747,7 @@
/* If the next token is START-INDEX, read the index specification. */
if (config->startindex && *p == config->startindex) {
- rc = num_exp(++p, end, current_index, &index, &failed,
+ rc = num_exp(++p, end, current_index, &idx, &failed,
rel_lookup_flag, config, nameclass, lookup, lookup_context);
if (rc < 0)
goto error_return;
@@ -785,7 +785,7 @@
result->buffer_size = 0;
}
else {
- rc = (*lookup) (lookup_context, name.begin, name.end - name.begin, index,
+ rc = (*lookup) (lookup_context, name.begin, name.end - name.begin, idx,
&data, &len, &buffer_size);
if (rc < 0)
goto error_return;
@@ -1766,7 +1766,7 @@
};
static int lookup_wrapper(void *context,
- const char *varname, size_t name_len, int index,
+ const char *name, size_t name_len, int idx,
const char **data, size_t *data_len,
size_t *buffer_size)
{
@@ -1774,8 +1774,8 @@
struct wrapper_context *wcon = context;
int rc;
- rc = (*wcon->lookup)(wcon->context, varname, name_len,
- index, data, data_len, buffer_size);
+ rc = (*wcon->lookup)(wcon->context, name, name_len,
+ idx, data, data_len, buffer_size);
if (rc == 0) {
(*wcon->rel_lookup_flag)--;
*data = buf;
|
