picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

use MIN() MAX() from param.h

Browse source
This commit is contained in:
Kay Sievers 2009-07-07 19:30:19 +02:00
parent e4c02c1ca6
commit 257bb4cdac
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libudev/libudev-private.h
View file

@ -16,7 +16,6 @@
#include "libudev.h"
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
#define UDEV_MAX(a,b) ((a) > (b) ? (a) : (b))
#define READ_END 0
#define WRITE_END 1

3
libudev/libudev-util-private.c
View file

@ -20,6 +20,7 @@
#include <pwd.h>
#include <grp.h>
#include <sys/wait.h>
#include <sys/param.h>
#include "libudev.h"
#include "libudev-private.h"
@ -356,7 +357,7 @@ int util_run_program(struct udev *udev, const char *command, char **envp,
FD_SET(outpipe[READ_END], &readfds);
if (errpipe[READ_END] > 0)
FD_SET(errpipe[READ_END], &readfds);
fdcount = select(UDEV_MAX(outpipe[READ_END], errpipe[READ_END])+1, &readfds, NULL, NULL, NULL);
fdcount = select(MAX(outpipe[READ_END], errpipe[READ_END])+1, &readfds, NULL, NULL, NULL);
if (fdcount < 0) {
if (errno == EINTR)
continue;

2
udev/udevadm-monitor.c
View file

@ -204,7 +204,7 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
if (udev_monitor != NULL)
FD_SET(udev_monitor_get_fd(udev_monitor), &readfds);
fdcount = select(UDEV_MAX(udev_monitor_get_fd(kernel_monitor), udev_monitor_get_fd(udev_monitor))+1,
fdcount = select(MAX(udev_monitor_get_fd(kernel_monitor), udev_monitor_get_fd(udev_monitor))+1,
&readfds, NULL, NULL, NULL);
if (fdcount < 0) {
if (errno != EINTR)