X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=src%2Fshared%2Ffdset.c;h=8c852f11372b13b95ced330c35b8bfd105867804;hb=0c697941389b7379c4471bc0a067ede02814bc57;hp=845c19b1cf7826c44a0afa1fabf72d74f884b2c1;hpb=97a33b126c845327a3a19d6e66f05684823868fb;p=thirdparty%2Fsystemd.git
diff --git a/src/shared/fdset.c b/src/shared/fdset.c
index 845c19b1cf7..8c852f11372 100644
--- a/src/shared/fdset.c
+++ b/src/shared/fdset.c
@@ -1,22 +1,4 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- This file is part of systemd.
-
- Copyright 2010 Lennart Poettering
-
- systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
-
- systemd is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with systemd; If not, see .
-***/
#include
#include
@@ -42,8 +24,8 @@ FDSet *fdset_new(void) {
return MAKE_FDSET(set_new(NULL));
}
-int fdset_new_array(FDSet **ret, const int *fds, unsigned n_fds) {
- unsigned i;
+int fdset_new_array(FDSet **ret, const int *fds, size_t n_fds) {
+ size_t i;
FDSet *s;
int r;
@@ -219,7 +201,6 @@ int fdset_new_listen_fds(FDSet **_s, bool unset) {
*_s = s;
return 0;
-
fail:
if (s)
set_free(MAKE_SET(s));
@@ -231,10 +212,10 @@ int fdset_close_others(FDSet *fds) {
void *e;
Iterator i;
int *a;
- unsigned j, m;
+ size_t j = 0, m;
- j = 0, m = fdset_size(fds);
- a = alloca(sizeof(int) * m);
+ m = fdset_size(fds);
+ a = newa(int, m);
SET_FOREACH(e, MAKE_SET(fds), i)
a[j++] = PTR_TO_FD(e);