lib/list: remove LIST_HEAD macro

* the variable definition with hidden type is always horrible, for
  example:

	  int func() {
	    LIST_HEAD(foo);
	    ...
	  }

  the more readable is:

          int func() {
            struct list_head foo;

            INIT_LIST_HEAD(&foo);
            ...
          }

* the name LIST_HEAD conflict with /usr/include/sys/queue.h

* we use it only on two places in sulogin

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2017-01-05 11:54:59 +01:00
parent 11e1097e6c
commit 5d74cf0092
3 changed files with 5 additions and 9 deletions

View File

@ -33,11 +33,6 @@ struct list_head {
struct list_head *next, *prev;
};
#define LIST_HEAD_INIT(name) { &(name), &(name) }
#define LIST_HEAD(name) \
struct list_head name = LIST_HEAD_INIT(name)
#define INIT_LIST_HEAD(ptr) do { \
(ptr)->next = (ptr); (ptr)->prev = (ptr); \
} while (0)

View File

@ -802,8 +802,7 @@ int main(int argc, char *argv[])
{
char *name = NULL;
int fd, re;
LIST_HEAD(consoles);
struct list_head *p;
struct list_head *p, consoles;
if (argc == 2) {
name = argv[1];
@ -816,6 +815,7 @@ int main(int argc, char *argv[])
if (!name)
errx(EXIT_FAILURE, "usage: %s [<tty>]\n", program_invocation_short_name);
INIT_LIST_HEAD(&consoles);
re = detect_consoles(name, fd, &consoles);
list_for_each(p, &consoles) {

View File

@ -827,8 +827,7 @@ static void usage(FILE *out)
int main(int argc, char **argv)
{
LIST_HEAD(consoles);
struct list_head *ptr;
struct list_head *ptr, consoles;
struct console *con;
char *tty = NULL;
struct passwd *pwd;
@ -849,6 +848,8 @@ int main(int argc, char **argv)
{ NULL, 0, 0, 0 }
};
INIT_LIST_HEAD(&consoles);
/*
* If we are init we need to set up a own session.
*/