Skip to content

Commit e2bf06c

Browse files
committed
Auto merge of #1328 - crlf0710:master, r=gnzlbg
Fix getgrgid_r to accept gid_t. Closes #1320.
2 parents f9818f1 + 1cf0294 commit e2bf06c

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

src/fuchsia/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4168,7 +4168,7 @@ extern {
41684168
offset: *mut off_t,
41694169
count: ::size_t) -> ::ssize_t;
41704170
pub fn sigsuspend(mask: *const ::sigset_t) -> ::c_int;
4171-
pub fn getgrgid_r(uid: ::uid_t,
4171+
pub fn getgrgid_r(gid: ::gid_t,
41724172
grp: *mut ::group,
41734173
buf: *mut ::c_char,
41744174
buflen: ::size_t,

src/unix/bsd/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ extern {
594594

595595
pub fn sync();
596596
#[cfg_attr(target_os = "solaris", link_name = "__posix_getgrgid_r")]
597-
pub fn getgrgid_r(uid: ::uid_t,
597+
pub fn getgrgid_r(gid: ::gid_t,
598598
grp: *mut ::group,
599599
buf: *mut ::c_char,
600600
buflen: ::size_t,

src/unix/haiku/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1306,7 +1306,7 @@ extern {
13061306
pub fn execvpe(file: *const ::c_char, argv: *const *const ::c_char,
13071307
environment: *const *const ::c_char) -> ::c_int;
13081308
#[cfg_attr(target_os = "solaris", link_name = "__posix_getgrgid_r")]
1309-
pub fn getgrgid_r(uid: ::uid_t,
1309+
pub fn getgrgid_r(gid: ::gid_t,
13101310
grp: *mut ::group,
13111311
buf: *mut ::c_char,
13121312
buflen: ::size_t,

src/unix/newlib/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ extern {
581581
envp: *const *const ::c_char)
582582
-> ::c_int;
583583
#[cfg_attr(target_os = "solaris", link_name = "__posix_getgrgid_r")]
584-
pub fn getgrgid_r(uid: ::uid_t,
584+
pub fn getgrgid_r(gid: ::gid_t,
585585
grp: *mut ::group,
586586
buf: *mut ::c_char,
587587
buflen: ::size_t,

src/unix/notbsd/android/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2031,7 +2031,7 @@ extern {
20312031
pub fn setfsuid(uid: ::uid_t) -> ::c_int;
20322032
pub fn sigsuspend(mask: *const ::sigset_t) -> ::c_int;
20332033
#[cfg_attr(target_os = "solaris", link_name = "__posix_getgrgid_r")]
2034-
pub fn getgrgid_r(uid: ::uid_t,
2034+
pub fn getgrgid_r(gid: ::gid_t,
20352035
grp: *mut ::group,
20362036
buf: *mut ::c_char,
20372037
buflen: ::size_t,

src/unix/notbsd/linux/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2278,7 +2278,7 @@ extern {
22782278
count: ::size_t) -> ::ssize_t;
22792279
pub fn sigsuspend(mask: *const ::sigset_t) -> ::c_int;
22802280
#[cfg_attr(target_os = "solaris", link_name = "__posix_getgrgid_r")]
2281-
pub fn getgrgid_r(uid: ::uid_t,
2281+
pub fn getgrgid_r(gid: ::gid_t,
22822282
grp: *mut ::group,
22832283
buf: *mut ::c_char,
22842284
buflen: ::size_t,

src/unix/solarish/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1937,7 +1937,7 @@ extern {
19371937
-> ::c_int;
19381938
#[cfg_attr(any(target_os = "solaris", target_os = "illumos"),
19391939
link_name = "__posix_getgrgid_r")]
1940-
pub fn getgrgid_r(uid: ::uid_t,
1940+
pub fn getgrgid_r(gid: ::gid_t,
19411941
grp: *mut ::group,
19421942
buf: *mut ::c_char,
19431943
buflen: ::size_t,

src/unix/uclibc/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1837,7 +1837,7 @@ extern {
18371837
pub fn recvmsg(fd: ::c_int, msg: *mut ::msghdr, flags: ::c_int)
18381838
-> ::ssize_t;
18391839
#[cfg_attr(target_os = "solaris", link_name = "__posix_getgrgid_r")]
1840-
pub fn getgrgid_r(uid: ::uid_t,
1840+
pub fn getgrgid_r(gid: ::gid_t,
18411841
grp: *mut ::group,
18421842
buf: *mut ::c_char,
18431843
buflen: ::size_t,

0 commit comments

Comments
 (0)