Codebase list slapi-nis / 878ab7f
- don't even support passing a pblock into format_get_data(), because we have never actually done that Nalin Dahyabhai 15 years ago
3 changed file(s) with 7 addition(s) and 20 deletion(s). Raw diff Collapse all Expand all
+2
-2
src/backend.c less more
252252 keys = malloc((data->n_key_formats + 1) * sizeof(char *));
253253 if (keys != NULL) {
254254 for (i = 0; i < data->n_key_formats; i++) {
255 keys[i] = format_get_data(data->state, NULL, e,
255 keys[i] = format_get_data(data->state, e,
256256 data->domain, data->map,
257257 data->key_formats[i],
258258 data->disallowed_chars,
263263 } else {
264264 return 0;
265265 }
266 value = format_get_data(data->state, NULL, e, data->domain, data->map,
266 value = format_get_data(data->state, e, data->domain, data->map,
267267 data->value_format, data->disallowed_chars,
268268 &data->ref_attrs, &data->inref_attrs);
269269 /* Pull out the NDN of this entry. */
+4
-15
src/format.c less more
21542154 }
21552155
21562156 char *
2157 format_get_data(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e,
2157 format_get_data(struct plugin_state *state, Slapi_Entry *e,
21582158 const char *domain, const char *map,
21592159 const char *fmt, const char *disallowed,
21602160 char ***ref_attrs,
21612161 struct format_inref_attr ***inref_attrs)
21622162 {
2163 Slapi_PBlock *local_pb;
2163 Slapi_PBlock *pb;
21642164 char ***ndn_list, **local_ndn_list, *ret;
21652165
2166 /* Supply a PBlock if the caller didn't. */
2167 if (pb == NULL) {
2168 local_pb = slapi_pblock_new();
2169 pb = local_pb;
2170 } else {
2171 local_pb = NULL;
2172 }
2173
2166 pb = slapi_pblock_new();
21742167 ret = format_format(state, pb, e, domain, map, fmt, disallowed,
21752168 NULL, ref_attrs, inref_attrs);
2176
2177 /* If we supplied a PBlock, clean it up. */
2178 if (pb == local_pb) {
2179 slapi_pblock_destroy(local_pb);
2180 }
2169 slapi_pblock_destroy(pb);
21812170
21822171 return ret;
21832172 }
+1
-3
src/format.h less more
2020
2121 #ifndef format_h
2222 #define format_h
23 struct slapi_pblock;
2423 struct slapi_entry;
2524 struct plugin_state;
2625
3534 struct format_inref_attr **format_dup_inref_attrs(struct format_inref_attr **);
3635
3736 void format_free_data(char *data);
38 char *format_get_data(struct plugin_state *state,
39 struct slapi_pblock *pb, struct slapi_entry *e,
37 char *format_get_data(struct plugin_state *state, struct slapi_entry *e,
4038 const char *domain, const char *map,
4139 const char *fmt, const char *disallowed_chars,
4240 char ***ref_attrs,