diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/back-nis.c | 20 | ||||
-rw-r--r-- | src/back-sch.c | 13 | ||||
-rw-r--r-- | src/back-shr.c | 1 | ||||
-rw-r--r-- | src/format.c | 14 | ||||
-rw-r--r-- | src/map.c | 2 |
5 files changed, 14 insertions, 36 deletions
diff --git a/src/back-nis.c b/src/back-nis.c index 72b3b12..1d3e946 100644 --- a/src/back-nis.c +++ b/src/back-nis.c @@ -395,16 +395,13 @@ backend_set_config_read_config(struct plugin_state *state, Slapi_Entry *e, struct backend_set_data ret; const char *default_filter, *default_key_format, *default_keys_format; const char *default_value_format, *default_disallowed_chars; - char **bases, *entry_filter, *tmp; - char **key_formats, **keys_formats, *value_format, *actual_attr; + char **bases, *entry_filter; + char **key_formats, **keys_formats, *value_format; char *disallowed_chars; char **use_bases, *use_entry_filter; char **use_key_formats, **use_keys_formats; char *use_value_format, *use_disallowed_chars; - const char *cvalue; - int i, j, disposition, buffer_flags, count; - Slapi_ValueSet *values; - Slapi_Value *value; + int i; /* Read the hard-coded defaults for a map with this name. */ defaults_get_map_config(map, secure, &default_filter, &default_key_format, &default_keys_format, @@ -521,11 +518,8 @@ backend_set_config_read_config(struct plugin_state *state, Slapi_Entry *e, int backend_set_config_entry_add_cb(Slapi_Entry *e, void *callback_data) { - char **domains, **maps, *actual_attr; - const char *cvalue; - Slapi_ValueSet *values; - Slapi_Value *value; - int i, j, ret, disposition, buffer_flags, count; + char **domains, **maps; + int i, j, ret; struct plugin_state *state; state = callback_data; @@ -551,10 +545,8 @@ backend_update_params(struct plugin_state *state) { Slapi_DN *our_dn; Slapi_Entry *our_entry; - Slapi_ValueSet *values; - Slapi_Value *value; char *tmp, **tmpv; - int i, j; + int i; our_dn = slapi_sdn_new_dn_byval(state->plugin_base); if (our_dn == NULL) { slapi_log_error(SLAPI_LOG_PLUGIN, diff --git a/src/back-sch.c b/src/back-sch.c index c10421a..93df40b 100644 --- a/src/back-sch.c +++ b/src/back-sch.c @@ -147,12 +147,7 @@ backend_set_config_read_config(struct plugin_state *state, Slapi_Entry *e, { char **bases, *entry_filter, **attributes, *rdn_format, *dn; bool_t check_access; - char *actual_attr; - const char *cvalue; - int i, j, disposition, buffer_flags, count; struct backend_set_data ret; - Slapi_ValueSet *values; - Slapi_Value *value; /* Read the values from the configuration entry. */ bases = backend_shr_get_vattr_strlist(state, e, @@ -347,11 +342,8 @@ backend_set_entry(Slapi_Entry *e, struct backend_set_data *data) int backend_set_config_entry_add_cb(Slapi_Entry *e, void *callback_data) { - char **groups, **containers, *actual_attr; - const char *cvalue; - Slapi_ValueSet *values; - Slapi_Value *value; - int i, j, ret, disposition, buffer_flags, count; + char **groups, **containers; + int i, j, ret; struct plugin_state *state; state = callback_data; @@ -396,7 +388,6 @@ struct backend_get_set_config_cb { void backend_free_set_config(char **bases, char *entry_filter) { - int i; backend_shr_free_strlist(bases); free(entry_filter); } diff --git a/src/back-shr.c b/src/back-shr.c index d275ba4..570d7f9 100644 --- a/src/back-shr.c +++ b/src/back-shr.c @@ -423,7 +423,6 @@ backend_shr_get_vattr_str(struct plugin_state *state, Slapi_Value *value; int disposition, buffer_flags; char *actual_attr, *ret; - const char *cvalue; int i; ret = NULL; if (slapi_vattr_values_get(e, (char *) attribute, diff --git a/src/format.c b/src/format.c index 482f306..f249b0b 100644 --- a/src/format.c +++ b/src/format.c @@ -314,7 +314,6 @@ static void format_free_choices(struct format_choice *choices) { struct format_choice *next; - int i; while (choices != NULL) { next = choices->next; format_free_bv_list(choices->values); @@ -354,9 +353,7 @@ format_add_choice(struct format_choice **choices, char *offset, struct berval **values) { struct format_choice *choice; - unsigned int size; int i; - char *p; if (values != NULL) { choice = malloc(sizeof(*choice)); if (choice != NULL) { @@ -485,7 +482,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, argc; + int ret, i, argc; Slapi_ValueSet *values; Slapi_Value *value; const struct berval *val; @@ -539,7 +536,7 @@ format_deref(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, slen, ret, argc; + int i, j, ret, argc; Slapi_Entry *ref; Slapi_DN *refdn; Slapi_ValueSet *ref_values, *values; @@ -850,7 +847,7 @@ format_merge(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, j, argc, len, slen, count; + int ret, i, j, argc, slen, count; unsigned int *lengths; char **argv, **values; const char *sep; @@ -1344,7 +1341,7 @@ format_single(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, const char *d; const struct berval *val; struct berval bv; - int count, disposition, buffer_flags, i, j; + int count, disposition, buffer_flags, i; memset(&bv, 0, sizeof(bv)); if (slapi_vattr_values_get(e, (char *) attr, &value_set, &disposition, &actual_attr, @@ -1451,7 +1448,6 @@ format_trim_value(struct plugin_state *state, struct berval input, struct berval ret; char *buf; unsigned int i, len; - int j, k; buf = xmemdup(input.bv_val, input.bv_len); len = input.bv_len; if (buf != NULL) { @@ -2109,7 +2105,7 @@ format_get_data_set(struct plugin_state *state, Slapi_Entry *e, { struct format_choice *choices, *this_choice; struct berval *val; - char **ret, *template, *s; + char **ret, *template; int combinations, groupsize, i, j, k, offset, length; unsigned int template_len; choices = NULL; @@ -306,7 +306,7 @@ map_data_foreach_domain(struct plugin_state *state, bool_t (*fn)(const char *domain, void *cbdata), void *cbdata) { - int i, j; + int i; for (i = 0; i < map_data.n_domains; i++) { if (!(*fn)(map_data.domains[i].name, cbdata)) { return FALSE; |