- don't even support passing a pblock into format_get_data(), because we have

  never actually done that

1 files changed, 4 insertions, 15 deletions

diff --git a/src/format.c b/src/format.c
index 6041c63..c5c7a1f 100644
--- a/src/format.c
+++ b/src/format.c
@@ -2155,30 +2155,19 @@ format_format(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e,
 }
 
 char *
-format_get_data(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e,
+format_get_data(struct plugin_state *state, Slapi_Entry *e,
 		const char *domain, const char *map,
 		const char *fmt, const char *disallowed,
 		char ***ref_attrs,
 		struct format_inref_attr ***inref_attrs)
 {
-	Slapi_PBlock *local_pb;
+	Slapi_PBlock *pb;
 	char ***ndn_list, **local_ndn_list, *ret;
 
-	/* Supply a PBlock if the caller didn't. */
-	if (pb == NULL) {
-		local_pb = slapi_pblock_new();
-		pb = local_pb;
-	} else {
-		local_pb = NULL;
-	}
-
+	pb = slapi_pblock_new();
 	ret = format_format(state, pb, e, domain, map, fmt, disallowed,
 			    NULL, ref_attrs, inref_attrs);
-
-	/* If we supplied a PBlock, clean it up. */
-	if (pb == local_pb) {
-		slapi_pblock_destroy(local_pb);
-	}
+	slapi_pblock_destroy(pb);
 
 	return ret;
 }