On Mon, Oct 26, 2020 at 05:20:09PM +0100, Martijn van Duren wrote:
> Mostly mechanical diff coping with the API-change for libagentx
> just committed and link it to libagentx instead of using its own
> copy.
>
> This also allows for the removal of {sub,}agentx.[ch]
> subagentx_internal.h and subagentx_log.c, not included in the diff.
>
> OK?
This reads fine and compiles once one moves agentx.h out of the way
(I assume you'll remove the obsolete files at the same time).
ok tb (two tiny nits below)
> Index: agentx_control.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/relayd/agentx_control.c,v
> retrieving revision 1.2
> diff -u -p -r1.2 agentx_control.c
> --- agentx_control.c 25 Oct 2020 10:17:49 -0000 1.2
> +++ agentx_control.c 26 Oct 2020 16:19:09 -0000
> @@ -37,7 +37,7 @@
> #include <imsg.h>
>
> #include "relayd.h"
> -#include "subagentx.h"
> +#include <agentx.h>
This should probably move up to the other system headers
(I don't understand the order used, so no suggestion where exactly)
> Index: parse.y
> ===================================================================
> RCS file: /cvs/src/usr.sbin/relayd/parse.y,v
> retrieving revision 1.247
> diff -u -p -r1.247 parse.y
> --- parse.y 25 Oct 2020 10:17:49 -0000 1.247
> +++ parse.y 26 Oct 2020 16:19:09 -0000
> @@ -56,7 +56,7 @@
>
> #include "relayd.h"
> #include "http.h"
> -#include "subagentx.h"
> +#include "agentx.h"
This should be <agentx.h> and move up to the other system headers
>
> TAILQ_HEAD(files, file) files = TAILQ_HEAD_INITIALIZER(files);
> static struct file {
