diff options
author | bors <bors@rust-lang.org> | 2019-04-29 15:31:08 +0000 |
---|---|---|
committer | bors <bors@rust-lang.org> | 2019-04-29 15:31:08 +0000 |
commit | e2bf06c1fbccda5b9bffdeeb7d524625eba1d23e (patch) | |
tree | a8f2e5fd8dbba94e431ae32896104deb1254f231 | |
parent | f9818f14f80101910c386e1f695555934735a2af (diff) | |
parent | 1cf0294e2dd520dee96f2442478ac76bccbbbc58 (diff) | |
download | rust-libc-e2bf06c1fbccda5b9bffdeeb7d524625eba1d23e.tar.gz |
Auto merge of #1328 - crlf0710:master, r=gnzlbg
Fix getgrgid_r to accept gid_t.
Closes #1320.
-rw-r--r-- | src/fuchsia/mod.rs | 2 | ||||
-rw-r--r-- | src/unix/bsd/mod.rs | 2 | ||||
-rw-r--r-- | src/unix/haiku/mod.rs | 2 | ||||
-rw-r--r-- | src/unix/newlib/mod.rs | 2 | ||||
-rw-r--r-- | src/unix/notbsd/android/mod.rs | 2 | ||||
-rw-r--r-- | src/unix/notbsd/linux/mod.rs | 2 | ||||
-rw-r--r-- | src/unix/solarish/mod.rs | 2 | ||||
-rw-r--r-- | src/unix/uclibc/mod.rs | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/src/fuchsia/mod.rs b/src/fuchsia/mod.rs index 01317e30a4..cef48e5224 100644 --- a/src/fuchsia/mod.rs +++ b/src/fuchsia/mod.rs @@ -4168,7 +4168,7 @@ extern { offset: *mut off_t, count: ::size_t) -> ::ssize_t; pub fn sigsuspend(mask: *const ::sigset_t) -> ::c_int; - pub fn getgrgid_r(uid: ::uid_t, + pub fn getgrgid_r(gid: ::gid_t, grp: *mut ::group, buf: *mut ::c_char, buflen: ::size_t, diff --git a/src/unix/bsd/mod.rs b/src/unix/bsd/mod.rs index e1a2f416fd..162be9d7f9 100644 --- a/src/unix/bsd/mod.rs +++ b/src/unix/bsd/mod.rs @@ -594,7 +594,7 @@ extern { pub fn sync(); #[cfg_attr(target_os = "solaris", link_name = "__posix_getgrgid_r")] - pub fn getgrgid_r(uid: ::uid_t, + pub fn getgrgid_r(gid: ::gid_t, grp: *mut ::group, buf: *mut ::c_char, buflen: ::size_t, diff --git a/src/unix/haiku/mod.rs b/src/unix/haiku/mod.rs index bcf4613ddc..26519a4770 100644 --- a/src/unix/haiku/mod.rs +++ b/src/unix/haiku/mod.rs @@ -1306,7 +1306,7 @@ extern { pub fn execvpe(file: *const ::c_char, argv: *const *const ::c_char, environment: *const *const ::c_char) -> ::c_int; #[cfg_attr(target_os = "solaris", link_name = "__posix_getgrgid_r")] - pub fn getgrgid_r(uid: ::uid_t, + pub fn getgrgid_r(gid: ::gid_t, grp: *mut ::group, buf: *mut ::c_char, buflen: ::size_t, diff --git a/src/unix/newlib/mod.rs b/src/unix/newlib/mod.rs index e2c7fca076..791edb39cf 100644 --- a/src/unix/newlib/mod.rs +++ b/src/unix/newlib/mod.rs @@ -581,7 +581,7 @@ extern { envp: *const *const ::c_char) -> ::c_int; #[cfg_attr(target_os = "solaris", link_name = "__posix_getgrgid_r")] - pub fn getgrgid_r(uid: ::uid_t, + pub fn getgrgid_r(gid: ::gid_t, grp: *mut ::group, buf: *mut ::c_char, buflen: ::size_t, diff --git a/src/unix/notbsd/android/mod.rs b/src/unix/notbsd/android/mod.rs index f7fe61a21d..179893e517 100644 --- a/src/unix/notbsd/android/mod.rs +++ b/src/unix/notbsd/android/mod.rs @@ -2031,7 +2031,7 @@ extern { pub fn setfsuid(uid: ::uid_t) -> ::c_int; pub fn sigsuspend(mask: *const ::sigset_t) -> ::c_int; #[cfg_attr(target_os = "solaris", link_name = "__posix_getgrgid_r")] - pub fn getgrgid_r(uid: ::uid_t, + pub fn getgrgid_r(gid: ::gid_t, grp: *mut ::group, buf: *mut ::c_char, buflen: ::size_t, diff --git a/src/unix/notbsd/linux/mod.rs b/src/unix/notbsd/linux/mod.rs index 14c2463fa9..3d9ccada03 100644 --- a/src/unix/notbsd/linux/mod.rs +++ b/src/unix/notbsd/linux/mod.rs @@ -2278,7 +2278,7 @@ extern { count: ::size_t) -> ::ssize_t; pub fn sigsuspend(mask: *const ::sigset_t) -> ::c_int; #[cfg_attr(target_os = "solaris", link_name = "__posix_getgrgid_r")] - pub fn getgrgid_r(uid: ::uid_t, + pub fn getgrgid_r(gid: ::gid_t, grp: *mut ::group, buf: *mut ::c_char, buflen: ::size_t, diff --git a/src/unix/solarish/mod.rs b/src/unix/solarish/mod.rs index ab36e5730f..1092d152de 100644 --- a/src/unix/solarish/mod.rs +++ b/src/unix/solarish/mod.rs @@ -1937,7 +1937,7 @@ extern { -> ::c_int; #[cfg_attr(any(target_os = "solaris", target_os = "illumos"), link_name = "__posix_getgrgid_r")] - pub fn getgrgid_r(uid: ::uid_t, + pub fn getgrgid_r(gid: ::gid_t, grp: *mut ::group, buf: *mut ::c_char, buflen: ::size_t, diff --git a/src/unix/uclibc/mod.rs b/src/unix/uclibc/mod.rs index eec3fe01ca..e3baba0614 100644 --- a/src/unix/uclibc/mod.rs +++ b/src/unix/uclibc/mod.rs @@ -1837,7 +1837,7 @@ extern { pub fn recvmsg(fd: ::c_int, msg: *mut ::msghdr, flags: ::c_int) -> ::ssize_t; #[cfg_attr(target_os = "solaris", link_name = "__posix_getgrgid_r")] - pub fn getgrgid_r(uid: ::uid_t, + pub fn getgrgid_r(gid: ::gid_t, grp: *mut ::group, buf: *mut ::c_char, buflen: ::size_t, |