- handle some unuseds
Nalin Dahyabhai
13 years ago
985 | 985 | struct format_ref_attr_list ***ref_attr_list, |
986 | 986 | struct format_ref_attr_list ***inref_attr_list) |
987 | 987 | { |
988 | int i, j, ret; | |
988 | int i, j; | |
989 | 989 | Slapi_Entry *ref; |
990 | 990 | Slapi_DN *refdn; |
991 | 991 | Slapi_ValueSet *ref_values, *values; |
1177 | 1177 | struct format_ref_attr_list ***ref_attr_list, |
1178 | 1178 | struct format_ref_attr_list ***inref_attr_list) |
1179 | 1179 | { |
1180 | int i, j, k, ret, argc; | |
1180 | int i, j, k, argc; | |
1181 | 1181 | Slapi_Entry *entry; |
1182 | 1182 | Slapi_DN **these, **next; |
1183 | 1183 | Slapi_ValueSet *values; |
1936 | 1936 | unsigned int *lengths; |
1937 | 1937 | char **argv, **values; |
1938 | 1938 | const char *sep; |
1939 | struct format_choice *these_choices; | |
1940 | 1939 | |
1941 | 1940 | ret = format_parse_args(state, args, &argc, &argv); |
1942 | 1941 | if (ret != 0) { |
1956 | 1955 | /* Expand this argument. */ |
1957 | 1956 | slapi_log_error(SLAPI_LOG_PLUGIN, state->plugin_desc->spd_id, |
1958 | 1957 | "merge: expanding ->%s<-\n", argv[i]); |
1959 | these_choices = NULL; | |
1960 | 1958 | values = format_get_data_set(state, e, group, set, |
1961 | 1959 | argv[i], disallowed, |
1962 | 1960 | ref_attrs, inref_attrs, |
2825 | 2823 | { |
2826 | 2824 | Slapi_ValueSet *value_set; |
2827 | 2825 | Slapi_Value *value; |
2828 | char *ret, *actual_attr; | |
2826 | char *actual_attr; | |
2829 | 2827 | const char *d; |
2830 | 2828 | const struct berval *val; |
2831 | 2829 | struct berval bv; |
2837 | 2835 | return bv; |
2838 | 2836 | } |
2839 | 2837 | count = slapi_valueset_count(value_set); |
2840 | ret = NULL; | |
2841 | 2838 | if (count == 1) { |
2842 | 2839 | if (slapi_valueset_first_value(value_set, &value) != -1) { |
2843 | 2840 | val = slapi_value_get_berval(value); |