Make struct admissible uids local.

It is only used in read_uid_file. So pass it as an arg to this
function.

diff --git a/select.c b/select.c
index 9353c5f8edd18373eafd074f6db989b91b212368..e3d97b11ef7893f09ba89008aa1994b30318fc39 100644 (file)
--- a/select.c
+++ b/select.c
@@ -77,8 +77,6 @@ static const uint64_t count_unit_divisors[] = {
 
 static const char size_unit_abbrevs[] = " BKMGT";
 static const char count_unit_abbrevs[] = "  kmgt";
 
 static const char size_unit_abbrevs[] = " BKMGT";
 static const char count_unit_abbrevs[] = "  kmgt";

-static struct uid_range *admissible_uids;
-

 static enum enum_size_unit format_size_value(enum enum_size_unit unit,
                uint64_t value, int print_unit, char *result)
 {
 static enum enum_size_unit format_size_value(enum enum_size_unit unit,
                uint64_t value, int print_unit, char *result)
 {


@@ -551,7 +549,7 @@ static int print_statistics(void)
        return 1;
 }
 
        return 1;
 }
 

-static int read_uid_file(void)
+static int read_uid_file(struct uid_range *admissible_uids)

 {
        size_t size;
        uint32_t n;
 {
        size_t size;
        uint32_t n;


@@ -589,6 +587,8 @@ out:
 int com_select(void)
 {
        int ret;
 int com_select(void)
 {
        int ret;

+       struct uid_range *admissible_uids = NULL;
+

        if (conf.select_options_given) {
                struct select_cmdline_parser_params params = {
                        .override = 1,
        if (conf.select_options_given) {
                struct select_cmdline_parser_params params = {
                        .override = 1,


@@ -619,7 +619,7 @@ int com_select(void)
        if (ret < 0)
                return ret;
        check_signals();
        if (ret < 0)
                return ret;
        check_signals();

-       ret = read_uid_file();
+       ret = read_uid_file(admissible_uids);

        if (ret < 0)
                return ret;
        check_signals();
        if (ret < 0)
                return ret;
        check_signals();