unistd: groups: clean up return statements

Author: JayH5

src/unistd.rs

@@ -966,7 +966,7 @@ pub fn getgroups() -> Result<Vec<Gid>> {
         match Errno::result(ret) {
             Ok(s) => {
                 unsafe { groups.set_len(s as usize) };
-                break
+                return Ok(groups);
             },
             Err(Error::Sys(Errno::EINVAL)) => {
                 // EINVAL indicates that size was too small, so trigger a
@@ -979,7 +979,6 @@ pub fn getgroups() -> Result<Vec<Gid>> {
             Err(e) => return Err(e)
         }
     }
-    Ok(groups)
 }
 
 /// Set the list of supplementary group IDs for the calling process.
@@ -1049,7 +1048,7 @@ pub fn getgrouplist(user: &CString, group: Gid) -> Result<Vec<Gid>> {
         // BSD systems only return 0 or -1, Linux returns ngroups on success.
         if ret >= 0 {
             unsafe { groups.set_len(ngroups as usize) };
-            break
+            return Ok(groups);
         }
 
         // Returns -1 if ngroups is too small, but does not set errno.
@@ -1059,7 +1058,7 @@ pub fn getgrouplist(user: &CString, group: Gid) -> Result<Vec<Gid>> {
             let cap = groups.capacity();
             if cap >= ngroups_max as usize {
                 // We already have the largest capacity we can, give up
-                return Err(Error::invalid_argument())
+                return Err(Error::invalid_argument());
             }
 
             // Reserve space for at least ngroups
@@ -1070,8 +1069,6 @@ pub fn getgrouplist(user: &CString, group: Gid) -> Result<Vec<Gid>> {
             ngroups = min(ngroups_max, groups.capacity() as c_int);
         }
     }
-
-    Ok(groups)
 }
 
 /// Initialize the supplementary group access list. Sets the supplementary