modify compile warnning

kcavi · kcavi · commit 70b1c5f270bd · 2021-04-26T17:07:16.000+08:00
diff --git a/uinet/freebsd/net/bpf.h b/uinet/freebsd/net/bpf.h
@@ -1132,6 +1132,7 @@ struct bpf_zbuf_header {
  * don't already define it, define it as 245.
  */
 #if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__APPLE__)
+#undef DLT_PFSYNC
 #define DLT_PFSYNC		246
 #endif
 
diff --git a/uinet/freebsd/net/if_ethersubr.c b/uinet/freebsd/net/if_ethersubr.c
@@ -752,6 +752,7 @@ VNET_SYSUNINIT(vnet_ether_uninit, SI_SUB_PROTO_IF, SI_ORDER_ANY,
     vnet_ether_destroy, NULL);
 #endif
 
+void packet_rcv(struct ifnet *ifp, struct mbuf *m);
 
 
 static void
diff --git a/uinet/lib/ff_host_interface.h b/uinet/lib/ff_host_interface.h
@@ -124,6 +124,11 @@ int   uhi_nanosleep(uint64_t nsecs);
 
 int   uhi_mutex_init(uhi_mutex_t *m, int opts);
 void  uhi_mutex_destroy(uhi_mutex_t *m);
+void  _uhi_mutex_lock(uhi_mutex_t *m, void *l, const char *file, int line);
+int   _uhi_mutex_trylock(uhi_mutex_t *m, void *l, const char *file, int line);
+void  _uhi_mutex_unlock(uhi_mutex_t *m, void *l, const char *file, int line);
+int _uhi_mtx_owned(uhi_mutex_t *m);
+
 
 
 int uhi_nanosleep(uint64_t nsecs);
diff --git a/uinet/lib/ff_lock.c b/uinet/lib/ff_lock.c
@@ -120,15 +120,15 @@ void
 __mtx_lock_spin_flags(volatile uintptr_t *c, int opts, const char *file,
     int line)
 {
-	_uhi_mutex_lock(c, c, file, line);
+	_uhi_mutex_lock((uhi_mutex_t *)c, (void *)c, file, line);
 }
 
 
 void
 __mtx_unlock_spin_flags(volatile uintptr_t *c, int opts, const char *file,
     int line)
 {
-	_uhi_mutex_unlock(c, c, file, line);
+	_uhi_mutex_unlock((uhi_mutex_t *)c, (void *)c, file, line);
 }
 
 
@@ -137,7 +137,7 @@ int
 _mtx_trylock_flags_(volatile uintptr_t *c, int opts, const char *file, int line)
 {
 	int rval;
-	rval = _uhi_mutex_trylock(c, c, file, line);
+	rval = _uhi_mutex_trylock((uhi_mutex_t *)c, (void *)c, file, line);
 
 	return (rval);
 }
@@ -157,14 +157,14 @@ thread_lock_flags_(struct thread *td, int opts, const char *file, int line)
 void
 __mtx_lock_flags(volatile uintptr_t *c, int opts, const char *file, int line)
 {
-	_uhi_mutex_lock(c, c, file, line);
+	_uhi_mutex_lock((uhi_mutex_t *)c, (void *)c, file, line);
 }
 
 
 void
 __mtx_unlock_flags(volatile uintptr_t *c, int opts, const char *file, int line)
 {
-	_uhi_mutex_unlock(c, c, file, line);
+	_uhi_mutex_unlock((uhi_mutex_t *)c, (void *)c, file, line);
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -120,15 +120,15 @@ void`
`120`	`120`	`__mtx_lock_spin_flags(volatile uintptr_t c, int opts, const char file,`
`121`	`121`	`int line)`
`122`	`122`	`{`
`123`		`- _uhi_mutex_lock(c, c, file, line);`
	`123`	`+ _uhi_mutex_lock((uhi_mutex_t )c, (void )c, file, line);`
`124`	`124`	`}`
`125`	`125`
`126`	`126`
`127`	`127`	`void`
`128`	`128`	`__mtx_unlock_spin_flags(volatile uintptr_t c, int opts, const char file,`
`129`	`129`	`int line)`
`130`	`130`	`{`
`131`		`- _uhi_mutex_unlock(c, c, file, line);`
	`131`	`+ _uhi_mutex_unlock((uhi_mutex_t )c, (void )c, file, line);`
`132`	`132`	`}`
`133`	`133`
`134`	`134`
`@@ -137,7 +137,7 @@ int`
`137`	`137`	`_mtx_trylock_flags_(volatile uintptr_t c, int opts, const char file, int line)`
`138`	`138`	`{`
`139`	`139`	`int rval;`
`140`		`- rval = _uhi_mutex_trylock(c, c, file, line);`
	`140`	`+ rval = _uhi_mutex_trylock((uhi_mutex_t )c, (void )c, file, line);`
`141`	`141`
`142`	`142`	`return (rval);`
`143`	`143`	`}`
`@@ -157,14 +157,14 @@ thread_lock_flags_(struct thread td, int opts, const char file, int line)`
`157`	`157`	`void`
`158`	`158`	`__mtx_lock_flags(volatile uintptr_t c, int opts, const char file, int line)`
`159`	`159`	`{`
`160`		`- _uhi_mutex_lock(c, c, file, line);`
	`160`	`+ _uhi_mutex_lock((uhi_mutex_t )c, (void )c, file, line);`
`161`	`161`	`}`
`162`	`162`
`163`	`163`
`164`	`164`	`void`
`165`	`165`	`__mtx_unlock_flags(volatile uintptr_t c, int opts, const char file, int line)`
`166`	`166`	`{`
`167`		`- _uhi_mutex_unlock(c, c, file, line);`
	`167`	`+ _uhi_mutex_unlock((uhi_mutex_t )c, (void )c, file, line);`
`168`	`168`	`}`
`169`	`169`
`170`	`170`