diff options
| author |   jca <jca@openbsd.org> | 2014-01-21 22:26:11 +0000 |
|---|---|---|
| committer | jca <jca@openbsd.org> | 2014-01-21 22:26:11 +0000 |
| commit | 4823e3112a45e3b4998ecd8a03ebdbb9a361e92f (patch) | |
| tree | 196fe6587ca97d6ca04a9eb9994889c980164ada | |
| parent | fulfilling theo's wishes (diff) | |
| download | wireguard-openbsd-4823e3112a45e3b4998ecd8a03ebdbb9a361e92f.tar.xz wireguard-openbsd-4823e3112a45e3b4998ecd8a03ebdbb9a361e92f.zip | |
Mark fuse_opt_parse()'s third argument as a point to const, to match the
reference FUSE implementation. ok syl@
| -rw-r--r-- | lib/libfuse/fuse_opt.c | 10 | ||||
| -rw-r--r-- | lib/libfuse/fuse_opt.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/libfuse/fuse_opt.c b/lib/libfuse/fuse_opt.c index 289288fe30d..16f475ef19e 100644 --- a/lib/libfuse/fuse_opt.c +++ b/lib/libfuse/fuse_opt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fuse_opt.c,v 1.7 2013/11/04 19:54:18 syl Exp $ */ +/* $OpenBSD: fuse_opt.c,v 1.8 2014/01/21 22:26:11 jca Exp $ */ /* * Copyright (c) 2013 Sylvestre Gallon <ccna.syl@gmail.com> * Copyright (c) 2013 Stefan Sperling <stsp@openbsd.org> @@ -218,8 +218,8 @@ fuse_opt_add_arg(struct fuse_args *args, const char *name) } static int -parse_opt(struct fuse_opt *o, const char *val, void *data, fuse_opt_proc_t f, - struct fuse_args *arg) +parse_opt(const struct fuse_opt *o, const char *val, void *data, + fuse_opt_proc_t f, struct fuse_args *arg) { int ret; int found = 0; @@ -256,8 +256,8 @@ parse_opt(struct fuse_opt *o, const char *val, void *data, fuse_opt_proc_t f, * when f() returns 0 we need to discard the arg */ int -fuse_opt_parse(struct fuse_args *args, void *data, struct fuse_opt *opt, - fuse_opt_proc_t f) +fuse_opt_parse(struct fuse_args *args, void *data, + const struct fuse_opt *opt, fuse_opt_proc_t f) { struct fuse_args outargs = FUSE_ARGS_INIT(args->argc, args->argv); const char *arg; diff --git a/lib/libfuse/fuse_opt.h b/lib/libfuse/fuse_opt.h index c1ae74be1ea..a6030ea75b1 100644 --- a/lib/libfuse/fuse_opt.h +++ b/lib/libfuse/fuse_opt.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fuse_opt.h,v 1.2 2013/07/11 11:41:13 syl Exp $ */ +/* $OpenBSD: fuse_opt.h,v 1.3 2014/01/21 22:26:11 jca Exp $ */ /* * Copyright (c) 2013 Sylvestre Gallon <ccna.syl@gmail.com> * @@ -41,7 +41,7 @@ void fuse_opt_free_args(struct fuse_args *); int fuse_opt_add_opt(char **, const char *); int fuse_opt_add_opt_escaped(char **, const char *); int fuse_opt_match(const struct fuse_opt *, const char *); -int fuse_opt_parse(struct fuse_args *, void *, struct fuse_opt *, +int fuse_opt_parse(struct fuse_args *, void *, const struct fuse_opt *, fuse_opt_proc_t); #define FUSE_ARGS_INIT(ac, av) { ac, av, 0 } |