98def53 Move the pkg_event argument check to a separate function. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Move the pkg_event argument check to a separate function.

Will Andrews committed 14 years ago

commit 98def53dd104db91d9c750726929d6b91ec8b76f
parent 4052cdd

1 file changed +16 -9

modified libpkg/pkg_handle.c

@@ -21,17 +21,11 @@ pkg_handle_get_event_callback(struct pkg_handle *hdl)

 	return hdl->event_cb;
 }
 void
 __pkg_emit_event(struct pkg_handle *hdl, pkg_event_t ev, int argc, ...)
 /* Guard-rail against incorrect number of arguments */
 static void
 pkg_event_argument_check(pkg_event_t ev, int argc)
 {
 	va_list ap;
 	void **argv;
 	int i;
 	if (hdl == NULL || hdl->event_cb == NULL)
 		return;
 	/* Guard-rail against incorrect number of arguments */
 	switch(ev) {
 	case PKG_EVENT_INSTALL_BEGIN:
 		assert(argc == 1);

@@ -42,6 +36,19 @@ __pkg_emit_event(struct pkg_handle *hdl, pkg_event_t ev, int argc, ...)

 	default:
 		break;
 	}
 }
 void
 __pkg_emit_event(struct pkg_handle *hdl, pkg_event_t ev, int argc, ...)
 {
 	va_list ap;
 	void **argv;
 	int i;
 	if (hdl == NULL || hdl->event_cb == NULL)
 		return;
 	pkg_event_argument_check(ev, argc);
 	/* Generate the argument vector to pass in. */
 	argv = calloc(argc, sizeof(void *));