From 4192e543a5a93b80ae09da05cc1e65004036b5c2 Mon Sep 17 00:00:00 2001 From: Joachim Nilsson Date: Wed, 13 Nov 2019 18:39:41 +0100 Subject: [PATCH] syslogd: Use common nomenclature for next pointer Signed-off-by: Joachim Nilsson --- src/syslogd.c | 4 ++-- src/syslogd.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/syslogd.c b/src/syslogd.c index 62cc5f2..c801566 100644 --- a/src/syslogd.c +++ b/src/syslogd.c @@ -187,7 +187,7 @@ static int addpeer(struct peer *pe0) if (pe == NULL) err(1, "malloc failed"); *pe = *pe0; - SIMPLEQ_INSERT_TAIL(&pqueue, pe, next); + SIMPLEQ_INSERT_TAIL(&pqueue, pe, pe_link); return (0); } @@ -2122,7 +2122,7 @@ void init(void) /* Only once at startup */ once = 0; - SIMPLEQ_FOREACH(pe, &pqueue, next) { + SIMPLEQ_FOREACH(pe, &pqueue, pe_link) { if (pe->pe_name && pe->pe_name[0] == '/') create_unix_socket(pe); else if (SecureMode < 2) diff --git a/src/syslogd.h b/src/syslogd.h index 0a9260d..d115dfd 100644 --- a/src/syslogd.h +++ b/src/syslogd.h @@ -186,11 +186,11 @@ * Struct to hold records of peers and sockets */ struct peer { + SIMPLEQ_ENTRY(peer) pe_link; const char *pe_name; const char *pe_serv; mode_t pe_mode; - - SIMPLEQ_ENTRY(peer) next; + int pe_sock; }; /*