Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2016-10-10 16:01:12 +01:00
3 changed files with 16 additions and 17 deletions

View File

@ -34,12 +34,13 @@ struct args_entry {
RB_ENTRY(args_entry) entry;
};
struct args_entry *args_find(struct args *, u_char);
static struct args_entry *args_find(struct args *, u_char);
RB_GENERATE(args_tree, args_entry, entry, args_cmp);
static int args_cmp(struct args_entry *, struct args_entry *);
RB_GENERATE_STATIC(args_tree, args_entry, entry, args_cmp);
/* Arguments tree comparison function. */
int
static int
args_cmp(struct args_entry *a1, struct args_entry *a2)
{
return (a1->flag - a2->flag);
@ -70,7 +71,7 @@ args_create(int argc, ...)
}
/* Find a flag in the arguments tree. */
struct args_entry *
static struct args_entry *
args_find(struct args *args, u_char ch)
{
struct args_entry entry;