diff options
Diffstat (limited to 'src/format.c')
| -rw-r--r-- | src/format.c | 37 |
1 files changed, 13 insertions, 24 deletions
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); |