- wire the format_ref_attr_list structure into the two plugins

1 files changed, 16 insertions, 16 deletions

diff --git a/src/format.c b/src/format.c
index eed14fa..36a6c42 100644
--- a/src/format.c
+++ b/src/format.c
@@ -63,7 +63,7 @@ static int format_expand(struct plugin_state *state,
 			 struct format_choice **outbuf_choices,
 			 char ***ref_attrs,
 			 struct format_inref_attr ***inref_attrs,
-			 struct format_ref_attr_list **ref_attr_list);
+			 struct format_ref_attr_list ***ref_attr_list);
 
 static char *
 xstrndup(const char *start, size_t length)
@@ -770,7 +770,7 @@ format_first(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e,
 	     char *outbuf, int outbuf_len,
 	     struct format_choice **outbuf_choices,
 	     char ***ref_attrs, struct format_inref_attr ***inref_attrs,
-	     struct format_ref_attr_list **ref_attr_list)
+	     struct format_ref_attr_list ***ref_attr_list)
 {
 	int ret, i, argc, first, common_length;
 	char **argv, **values;
@@ -848,7 +848,7 @@ format_deref(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e,
 	     char *outbuf, int outbuf_len,
 	     struct format_choice **outbuf_choices,
 	     char ***ref_attrs, struct format_inref_attr ***inref_attrs,
-	     struct format_ref_attr_list **ref_attr_list)
+	     struct format_ref_attr_list ***ref_attr_list)
 {
 	int i, j, ret, argc;
 	Slapi_Entry *ref;
@@ -1026,7 +1026,7 @@ format_referred(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e,
 		char *outbuf, int outbuf_len,
 		struct format_choice **outbuf_choices,
 	        char ***ref_attrs, struct format_inref_attr ***inref_attrs,
-		struct format_ref_attr_list **ref_attr_list)
+		struct format_ref_attr_list ***ref_attr_list)
 {
 	int i, ret, argc;
 	Slapi_PBlock *local_pb;
@@ -1161,7 +1161,7 @@ format_merge(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e,
 	     char *outbuf, int outbuf_len,
 	     struct format_choice **outbuf_choices,
 	     char ***ref_attrs, struct format_inref_attr ***inref_attrs,
-	     struct format_ref_attr_list **ref_attr_list)
+	     struct format_ref_attr_list ***ref_attr_list)
 {
 	int ret, i, j, argc, slen, count;
 	unsigned int *lengths;
@@ -1250,7 +1250,7 @@ format_match_generic(struct plugin_state *state,
 		     struct format_choice **outbuf_choices,
 		     char ***ref_attrs,
 		     struct format_inref_attr ***inref_attrs,
-		     struct format_ref_attr_list **ref_attr_list,
+		     struct format_ref_attr_list ***ref_attr_list,
 		     const char *fnname,
 		     char * (*match_fn)(const char *pattern, const char *value,
 		     			char **argv))
@@ -1458,7 +1458,7 @@ format_match(struct plugin_state *state,
 	     char *outbuf, int outbuf_len,
 	     struct format_choice **outbuf_choices,
 	     char ***ref_attrs, struct format_inref_attr ***inref_attrs,
-	     struct format_ref_attr_list **ref_attr_list)
+	     struct format_ref_attr_list ***ref_attr_list)
 {
 	return format_match_generic(state, pb, e, group, set, args, 2, 2,
 				    disallowed,
@@ -1490,7 +1490,7 @@ format_regmatch(struct plugin_state *state,
 		char *outbuf, int outbuf_len,
 		struct format_choice **outbuf_choices,
 		char ***ref_attrs, struct format_inref_attr ***inref_attrs,
-		struct format_ref_attr_list **ref_attr_list)
+		struct format_ref_attr_list ***ref_attr_list)
 {
 	return format_match_generic(state, pb, e, group, set, args, 2, 2,
 				    disallowed,
@@ -1615,7 +1615,7 @@ format_regsub(struct plugin_state *state,
 	      char *outbuf, int outbuf_len,
 	      struct format_choice **outbuf_choices,
 	      char ***ref_attrs, struct format_inref_attr ***inref_attrs,
-	      struct format_ref_attr_list **ref_attr_list)
+	      struct format_ref_attr_list ***ref_attr_list)
 {
 	return format_match_generic(state, pb, e, group, set, args, 3, 3,
 				    disallowed,
@@ -1639,7 +1639,7 @@ format_lookup_fn(const char *fnname)
 			       struct format_choice **outbuf_choices,
 			       char ***ref_attrs,
 			       struct format_inref_attr ***inref_attrs,
-			       struct format_ref_attr_list **ref_attr_list);
+			       struct format_ref_attr_list ***ref_attr_list);
 	} fns[] = {
 		{"first", format_first},
 		{"deref", format_deref},
@@ -1927,7 +1927,7 @@ format_expand_simple(struct plugin_state *state,
 		     struct format_choice **outbuf_choices,
 		     char ***ref_attrs,
 		     struct format_inref_attr ***inref_attrs,
-		     struct format_ref_attr_list **ref_attr_list)
+		     struct format_ref_attr_list ***ref_attr_list)
 {
 	char *shortstart, *longstart, *shortend, *longend;
 	struct berval tmp, **values;
@@ -2117,7 +2117,7 @@ format_expand(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e,
 	      char *outbuf, int outbuf_len,
 	      struct format_choice **outbuf_choices,
 	      char ***ref_attrs, struct format_inref_attr ***inref_attrs,
-	      struct format_ref_attr_list **ref_attr_list)
+	      struct format_ref_attr_list ***ref_attr_list)
 {
 	int i, j, used;
 	const char *fmtstart, *fmtend, *match, *pair;
@@ -2131,7 +2131,7 @@ format_expand(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e,
 			struct format_choice **outbuf_choices,
 			char ***ref_attrs,
 			struct format_inref_attr ***inref_attrs,
-			struct format_ref_attr_list **ref_attr_list);
+			struct format_ref_attr_list ***ref_attr_list);
 
 	spd_id = state->plugin_desc->spd_id;
 
@@ -2346,7 +2346,7 @@ format_format(struct plugin_state *state, Slapi_Entry *e,
 	      const char *fmt, const char *disallowed,
 	      struct format_choice **choices,
 	      char ***ref_attrs, struct format_inref_attr ***inref_attrs,
-	      struct format_ref_attr_list **ref_attr_list,
+	      struct format_ref_attr_list ***ref_attr_list,
 	      unsigned int *data_length)
 {
 	Slapi_PBlock *pb;
@@ -2433,7 +2433,7 @@ format_get_data(struct plugin_state *state, Slapi_Entry *e,
 		const char *fmt, const char *disallowed,
 		char ***ref_attrs,
 		struct format_inref_attr ***inref_attrs,
-		struct format_ref_attr_list **ref_attr_list,
+		struct format_ref_attr_list ***ref_attr_list,
 		unsigned int *data_length)
 {
 	unsigned int ignored;
@@ -2460,7 +2460,7 @@ format_get_data_set(struct plugin_state *state, Slapi_Entry *e,
 		    const char *fmt, const char *disallowed,
 		    char ***ref_attrs,
 		    struct format_inref_attr ***inref_attrs,
-		    struct format_ref_attr_list **ref_attr_list,
+		    struct format_ref_attr_list ***ref_attr_list,
 		    unsigned int **data_lengths)
 {
 	struct format_choice *choices, *this_choice;