Skip to content

Commit 5878921

Browse files
kcavikcavi
committed
modify compile warnning
1 parent d6626cb commit 5878921

File tree

4 files changed

+39
-26
lines changed

4 files changed

+39
-26
lines changed

‎uinet/example/main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ void *pty_read_test(void *arg)
561561

562562

563563

564-
void vty_main_loop(void *arg)
564+
void *vty_main_loop(void *arg)
565565
{
566566
struct timeval timer_now;
567567
struct timeval *timer_wait;
@@ -633,7 +633,7 @@ void vty_main_loop(void *arg)
633633

634634
}
635635
}
636-
return;
636+
return NULL;
637637
}
638638

639639

‎uinet/freebsd/sys/rwlock.h

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -150,36 +150,36 @@ void __rw_assert(const volatile uintptr_t *c, int what, const char *file,
150150
* failing compilation as the rw_lock reserved member will not be found.
151151
*/
152152
#define rw_init(rw, n) \
153-
_rw_init_flags(&(rw)->rw_lock, n, 0)
153+
_rw_init_flags((volatile uintptr_t *)&(rw)->rw_lock, n, 0)
154154
#define rw_init_flags(rw, n, o) \
155-
_rw_init_flags(&(rw)->rw_lock, n, o)
155+
_rw_init_flags((volatile uintptr_t *)&(rw)->rw_lock, n, o)
156156
#define rw_destroy(rw) \
157-
_rw_destroy(&(rw)->rw_lock)
157+
_rw_destroy((volatile uintptr_t *)&(rw)->rw_lock)
158158
#define rw_wowned(rw) \
159-
_rw_wowned(&(rw)->rw_lock)
159+
_rw_wowned((volatile uintptr_t *)&(rw)->rw_lock)
160160
#define _rw_wlock(rw, f, l) \
161-
_rw_wlock_cookie(&(rw)->rw_lock, f, l)
161+
_rw_wlock_cookie((volatile uintptr_t *)&(rw)->rw_lock, f, l)
162162
#define _rw_try_wlock(rw, f, l) \
163-
__rw_try_wlock(&(rw)->rw_lock, f, l)
163+
__rw_try_wlock((volatile uintptr_t *)&(rw)->rw_lock, f, l)
164164
#define _rw_wunlock(rw, f, l) \
165-
_rw_wunlock_cookie(&(rw)->rw_lock, f, l)
165+
_rw_wunlock_cookie((volatile uintptr_t *)&(rw)->rw_lock, f, l)
166166
#define _rw_rlock(rw, f, l) \
167-
__rw_rlock(&(rw)->rw_lock, f, l)
167+
__rw_rlock((volatile uintptr_t *)&(rw)->rw_lock, f, l)
168168
#define _rw_try_rlock(rw, f, l) \
169-
__rw_try_rlock(&(rw)->rw_lock, f, l)
169+
__rw_try_rlock((volatile uintptr_t *)&(rw)->rw_lock, f, l)
170170
#define _rw_runlock(rw, f, l) \
171-
_rw_runlock_cookie(&(rw)->rw_lock, f, l)
171+
_rw_runlock_cookie((volatile uintptr_t *)&(rw)->rw_lock, f, l)
172172
#define _rw_wlock_hard(rw, t, f, l) \
173-
__rw_wlock_hard(&(rw)->rw_lock, t, f, l)
173+
__rw_wlock_hard((volatile uintptr_t *)&(rw)->rw_lock, t, f, l)
174174
#define _rw_wunlock_hard(rw, t, f, l) \
175-
__rw_wunlock_hard(&(rw)->rw_lock, t, f, l)
175+
__rw_wunlock_hard((volatile uintptr_t *)&(rw)->rw_lock, t, f, l)
176176
#define _rw_try_upgrade(rw, f, l) \
177-
__rw_try_upgrade(&(rw)->rw_lock, f, l)
177+
__rw_try_upgrade((volatile uintptr_t *)&(rw)->rw_lock, f, l)
178178
#define _rw_downgrade(rw, f, l) \
179-
__rw_downgrade(&(rw)->rw_lock, f, l)
179+
__rw_downgrade((volatile uintptr_t *)&(rw)->rw_lock, f, l)
180180
#if defined(INVARIANTS) || defined(INVARIANT_SUPPORT)
181181
#define _rw_assert(rw, w, f, l) \
182-
__rw_assert(&(rw)->rw_lock, w, f, l)
182+
__rw_assert((volatile uintptr_t *)&(rw)->rw_lock, w, f, l)
183183
#endif
184184

185185

‎uinet/lib/ff_host_interface.h

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,19 @@ int uhi_thread_setprio_rt(unsigned int prio);
133133
void ff_thread_set_name(const char *name);
134134

135135

136+
int uhi_rwlock_init(uhi_rwlock_t *rw, int opts);
137+
void uhi_rwlock_destroy(uhi_rwlock_t *rw);
138+
void _uhi_rwlock_wlock(uhi_rwlock_t *rw, void *l, const char *file, int line);
139+
int _uhi_rwlock_trywlock(uhi_rwlock_t *rw, void *l, const char *file, int line);
140+
void _uhi_rwlock_wunlock(uhi_rwlock_t *rw, void *l, const char *file, int line);
141+
void _uhi_rwlock_rlock(uhi_rwlock_t *rw, void *l, const char *file, int line);
142+
int _uhi_rwlock_tryrlock(uhi_rwlock_t *rw, void *l, const char *file, int line);
143+
void _uhi_rwlock_runlock(uhi_rwlock_t *rw, void *l, const char *file, int line);
144+
int _uhi_rwlock_tryupgrade(uhi_rwlock_t *rw, void *l, const char *file, int line);
145+
void _uhi_rwlock_downgrade(uhi_rwlock_t *rw, void *l, const char *file, int line);
146+
int _uhi_rwlock_wowned(uhi_rwlock_t *rw);
147+
148+
136149
int usp_pthread_create(char *name, pthread_t *thread, const pthread_attr_t *attr,
137150
void *(*start_routine) (void *), void *arg);
138151

‎uinet/lib/ff_kern_rwlock.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ _rw_init_flags(volatile uintptr_t *c, const char *name, int opts)
121121
struct rwlock *rw;
122122
int flags;
123123

124-
rw = rwlock2rw(c);
124+
rw = rwlock2rw((void *)c);
125125

126126
MPASS((opts & ~(RW_DUPOK | RW_NOPROFILE | RW_NOWITNESS | RW_QUIET |
127127
RW_RECURSE)) == 0);
@@ -153,51 +153,51 @@ _rw_destroy(volatile uintptr_t *c)
153153
void
154154
_rw_wlock_cookie(volatile uintptr_t *c, const char *file, int line)
155155
{
156-
_uhi_rwlock_wlock((uhi_rwlock_t *)c, c, file, line);
156+
_uhi_rwlock_wlock((uhi_rwlock_t *)c, (void *)c, file, line);
157157
}
158158

159159
int
160160
__rw_try_wlock(volatile uintptr_t *c, const char *file, int line)
161161
{
162162
int rval;
163163

164-
rval = _uhi_rwlock_trywlock((uhi_rwlock_t *)c, c, file, line);
164+
rval = _uhi_rwlock_trywlock((uhi_rwlock_t *)c, (void *)c, file, line);
165165

166166
return (rval);
167167
}
168168

169169
void
170170
_rw_wunlock_cookie(volatile uintptr_t *c, const char *file, int line)
171171
{
172-
_uhi_rwlock_wunlock((uhi_rwlock_t *)c, c, file, line);
172+
_uhi_rwlock_wunlock((uhi_rwlock_t *)c, (void *)c, file, line);
173173
}
174174

175175
void
176176
__rw_rlock(volatile uintptr_t *c, const char *file, int line)
177177
{
178-
_uhi_rwlock_rlock((uhi_rwlock_t *)c, c, file, line);
178+
_uhi_rwlock_rlock((uhi_rwlock_t *)c, (void *)c, file, line);
179179
}
180180

181181
int
182182
__rw_try_rlock(volatile uintptr_t *c, const char *file, int line)
183183
{
184184
int rval;
185-
rval = _uhi_rwlock_tryrlock((uhi_rwlock_t *)c, c, file, line);
185+
rval = _uhi_rwlock_tryrlock((uhi_rwlock_t *)c, (void *)c, file, line);
186186
return (rval);
187187
}
188188

189189
void
190190
_rw_runlock_cookie(volatile uintptr_t *c, const char *file, int line)
191191
{
192-
_uhi_rwlock_runlock((uhi_rwlock_t *)c, c, file, line);
192+
_uhi_rwlock_runlock((uhi_rwlock_t *)c, (void *)c, file, line);
193193
}
194194

195195
int
196196
__rw_try_upgrade(volatile uintptr_t *c, const char *file, int line)
197197
{
198198
int rval;
199199

200-
rval = _uhi_rwlock_tryupgrade((uhi_rwlock_t *)c, c, file, line);
200+
rval = _uhi_rwlock_tryupgrade((uhi_rwlock_t *)c, (void *)c, file, line);
201201
/* 0 means fail; non-zero means success */
202202
/* XXX uhi_rwlock_tryupgrade always returns 0? */
203203

@@ -207,7 +207,7 @@ __rw_try_upgrade(volatile uintptr_t *c, const char *file, int line)
207207
void
208208
__rw_downgrade(volatile uintptr_t *c, const char *file, int line)
209209
{
210-
_uhi_rwlock_downgrade((uhi_rwlock_t *)c, c, file, line);
210+
_uhi_rwlock_downgrade((uhi_rwlock_t *)c, (void *)c, file, line);
211211
}
212212

213213

0 commit comments

Comments
 (0)