ad21d3a Remove xstring from plugin interface — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Remove xstring from plugin interface

Baptiste Daroussin committed 5 years ago

commit ad21d3a776f53c9e2297be05078bb1868591b485
parent 9edfc37

1 file changed +6 -5

modified libpkg/plugins.c

@@ -52,7 +52,7 @@ struct plugin_hook {

 };
 struct pkg_plugin {
 	UT_string *fields[PLUGIN_NUMFIELDS];
 	xstring *fields[PLUGIN_NUMFIELDS];
 	void *lh;						/* library handle */
 	bool parsed;
 	struct plugin_hook *hooks;

@@ -88,7 +88,7 @@ plug_free(struct pkg_plugin *p)

 	unsigned int i;
 	for (i = 0; i < PLUGIN_NUMFIELDS; i++)
 		utstring_free(p->fields[i]);
 		xstring_free(p->fields[i]);
 	ucl_object_unref(p->conf);
 	pkg_plugin_hook_free(p);

@@ -150,8 +150,9 @@ pkg_plugin_set(struct pkg_plugin *p, pkg_plugin_key key, const char *str)

 {
 	assert(p != NULL);
 	utstring_renew(p->fields[key]);
 	utstring_printf(p->fields[key], "%s", str);
 	xstring_renew(p->fields[key]);
 	fprintf(p->fields[key]->fp, "%s", str);
 	fflush(p->fields[key]->fp);
 	return (EPKG_OK);
 }

@@ -163,7 +164,7 @@ pkg_plugin_get(struct pkg_plugin *p, pkg_plugin_key key)

 	if (p->fields[key] == NULL)
 		return (NULL);
 	return (utstring_body(p->fields[key]));
 	return (p->fields[key]->buf);
 }
 int