--- var.c 2002/02/28 12:10:33 1.68
+++ var.c 2002/02/28 12:40:01 1.69
@@ -712,7 +712,7 @@
result->buffer_size = 0;
}
else {
- rc = (*lookup) (lookup_context, name.begin, name.end - name.begin, idx,
+ rc = (*lookup) (NULL, lookup_context, name.begin, name.end - name.begin, idx,
&data, &len, &buffer_size);
if (rc == VAR_ERR_UNDEFINED_VARIABLE) {
/* The variable is undefined. What we'll do now depends on the
@@ -817,7 +817,7 @@
if (rc < 0)
return rc;
if (rc > 0) {
- rc2 = (*lookup)(lookup_context, p, rc, 0, &data, &len, &buffer_size);
+ rc2 = (*lookup)(NULL, lookup_context, p, rc, 0, &data, &len, &buffer_size);
if (rc2 == VAR_ERR_UNDEFINED_VARIABLE && !force_expand) {
result->begin = begin;
result->end = begin + 1 + rc;
@@ -1706,7 +1706,7 @@
int *rel_lookup_flag;
};
-static int lookup_wrapper(void *context,
+static int lookup_wrapper(var_t *var, void *context,
const char *name, size_t name_len, int idx,
const char **data, size_t *data_len,
size_t *buffer_size)
@@ -1715,7 +1715,7 @@
struct wrapper_context *wcon = context;
int rc;
- rc = (*wcon->lookup)(wcon->context, name, name_len,
+ rc = (*wcon->lookup)(NULL, wcon->context, name, name_len,
idx, data, data_len, buffer_size);
if (rc == VAR_ERR_UNDEFINED_VARIABLE) {
(*wcon->rel_lookup_flag)--;
|
