[PATCH 4/5] initd: Don't search the environment list if the watchdog, fd is initialized

[John Crispin]

On 29.09.20 20:55, Michael Jones wrote:
> On Tue, Sep 29, 2020 at 1:47 PM John Crispin <john at phrozen.org> wrote:
>>
>> On 29.09.20 18:22, Michael Jones wrote:
>>> Signed-off-by: Michael Jones <mike at meshplusplus.com>
>>> ---
>>>    watchdog.c | 4 ++--
>>>    1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/watchdog.c b/watchdog.c
>>> index 20830c3..ac5b656 100644
>>> --- a/watchdog.c
>>> +++ b/watchdog.c
>>> @@ -49,11 +49,11 @@ static void watchdog_timeout_cb(struct uloop_timeout *t)
>>>
>>>    static int watchdog_open(bool cloexec)
>>>    {
>>> -    char *env = getenv("WDTFD");
>>> -
>>>        if (wdt_fd >= 0)
>>>            return wdt_fd;
>>>
>>> +    char *env = getenv("WDTFD");
>>> +
>>>        if (env) {
>>>            DEBUG(2, "Watchdog handover: fd=%s\n", env);
>>>            wdt_fd = atoi(env);
>> this breaks c99 compliance
>>
>>       John
>>
> Do you mean C89 compliance? This should compile just fine in C99.
>
> C99 was released 20 years ago, and C89 30 years ago. I'm personally
> not interested in supporting either.
>
> The patch can be modified, or used as inspiration, by someone who is
> concerned about C89/C99 compliance and would like to see the
> watchdog_open() function improved in this way.


variable declarations should always be at the start of the function.

     John