Quellcode durchsuchen

tweak prototypes to match the exported versions

Mike Frysinger vor 20 Jahren
Ursprung
Commit
b027080b40
2 geänderte Dateien mit 11 neuen und 11 gelöschten Zeilen
  1. 6 6
      libc/sysdeps/linux/common/getgroups.c
  2. 5 5
      libc/sysdeps/linux/common/setgroups.c

+ 6 - 6
libc/sysdeps/linux/common/getgroups.c

@@ -19,9 +19,9 @@
 static inline _syscall2(int, __syscall_getgroups,
 		int, size, __kernel_gid_t *, list);
 
-int attribute_hidden __getgroups(int n, gid_t * groups)
+int attribute_hidden __getgroups(int size, gid_t groups[])
 {
-	if (unlikely(n < 0)) {
+	if (unlikely(size < 0)) {
 ret_error:
 		__set_errno(EINVAL);
 		return -1;
@@ -29,13 +29,13 @@ ret_error:
 		int i, ngids;
 		__kernel_gid_t *kernel_groups;
 
-		n = MIN(n, sysconf(_SC_NGROUPS_MAX));
-		kernel_groups = (__kernel_gid_t *)malloc(sizeof(*kernel_groups) * n);
+		size = MIN(size, sysconf(_SC_NGROUPS_MAX));
+		kernel_groups = (__kernel_gid_t *)malloc(sizeof(*kernel_groups) * size);
 		if (kernel_groups == NULL)
 			goto ret_error;
 
-		ngids = __syscall_getgroups(n, kernel_groups);
-		if (n != 0 && ngids > 0) {
+		ngids = __syscall_getgroups(size, kernel_groups);
+		if (size != 0 && ngids > 0) {
 			for (i = 0; i < ngids; i++) {
 				groups[i] = kernel_groups[i];
 			}

+ 5 - 5
libc/sysdeps/linux/common/setgroups.c

@@ -18,9 +18,9 @@
 static inline _syscall2(int, __syscall_setgroups,
 		size_t, size, const __kernel_gid_t *, list);
 
-int attribute_hidden __setgroups(size_t n, const gid_t * groups)
+int attribute_hidden __setgroups(size_t size, const gid_t *groups)
 {
-	if (n > (size_t) sysconf(_SC_NGROUPS_MAX)) {
+	if (size > (size_t) sysconf(_SC_NGROUPS_MAX)) {
 ret_error:
 		__set_errno(EINVAL);
 		return -1;
@@ -28,18 +28,18 @@ ret_error:
 		size_t i;
 		__kernel_gid_t *kernel_groups;
 
-		kernel_groups = (__kernel_gid_t *)malloc(sizeof(*kernel_groups) * n);
+		kernel_groups = (__kernel_gid_t *)malloc(sizeof(*kernel_groups) * size);
 		if (kernel_groups == NULL)
 			goto ret_error;
 
-		for (i = 0; i < n; i++) {
+		for (i = 0; i < size; i++) {
 			kernel_groups[i] = (groups)[i];
 			if (groups[i] != (gid_t) ((__kernel_gid_t) groups[i])) {
 				goto ret_error;
 			}
 		}
 
-		i = __syscall_setgroups(n, kernel_groups);
+		i = __syscall_setgroups(size, kernel_groups);
 		free(kernel_groups);
 		return i;
 	}