"Joachim Schmitz" <jojo@xxxxxxxxxxxxxxxxxx> writes:
> Signed-off-by: Joachim Schmitz <jojo@xxxxxxxxxxxxxxxxxx>
> ---
> sha1_file.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/sha1_file.c b/sha1_file.c
> index af5cfbd..76714ad 100644
> --- a/sha1_file.c
> +++ b/sha1_file.c
> @@ -747,6 +747,9 @@ static int open_packed_git_1(struct packed_git *p)
> return error("packfile %s index unavailable", p->pack_name);
>
> if (!pack_max_fds) {
> +#ifdef _SC_OPEN_MAX
> + unsigned int max_fds = sysconf(_SC_OPEN_MAX);
> +#else
> struct rlimit lim;
> unsigned int max_fds;
>
> @@ -754,6 +757,7 @@ static int open_packed_git_1(struct packed_git *p)
> die_errno("cannot get RLIMIT_NOFILE");
>
> max_fds = lim.rlim_cur;
> +#endif
>
> /* Save 3 for stdin/stdout/stderr, 22 for work */
> if (25 < max_fds)
> --
> 1.7.12
Looks sane but it would be more readable to make this a small helper
function, so that we do not need to have #ifdef/#endif in the
primary flow of the code.
By the way, I noticed that you seem to be sending patches out of
git, instead of "diff -ru", which is a good sign ;-). But all of
your patches are whitespace damaged and cannot be applied X-<.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html