Merge branch 'obsd-master'

Conflicts:
	Makefile.am
	cfg.c
	server-client.c
This commit is contained in:
Thomas Adam
2017-05-31 15:56:13 +01:00
29 changed files with 2614 additions and 2008 deletions

View File

@ -34,7 +34,6 @@ struct args_entry {
RB_ENTRY(args_entry) entry;
};
static void args_set(struct args *, u_char, const char *);
static struct args_entry *args_find(struct args *, u_char);
static int args_cmp(struct args_entry *, struct args_entry *);
@ -195,7 +194,7 @@ args_has(struct args *args, u_char ch)
}
/* Set argument value in the arguments tree. */
static void
void
args_set(struct args *args, u_char ch, const char *value)
{
struct args_entry *entry;