diff options
| author | Nalin Dahyabhai <nalin@dahyabhai.net> | 2011-05-13 16:38:20 -0400 |
|---|---|---|
| committer | Nalin Dahyabhai <nalin@dahyabhai.net> | 2011-05-13 16:38:20 -0400 |
| commit | eafbbe72d850f547e345934c4a9858e9720c3622 (patch) | |
| tree | 1f282d6c596910c6927afc7d95de2b4f33fa8cf8 /src/format.c | |
| parent | 11eda2321a9545f3213ce91bfacb02018c6f2d98 (diff) | |
- handle some unuseds
Diffstat (limited to 'src/format.c')
| -rw-r--r-- | src/format.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/format.c b/src/format.c index 51be5e9..c0f0e13 100644 --- a/src/format.c +++ b/src/format.c @@ -986,7 +986,7 @@ format_deref_x(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, struct format_ref_attr_list ***ref_attr_list, struct format_ref_attr_list ***inref_attr_list) { - int i, j, ret; + int i, j; Slapi_Entry *ref; Slapi_DN *refdn; Slapi_ValueSet *ref_values, *values; @@ -1178,7 +1178,7 @@ format_deref_rx(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, struct format_ref_attr_list ***ref_attr_list, struct format_ref_attr_list ***inref_attr_list) { - int i, j, k, ret, argc; + int i, j, k, argc; Slapi_Entry *entry; Slapi_DN **these, **next; Slapi_ValueSet *values; @@ -1937,7 +1937,6 @@ format_merge(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, unsigned int *lengths; char **argv, **values; const char *sep; - struct format_choice *these_choices; ret = format_parse_args(state, args, &argc, &argv); if (ret != 0) { @@ -1957,7 +1956,6 @@ format_merge(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, /* Expand this argument. */ slapi_log_error(SLAPI_LOG_PLUGIN, state->plugin_desc->spd_id, "merge: expanding ->%s<-\n", argv[i]); - these_choices = NULL; values = format_get_data_set(state, e, group, set, argv[i], disallowed, ref_attrs, inref_attrs, @@ -2826,7 +2824,7 @@ format_single(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, { Slapi_ValueSet *value_set; Slapi_Value *value; - char *ret, *actual_attr; + char *actual_attr; const char *d; const struct berval *val; struct berval bv; @@ -2838,7 +2836,6 @@ format_single(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, return bv; } count = slapi_valueset_count(value_set); - ret = NULL; if (count == 1) { if (slapi_valueset_first_value(value_set, &value) != -1) { val = slapi_value_get_berval(value); |