udev-129 compile error with --disable-logging

[Matthias Schwarzott <zzam@gentoo.org>]

Hi there!

It seems udev-129 has some log-related name conflicts when compiling udev 
configured with --disable-logging

libudev-ctrl.c: In function 'udev_ctrl_enable_receiving':
libudev-ctrl.c:104: error: called object 'log_null' is not a function
libudev-ctrl.c: In function 'ctrl_send':
libudev-ctrl.c:161: error: called object 'log_null' is not a function


The original source is this:
<<<<<<<<<<<<<<<<<<<<<<
int udev_ctrl_enable_receiving(struct udev_ctrl *uctrl)
{
        int err;
        const int feature_on = 1;

        err= bind(uctrl->sock, (struct sockaddr *)&uctrl->saddr, 
uctrl->addrlen);
        if (err < 0) {
                err(uctrl->udev, "bind failed: %m\n");
                return err;
        }

        /* enable receiving of the sender credentials */
        setsockopt(uctrl->sock, SOL_SOCKET, SO_PASSCRED, &feature_on, 
sizeof(feature_on));
        return 0;
}
<<<<<<<<<<<<<<<<<<<<<<

the pre-processor does change it to:

<<<<<<<<<<<<<<<<<<<<<<
int udev_ctrl_enable_receiving(struct udev_ctrl *uctrl)
{
 int log_null;
 const int feature_on = 1;

 log_null= bind(uctrl->sock, (struct sockaddr *)&uctrl->saddr, 
uctrl->addrlen);
 if (log_null < 0) {
  log_null(uctrl->udev, "bind failed: %m\n");
  return log_null;
 }


 setsockopt(uctrl->sock, 1, 16, &feature_on, sizeof(feature_on));
 return 0;
}
<<<<<<<<<<<<<<<<<<<<<<

So I think it will help to rename the err variable to any other name.

Regards
Matthias