Module Name:    src
Committed By:   pho
Date:           Wed Dec  1 13:51:33 UTC 2021

Modified Files:
        src/lib/librefuse: fuse_opt.h refuse_opt.c

Log Message:
Use correct types for the fields of struct fuse_opt

This change shouldn't make any behavioral differences in reality, but
compilers these days dislike converting -1U to int32_t implicitly,
which is indeed understandable.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/librefuse/fuse_opt.h
cvs rdiff -u -r1.19 -r1.20 src/lib/librefuse/refuse_opt.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/librefuse/fuse_opt.h
diff -u src/lib/librefuse/fuse_opt.h:1.7 src/lib/librefuse/fuse_opt.h:1.8
--- src/lib/librefuse/fuse_opt.h:1.7	Mon Nov 14 17:19:29 2016
+++ src/lib/librefuse/fuse_opt.h	Wed Dec  1 13:51:33 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: fuse_opt.h,v 1.7 2016/11/14 17:19:29 pho Exp $	*/
+/*	$NetBSD: fuse_opt.h,v 1.8 2021/12/01 13:51:33 pho Exp $	*/
 
 /*
  * Copyright (c) 2007 Alistair Crooks.  All rights reserved.
@@ -46,8 +46,8 @@ enum {
 
 struct fuse_opt {
 	const char	*templ;
-	int32_t		offset;
-	int32_t		value;
+	unsigned long	offset;
+	int		value;
 };
 
 #define FUSE_OPT_KEY(templ, key) { templ, -1U, key }

Index: src/lib/librefuse/refuse_opt.c
diff -u src/lib/librefuse/refuse_opt.c:1.19 src/lib/librefuse/refuse_opt.c:1.20
--- src/lib/librefuse/refuse_opt.c:1.19	Sat Oct 30 09:06:34 2021
+++ src/lib/librefuse/refuse_opt.c	Wed Dec  1 13:51:33 2021
@@ -1,4 +1,4 @@
-/* 	$NetBSD: refuse_opt.c,v 1.19 2021/10/30 09:06:34 nia Exp $	*/
+/* 	$NetBSD: refuse_opt.c,v 1.20 2021/12/01 13:51:33 pho Exp $	*/
 
 /*-
  * Copyright (c) 2007 Juan Romero Pardines.
@@ -286,7 +286,7 @@ parse_matched_arg(const char* arg, struc
 		const struct fuse_opt* opt, int sep_idx, void* data,
 		fuse_opt_proc_t proc, bool is_opt)
 {
-	if (opt->offset == -1) {
+	if (opt->offset == -1U) {
 		/* The option description does not want any variables to be
 		 * updated.*/
 		if (call_proc(proc, data, arg, opt->value, outargs, is_opt) == -1)

Reply via email to