Skip to content

Commit 790180b

Browse files
collinfunktgross35
authored andcommitted
Remove unessecary semicolons from definitions of CMSG_NXTHDR.
(backport <#4492>) (cherry picked from commit a2cf7c8)
1 parent 1e99d50 commit 790180b

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

src/unix/bsd/freebsdlike/freebsd/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4662,7 +4662,7 @@ f! {
46624662
pub fn CMSG_NXTHDR(mhdr: *const crate::msghdr, cmsg: *const cmsghdr) -> *mut cmsghdr {
46634663
if cmsg.is_null() {
46644664
return crate::CMSG_FIRSTHDR(mhdr);
4665-
};
4665+
}
46664666
let next =
46674667
cmsg as usize + _ALIGN((*cmsg).cmsg_len as usize) + _ALIGN(mem::size_of::<cmsghdr>());
46684668
let max = (*mhdr).msg_control as usize + (*mhdr).msg_controllen as usize;

src/unix/bsd/netbsdlike/netbsd/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2295,7 +2295,7 @@ f! {
22952295
pub fn CMSG_NXTHDR(mhdr: *const crate::msghdr, cmsg: *const cmsghdr) -> *mut cmsghdr {
22962296
if cmsg.is_null() {
22972297
return crate::CMSG_FIRSTHDR(mhdr);
2298-
};
2298+
}
22992299
let next =
23002300
cmsg as usize + _ALIGN((*cmsg).cmsg_len as usize) + _ALIGN(mem::size_of::<cmsghdr>());
23012301
let max = (*mhdr).msg_control as usize + (*mhdr).msg_controllen as usize;

src/unix/bsd/netbsdlike/openbsd/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1869,7 +1869,7 @@ f! {
18691869
pub fn CMSG_NXTHDR(mhdr: *const crate::msghdr, cmsg: *const cmsghdr) -> *mut cmsghdr {
18701870
if cmsg.is_null() {
18711871
return crate::CMSG_FIRSTHDR(mhdr);
1872-
};
1872+
}
18731873
let next =
18741874
cmsg as usize + _ALIGN((*cmsg).cmsg_len as usize) + _ALIGN(mem::size_of::<cmsghdr>());
18751875
let max = (*mhdr).msg_control as usize + (*mhdr).msg_controllen as usize;

src/unix/haiku/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1533,7 +1533,7 @@ f! {
15331533
pub fn CMSG_NXTHDR(mhdr: *const msghdr, cmsg: *const cmsghdr) -> *mut cmsghdr {
15341534
if cmsg.is_null() {
15351535
return crate::CMSG_FIRSTHDR(mhdr);
1536-
};
1536+
}
15371537
let next = cmsg as usize
15381538
+ CMSG_ALIGN((*cmsg).cmsg_len as usize)
15391539
+ CMSG_ALIGN(mem::size_of::<cmsghdr>());

src/unix/hurd/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3445,7 +3445,7 @@ f! {
34453445
pub fn CMSG_NXTHDR(mhdr: *const msghdr, cmsg: *const cmsghdr) -> *mut cmsghdr {
34463446
if ((*cmsg).cmsg_len as usize) < mem::size_of::<cmsghdr>() {
34473447
return core::ptr::null_mut::<cmsghdr>();
3448-
};
3448+
}
34493449
let next = (cmsg as usize + CMSG_ALIGN((*cmsg).cmsg_len as usize)) as *mut cmsghdr;
34503450
let max = (*mhdr).msg_control as usize + (*mhdr).msg_controllen as usize;
34513451
if (next.offset(1)) as usize > max

src/unix/linux_like/emscripten/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1367,7 +1367,7 @@ f! {
13671367
pub fn CMSG_NXTHDR(mhdr: *const msghdr, cmsg: *const cmsghdr) -> *mut cmsghdr {
13681368
if ((*cmsg).cmsg_len as usize) < mem::size_of::<cmsghdr>() {
13691369
return core::ptr::null_mut::<cmsghdr>();
1370-
};
1370+
}
13711371
let next = (cmsg as usize + super::CMSG_ALIGN((*cmsg).cmsg_len as usize)) as *mut cmsghdr;
13721372
let max = (*mhdr).msg_control as usize + (*mhdr).msg_controllen as usize;
13731373
if (next.offset(1)) as usize > max {

src/unix/solarish/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2422,7 +2422,7 @@ f! {
24222422
pub fn CMSG_NXTHDR(mhdr: *const crate::msghdr, cmsg: *const cmsghdr) -> *mut cmsghdr {
24232423
if cmsg.is_null() {
24242424
return crate::CMSG_FIRSTHDR(mhdr);
2425-
};
2425+
}
24262426
let next =
24272427
_CMSG_HDR_ALIGN(cmsg as usize + (*cmsg).cmsg_len as usize + size_of::<cmsghdr>());
24282428
let max = (*mhdr).msg_control as usize + (*mhdr).msg_controllen as usize;

0 commit comments

Comments
 (0)