- remove unused variables

- add a backend_data item to map entries

7 files changed, 47 insertions, 58 deletions

diff --git a/src/backend.c b/src/backend.c
index d9b7f87..2dd028d 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -126,7 +126,6 @@ backend_read_master_name(struct plugin_state *state, char **master)
 static void
 backend_free_strlist(char **strlist)
 {
-	int i;
 	if (strlist) {
 		free(strlist);
 	}
@@ -363,7 +362,7 @@ backend_map_config_entry_add_one_cb(Slapi_Entry *e, void *callback_data)
 					all_keys[i], ndn, value);
 		}
 		map_data_set_entry(data->state, data->domain, data->map, ndn,
-				   NULL, all_keys, -1, value);
+				   NULL, all_keys, -1, value, NULL, NULL);
 	} else {
 		slapi_log_error(SLAPI_LOG_PLUGIN, plugin_id,
 				"no value for %s, unsetting domain/map/id"
@@ -509,8 +508,7 @@ backend_map_config_read_config(struct plugin_state *state, Slapi_Entry *e,
 	const char *default_value_format, *default_disallowed_chars;
 	char **bases, *entry_filter;
 	char **key_formats, **keys_formats, *value_format, *actual_attr;
-	char **ref_attrs, *disallowed_chars;
-	struct format_inref_attr **inref_attrs;
+	char *disallowed_chars;
 	char **use_bases, *use_entry_filter;
 	char **use_key_formats, **use_keys_formats;
 	char *use_value_format, *use_disallowed_chars;
@@ -866,7 +864,7 @@ backend_read_params(struct plugin_state *state)
 	Slapi_Value *value;
 	char *actual_attr;
 	const char *cvalue;
-	int disposition, buffer_flags, ivalue, i, j;
+	int disposition, buffer_flags, i, j;
 	unsigned int uvalue;
 	char *attrs[] = {
 		PLUGIN_CONFIGURATION_MAXVALUE_ATTR,
@@ -976,7 +974,7 @@ void
 backend_startup(struct plugin_state *state)
 {
 	Slapi_PBlock *pb;
-	char *attrs = NULL;
+
 	backend_read_params(state);
 
 	pb = slapi_pblock_new();
@@ -1008,7 +1006,7 @@ static int
 backend_map_config_entry_delete_cb(Slapi_Entry *e, void *callback_data)
 {
 	char **domains, **maps;
-	int i, j, ret;
+	int i, j;
 	struct plugin_state *state;
 
 	state = callback_data;
@@ -1037,7 +1035,6 @@ struct backend_get_map_config_cb {
 void
 backend_free_map_config(char **bases, char *entry_filter)
 {
-	int i;
 	backend_free_strlist(bases);
 	free(entry_filter);
 }
@@ -1048,7 +1045,7 @@ backend_get_map_config_entry_cb(Slapi_Entry *e, void *callback_data)
 	Slapi_ValueSet *values;
 	Slapi_Value *value;
 	struct backend_get_map_config_cb *cbdata;
-	char *actual_attr, **ret;
+	char *actual_attr;
 	const char *cvalue;
 	int disposition, buffer_flags, i, count;
 
@@ -1295,7 +1292,7 @@ backend_update_references_cb(const char *domain, const char *map, bool_t secure,
 	Slapi_DN *referred_to_sdn;
 	Slapi_ValueSet *values;
 	Slapi_Value *value;
-	char **referred_to_dn, **ref_attrs, *actual_attr, *filter, *tndn;
+	char **ref_attrs, *actual_attr, *filter, *tndn;
 	struct format_inref_attr **inref_attrs;
 	const char *ndn, *dn;
 	int i, j, disposition, buffer_flags, filter_size, n_ref_attrs;
@@ -1460,8 +1457,6 @@ static bool_t
 backend_add_entry_cb(const char *domain, const char *map, bool_t secure,
 		     void *backend_data, void *cbdata_ptr)
 {
-	Slapi_DN *base_sdn, *entry_sdn;
-	Slapi_Filter *filter;
 	struct backend_map_data *map_data;
 	struct backend_add_entry_cbdata *cbdata;
 
@@ -1548,8 +1543,6 @@ static bool_t
 backend_modify_entry_cb(const char *domain, const char *map, bool_t secure,
 			void *backend_data, void *cbdata_ptr)
 {
-	Slapi_DN *base_sdn, *entry_sdn;
-	Slapi_Filter *filter;
 	struct backend_map_data *map_data;
 	struct backend_modify_entry_cbdata *cbdata;
 
diff --git a/src/dispatch.c b/src/dispatch.c
index 69a8555..1abfef5 100644
--- a/src/dispatch.c
+++ b/src/dispatch.c
@@ -726,9 +726,7 @@ static void
 client_write(struct plugin_state *state, struct dispatch_client *client)
 {
 	ssize_t count;
-	int32_t len, nlen;
-	int last;
-	char *query;
+	int32_t len;
 	struct dispatch_client_data client_data;
 
 	/* Try to send some of the pending data. */
@@ -799,10 +797,6 @@ dispatch_service_client(struct plugin_state *state,
 			struct dispatch_client *client,
 			struct pollfd *fd)
 {
-	ssize_t count;
-	int32_t len, nlen;
-	int last;
-	char *query;
 	switch (client->client_state) {
 	case client_reading:
 		if (fd->revents & POLLIN) {
@@ -831,12 +825,9 @@ void *
 dispatch_thread(struct wrapped_thread *t)
 {
 	struct dispatch_client *clients, *client, *next, **list;
-	struct dispatch_client_data client_data;
 	struct plugin_state *state = wrap_thread_arg(t);
-	struct request_info *request_info;
 	struct pollfd *fds;
 	int i, n_fds, client_count;
-	ssize_t count;
 	bool_t stop;
 
 	clients = NULL;
diff --git a/src/format.c b/src/format.c
index d7e570c..ca36866 100644
--- a/src/format.c
+++ b/src/format.c
@@ -418,7 +418,7 @@ format_first(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e,
 	     struct format_choice **outbuf_choices,
 	     char ***ref_attrs, struct format_inref_attr ***inref_attrs)
 {
-	int ret, i, len, slen, count, argc;
+	int ret, i, len, argc;
 	Slapi_ValueSet *values;
 	Slapi_Value *value;
 	char **argv, *actual_attr;
@@ -706,7 +706,7 @@ format_referred_entry_cb(Slapi_Entry *e, void *callback_data)
 {
 	Slapi_ValueSet *values;
 	Slapi_Value *value;
-	int i, j, disposition, buffer_flags, len, slen;
+	int i, disposition, buffer_flags, len, slen;
 	char *actual_attr;
 	const char *cvalue;
 	struct format_referred_cbdata *cbdata;
@@ -779,15 +779,9 @@ format_referred(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e,
 		struct format_choice **outbuf_choices,
 	        char ***ref_attrs, struct format_inref_attr ***inref_attrs)
 {
-	int i, j, len, slen, ret, count, argc;
-	Slapi_Entry *ref;
-	Slapi_DN *refdn;
-	Slapi_ValueSet *ref_values, *values;
-	Slapi_Value *ref_value, *value;
+	int i, ret, argc;
 	Slapi_PBlock *local_pb;
-	int disposition, ref_disposition, buffer_flags, ref_buffer_flags;
-	char **argv, *attrs[2], *actual_attr, *actual_ref_attr, *filter, *tndn;
-	const char *sep, *cvalue, *cref;
+	char **argv, *attrs[2], *filter, *tndn;
 	char *map_filter, **map_bases;
 	struct format_referred_cbdata cbdata;
 
@@ -996,8 +990,8 @@ format_match_generic(struct plugin_state *state,
 	Slapi_ValueSet *values;
 	Slapi_Value *value;
 	const char *cvalue;
-	char *actual_attr, **argv, *tmp, **matches, *plugin_id;
-	int i, j, count, argc, disposition, buffer_flags;
+	char *actual_attr, **argv, **matches, *plugin_id;
+	int i, count, argc, disposition, buffer_flags;
 	int ret, len;
 
 	plugin_id = state->plugin_desc->spd_id;
@@ -1809,12 +1803,9 @@ format_expand(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e,
 	      char ***ref_attrs, struct format_inref_attr ***inref_attrs)
 {
 	int i, j, used;
-	const char *fmtstart, *fmtend, *match, *attribute, *pair;
-	char *subexp, *fnname, *params, *spd_id, *p;
-	const char *default_value, *alternate_value, *paramstart, *paramend;
-	char *shortstart, *longstart, *shortend, *longend;
-	char *replace, *replaceall, *replaceval;
-	size_t spn;
+	const char *fmtstart, *fmtend, *match, *pair;
+	char *subexp, *fnname, *params, *spd_id;
+	const char *paramstart, *paramend;
 	int (*formatfn)(struct plugin_state *state,
 		        Slapi_PBlock *pb, Slapi_Entry *e,
 			const char *domain, const char *map,
@@ -2037,10 +2028,8 @@ format_format(struct plugin_state *state, Slapi_Entry *e,
 	      char ***ref_attrs, struct format_inref_attr ***inref_attrs)
 {
 	Slapi_PBlock *pb;
-	struct format_choice *this_choice;
-	char *buf, *tmp, *ret, *spd_id;
-	const char *match, *fmtstart, *fmtend;
-	int i, buflen, exp_len;
+	char *buf, *ret, *spd_id;
+	int i, buflen;
 
 	spd_id = state->plugin_desc->spd_id;
 	buflen = DEFAULT_BUFFER_SIZE;
@@ -2145,8 +2134,8 @@ format_get_data_set(struct plugin_state *state, Slapi_Entry *e,
 		    struct format_inref_attr ***inref_attrs)
 {
 	struct format_choice *choices, *this_choice;
-	char **ret, *template, *s, *p, *q;
-	int combinations, group, nth, i, j, k, offset, length, template_len;
+	char **ret, *template, *s;
+	int combinations, group, i, j, k, offset, length, template_len;
 	choices = NULL;
 	template = format_format(state, e, domain, map, fmt, disallowed,
 				 &choices, ref_attrs, inref_attrs);
diff --git a/src/map.c b/src/map.c
index a2037b0..74028c8 100644
--- a/src/map.c
+++ b/src/map.c
@@ -73,6 +73,9 @@ struct {
 				/* Key index for comparison.  Used by the
 				 * key_trees. */
 				int key_index;
+				/* Callback data supplied by the map writer. */
+				void *backend_data;
+				void (*free_backend_data)(void *backend_data);
 			} *entries;
 			/* Search trees to speed up searches for entries. */
 			unsigned int n_key_trees;
@@ -180,7 +183,6 @@ map_data_find_map_entry(struct plugin_state *state,
 			struct map *map, unsigned int key_len, const char *key)
 {
 	struct map_entry **entry, entry_template;
-	void **p;
 	unsigned int i;
 	if ((map == NULL) || (map->entries == NULL)) {
 		return NULL;
@@ -213,7 +215,6 @@ map_data_find_map_entry_id(struct plugin_state *state,
 			   struct map *map, const char *id)
 {
 	struct map_entry **entry, entry_template;
-	void **p;
 	if (map == NULL) {
 		return NULL;
 	}
@@ -233,6 +234,7 @@ map_data_foreach_entry(struct plugin_state *state,
 				    const char *key, unsigned int key_len,
 				    const char *value, unsigned int value_len,
 				    const char *id, int key_index,
+				    void *backend_data,
 				    void *cbdata),
 		       void *cbdata)
 {
@@ -260,6 +262,7 @@ map_data_foreach_entry(struct plugin_state *state,
 							   entry->value,
 							   entry->value_len,
 							   entry->id, k,
+							   entry->backend_data,
 							   cbdata)) {
 							return FALSE;
 						}
@@ -281,7 +284,7 @@ map_data_foreach_entry_id(struct plugin_state *state, const char *id,
 				       const char *value,
 				       unsigned int value_len,
 				       const char *id, int key_index,
-				       void *cbdata),
+				       void *backend_data, void *cbdata),
 			  void *cbdata)
 {
 	return map_data_foreach_entry(state, FALSE, id, fn, cbdata);
@@ -302,7 +305,6 @@ map_data_foreach_map(struct plugin_state *state, const char *domain_name,
 	int i, j;
 	struct domain *domain;
 	struct map *map;
-	struct map_entry *entry;
 	for (i = 0; i < map_data.n_domains; i++) {
 		domain = &map_data.domains[i];
 		if ((domain_name != NULL) &&
@@ -535,7 +537,6 @@ map_next_id(struct plugin_state *state,
 {
 	struct map *map;
 	struct map_entry *entry;
-	unsigned int key_index;
 	map = map_data_find_map(state, domain_name, map_name);
 	if (map == NULL) {
 		return FALSE;
@@ -813,8 +814,13 @@ map_data_unset_map_entry(struct plugin_state *state,
 			free(entry->keys[i]);
 		}
 		free(entry->keys);
-		/* The value and the key itself. */
+		/* The value. */
 		free(entry->value);
+		/* Backend data. */
+		if (entry->free_backend_data != NULL) {
+			entry->free_backend_data(entry->backend_data);
+		}
+		/* The entry itself. */
 		free(entry);
 	}
 }
@@ -843,7 +849,9 @@ map_data_set_entry(struct plugin_state *state,
 		   unsigned int *key_lengths,
 		   char **keys,
 		   unsigned int value_len,
-		   char *value)
+		   char *value,
+		   void *backend_data,
+		   void (*free_backend_data)(void *p))
 {
 	struct map *map;
 	struct map_entry *entry;
@@ -924,6 +932,12 @@ map_data_set_entry(struct plugin_state *state,
 			entry->value = xmemdup(value, value_len);
 			entry->value_len = value_len;
 			entry->id = strdup(id);
+			/* Reset the backend data. */
+			if (entry->free_backend_data != NULL) {
+				entry->free_backend_data(entry->backend_data);
+			}
+			entry->backend_data = backend_data;
+			entry->free_backend_data = free_backend_data;
 			/* Add the ID to the tree and all of the keys to their
 			 * trees. */
 			tsearch(entry, &map->id_tree, t_compare_entry_by_id);
@@ -976,6 +990,8 @@ map_data_set_entry(struct plugin_state *state,
 						t_compare_entry_by_nth_key);
 					entry->key_index = -1;
 				}
+				entry->backend_data = backend_data;
+				entry->free_backend_data = free_backend_data;
 				tsearch(entry, &map->id_tree,
 					t_compare_entry_by_id);
 			} else {
diff --git a/src/map.h b/src/map.h
index bb79ed2..6a8e4a5 100644
--- a/src/map.h
+++ b/src/map.h
@@ -80,7 +80,8 @@ void map_data_set_entry(struct plugin_state *state,
 			const char *domain_name, const char *map_name,
 			const char *id,
 			unsigned int *key_lengths, char **keys,
-			unsigned int value_len, char *value);
+			unsigned int value_len, char *value,
+			void *backend_data, void (*free_backend_data)(void *p));
 bool_t map_data_check_entry(struct plugin_state *state,
 			    const char *domain_name, const char *map_name,
 			    const char *id);
@@ -93,6 +94,7 @@ bool_t map_data_foreach_entry_id(struct plugin_state *state, const char *id,
 					      const char *value,
 					      unsigned int value_len,
 					      const char *id, int key_index,
+					      void *backend_data,
 					      void *cbdata),
 				 void *cbdata);
 bool_t map_data_foreach_map(struct plugin_state *state, const char *domain_name,
diff --git a/src/plugin.c b/src/plugin.c
index 56da368..f7854b2 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -175,7 +175,6 @@ plugin_read_config(Slapi_PBlock *plugin_pb, int *port)
 static int
 plugin_state_init(Slapi_PBlock *pb, struct plugin_state **lstate)
 {
-	struct servent *serv;
 	int port, sockfd = -1, err, i;
 	struct plugin_state *state = NULL;
 	struct sockaddr_in sin;
diff --git a/src/wrap.c b/src/wrap.c
index a2ac5ba..e29cc67 100644
--- a/src/wrap.c
+++ b/src/wrap.c
@@ -97,7 +97,6 @@ struct wrapped_thread *
 wrap_start_thread(void * (*fn)(struct wrapped_thread *), void *arg)
 {
 	struct wrapped_thread *t;
-	void *returned;
 	t = malloc(sizeof(*t));
 	if (t == NULL) {
 		return NULL;