KNF, KNF, KNF

4 files changed, 63 insertions, 68 deletions

diff --git a/smtpd/parser.c b/smtpd/parser.c
index 5fc595d2..f7b255bb 100644
--- a/smtpd/parser.c
+++ b/smtpd/parser.c
@@ -60,16 +60,16 @@ static const struct token t_update[];
 static const struct token t_update_table[];
 
 static const struct token t_main[] = {
-	{KEYWORD,	"schedule-id",  	NONE,		t_schedule_id},
-	{KEYWORD,	"schedule-all",   	SCHEDULE_ALL,  	NULL},
-	{KEYWORD,	"show",	       	NONE,		t_show},
+	{KEYWORD,	"schedule-id",	NONE,		t_schedule_id},
+	{KEYWORD,	"schedule-all",	SCHEDULE_ALL,	NULL},
+	{KEYWORD,	"show",		NONE,		t_show},
 	{KEYWORD,	"monitor",	MONITOR,	NULL},
-	{KEYWORD,	"pause",	NONE,      	t_pause},
-	{KEYWORD,	"remove",	NONE,      	t_remove},
-	{KEYWORD,	"resume",	NONE,      	t_resume},
-	{KEYWORD,	"stop",		SHUTDOWN,      	NULL},
-	{KEYWORD,	"log",    	NONE,      	t_log},
-	{KEYWORD,	"update",    	NONE,      	t_update},
+	{KEYWORD,	"pause",	NONE,		t_pause},
+	{KEYWORD,	"remove",	NONE,		t_remove},
+	{KEYWORD,	"resume",	NONE,		t_resume},
+	{KEYWORD,	"stop",		SHUTDOWN,	NULL},
+	{KEYWORD,	"log",		NONE,		t_log},
+	{KEYWORD,	"update",	NONE,		t_update},
 	{ENDTOKEN,	"",		NONE,		NULL}
 };
 
@@ -105,30 +105,30 @@ static const struct token t_pause[] = {
 	{KEYWORD,	"mda",			PAUSE_MDA,	NULL},
 	{KEYWORD,	"mta",		        PAUSE_MTA,	NULL},
 	{KEYWORD,	"smtp",		        PAUSE_SMTP,	NULL},
-	{ENDTOKEN,	"",			NONE,      	NULL}
+	{ENDTOKEN,	"",			NONE,		NULL}
 };
 
 static const struct token t_resume[] = {
 	{KEYWORD,	"mda",			RESUME_MDA,	NULL},
 	{KEYWORD,	"mta",		        RESUME_MTA,	NULL},
 	{KEYWORD,	"smtp",		        RESUME_SMTP,	NULL},
-	{ENDTOKEN,	"",			NONE,      	NULL}
+	{ENDTOKEN,	"",			NONE,		NULL}
 };
 
 static const struct token t_log[] = {
-	{KEYWORD,	"verbose",      	LOG_VERBOSE,	NULL},
-	{KEYWORD,	"brief",	      	LOG_BRIEF,	NULL},
-	{ENDTOKEN,	"",			NONE,      	NULL}
+	{KEYWORD,	"verbose",		LOG_VERBOSE,	NULL},
+	{KEYWORD,	"brief",		LOG_BRIEF,	NULL},
+	{ENDTOKEN,	"",			NONE,		NULL}
 };
 
 static const struct token t_update[] = {
-	{KEYWORD,	"table",       	     	NONE,		t_update_table},
-	{ENDTOKEN,	"",			NONE,      	NULL}
+	{KEYWORD,	"table",		NONE,		t_update_table},
+	{ENDTOKEN,	"",			NONE,		NULL}
 };
 
 static const struct token t_update_table[] = {
-	{VARIABLE,	"name",		      	UPDATE_TABLE,	NULL},
-	{ENDTOKEN,	"",			NONE,      	NULL}
+	{VARIABLE,	"name",			UPDATE_TABLE,	NULL},
+	{ENDTOKEN,	"",			NONE,		NULL}
 };
 
 
diff --git a/smtpd/queue.c b/smtpd/queue.c
index fd8d74a7..14b0f183 100644
--- a/smtpd/queue.c
+++ b/smtpd/queue.c
@@ -229,7 +229,7 @@ queue_imsg(struct imsgev *iev, struct imsg *imsg)
 			    IMSG_SCHEDULER_ENVELOPES, imsg->hdr.peerid, 0, -1,
 			    &evp, sizeof evp);
 			return;
- 		}
+		}
 	}
 
 	if (iev->proc == PROC_MTA || iev->proc == PROC_MDA) {
@@ -465,5 +465,5 @@ queue_timeout(int fd, short event, void *p)
 
 	tv.tv_sec = 0;
 	tv.tv_usec = 10;
-	evtimer_add(ev, &tv);	
+	evtimer_add(ev, &tv);
 }
diff --git a/smtpd/queue_backend.c b/smtpd/queue_backend.c
index bf9b02b0..90e7e43a 100644
--- a/smtpd/queue_backend.c
+++ b/smtpd/queue_backend.c
@@ -216,7 +216,8 @@ queue_envelope_dump_buffer(struct envelope *ep, char *evpbuf, size_t evpbufsize)
 		return (0);
 
 	if (env->sc_queue_flags & QUEUE_COMPRESS) {
-		evplen = compress_buffer(evp, evplen, evpbufcom, sizeof evpbufcom);
+		evplen = compress_buffer(evp, evplen, evpbufcom,
+		    sizeof evpbufcom);
 		if (evplen == 0)
 			return (0);
 		evp = evpbufcom;
@@ -238,7 +239,8 @@ queue_envelope_load_buffer(struct envelope *ep, char *evpbuf, size_t evpbufsize)
 	evplen = evpbufsize;
 
 	if (env->sc_queue_flags & QUEUE_COMPRESS) {
-		evplen = uncompress_buffer(evp, evplen, evpbufcom, sizeof evpbufcom);
+		evplen = uncompress_buffer(evp, evplen, evpbufcom,
+		    sizeof evpbufcom);
 		if (evplen == 0)
 			return (0);
 		evp = evpbufcom;
@@ -281,16 +283,18 @@ queue_envelope_load(uint64_t evpid, struct envelope *ep)
 	size_t		 evplen;
 
 	ep->id = evpid;
-	evplen = env->sc_queue->envelope(QOP_LOAD, &ep->id, evpbuf, sizeof evpbuf);
+	evplen = env->sc_queue->envelope(QOP_LOAD, &ep->id, evpbuf,
+	    sizeof evpbuf);
 	if (evplen == 0)
 		return (0);
-		
+
 	if (queue_envelope_load_buffer(ep, evpbuf, evplen)) {
 		if ((e = envelope_validate(ep)) == NULL) {
 			ep->id = evpid;
 			return (1);
 		}
-		log_debug("debug: invalid envelope %016" PRIx64 ": %s", ep->id, e);
+		log_debug("debug: invalid envelope %016" PRIx64 ": %s",
+		    ep->id, e);
 	}
 	return (0);
 }
@@ -325,7 +329,8 @@ queue_envelope_learn(struct envelope *ep)
 			ep->id = evpid;
 			return (1);
 		}
-		log_debug("debug: invalid envelope %016" PRIx64 ": %s", ep->id, e);
+		log_debug("debug: invalid envelope %016" PRIx64 ": %s",
+		    ep->id, e);
 	}
 	return (0);
 }
@@ -335,7 +340,7 @@ queue_generate_msgid(void)
 {
 	uint32_t msgid;
 
-	while((msgid = arc4random_uniform(0xffffffff)) == 0)
+	while ((msgid = arc4random_uniform(0xffffffff)) == 0)
 		;
 
 	return msgid;
@@ -347,7 +352,7 @@ queue_generate_evpid(uint32_t msgid)
 	uint32_t rnd;
 	uint64_t evpid;
 
-	while((rnd = arc4random_uniform(0xffffffff)) == 0)
+	while ((rnd = arc4random_uniform(0xffffffff)) == 0)
 		;
 
 	evpid = msgid;
diff --git a/smtpd/queue_fsqueue.c b/smtpd/queue_fsqueue.c
index 0eccad4e..eaa34d74 100644
--- a/smtpd/queue_fsqueue.c
+++ b/smtpd/queue_fsqueue.c
@@ -72,9 +72,9 @@ static void	fsqueue_qwalk_close(void *);
 #define PATH_EVPTMP		PATH_INCOMING "/envelope.tmp"
 
 struct queue_backend	queue_backend_fs = {
-	  fsqueue_init,
-	  fsqueue_message,
-	  fsqueue_envelope,
+	fsqueue_init,
+	fsqueue_message,
+	fsqueue_envelope,
 };
 
 static struct timespec	startup;
@@ -177,7 +177,8 @@ fsqueue_envelope_create(uint64_t *evpid, char *buf, size_t len)
 		if (queued)
 			fsqueue_envelope_path(*evpid, path, sizeof(path));
 		else
-			queue_envelope_incoming_path(*evpid, path, sizeof(path));
+			queue_envelope_incoming_path(*evpid, path,
+			    sizeof(path));
 
 		if (stat(path, &sb) == -1 && errno == ENOENT)
 			goto found;
@@ -268,7 +269,7 @@ fsqueue_message_create(uint32_t *msgid)
 
 again:
 	*msgid = queue_generate_msgid();
-	
+
 	/* prevent possible collision later when moving to Q_QUEUE */
 	fsqueue_message_path(*msgid, rootdir, sizeof(rootdir));
 	if (stat(rootdir, &sb) != -1 || errno != ENOENT)
@@ -368,11 +369,13 @@ fsqueue_message_corrupt(uint32_t msgid)
 	int  retry = 0;
 
 	fsqueue_message_path(msgid, rootdir, sizeof(rootdir));
-	fsqueue_message_corrupt_path(msgid, corruptdir, sizeof(corruptdir));
+	fsqueue_message_corrupt_path(msgid, corruptdir,
+	    sizeof(corruptdir));
 
 again:
 	if (stat(corruptdir, &sb) != -1 || errno != ENOENT) {
-		fsqueue_message_corrupt_path(msgid, corruptdir, sizeof(corruptdir));
+		fsqueue_message_corrupt_path(msgid, corruptdir,
+		    sizeof(corruptdir));
 		snprintf(buf, sizeof(buf), ".%i", retry++);
 		strlcat(corruptdir, buf, sizeof(corruptdir));
 		goto again;
@@ -416,52 +419,40 @@ fsqueue_init(int server)
 static int
 fsqueue_message(enum queue_op qop, uint32_t *msgid)
 {
-        switch (qop) {
-        case QOP_CREATE:
+	switch (qop) {
+	case QOP_CREATE:
 		return fsqueue_message_create(msgid);
-
-        case QOP_DELETE:
+	case QOP_DELETE:
 		return fsqueue_message_delete(*msgid);
-
-        case QOP_COMMIT:
+	case QOP_COMMIT:
 		return fsqueue_message_commit(*msgid);
-
-        case QOP_FD_R:
-                return fsqueue_message_fd_r(*msgid);
-
+	case QOP_FD_R:
+		return fsqueue_message_fd_r(*msgid);
 	case QOP_CORRUPT:
 		return fsqueue_message_corrupt(*msgid);
-
-        default:
+	default:
 		fatalx("queue_fsqueue_message: unsupported operation.");
-        }
-
+	}
 	return 0;
 }
 
 static int
 fsqueue_envelope(enum queue_op qop, uint64_t *evpid, char *buf, size_t len)
 {
-        switch (qop) {
-        case QOP_CREATE:
+	switch (qop) {
+	case QOP_CREATE:
 		return fsqueue_envelope_create(evpid, buf, len);
-
-        case QOP_DELETE:
+	case QOP_DELETE:
 		return fsqueue_envelope_delete(*evpid);
-
-        case QOP_LOAD:
+	case QOP_LOAD:
 		return fsqueue_envelope_load(*evpid, buf, len);
-
-        case QOP_UPDATE:
+	case QOP_UPDATE:
 		return fsqueue_envelope_update(*evpid, buf, len);
-
-        case QOP_LEARN:
+	case QOP_LEARN:
 		return fsqueue_envelope_learn(evpid, buf, len);
-
-        default:
+	default:
 		fatalx("queue_fsqueue_envelope: unsupported operation.");
-        }
-
+	}
 	return 0;
 }
 
@@ -502,12 +493,11 @@ static int
 fsqueue_qwalk(void *hdl, uint64_t *evpid)
 {
 	struct qwalk	*q = hdl;
-        FTSENT 		*e;
+	FTSENT		*e;
 	char		*tmp;
 
-        while ((e = fts_read(q->fts)) != NULL) {
-
-		switch(e->fts_info) {
+	while ((e = fts_read(q->fts)) != NULL) {
+		switch (e->fts_info) {
 		case FTS_D:
 			q->depth += 1;
 			if (q->depth == 2 && e->fts_namelen != 2) {
@@ -548,5 +538,5 @@ fsqueue_qwalk(void *hdl, uint64_t *evpid)
 		}
 	}
 
-        return (0); 
+	return (0);
 }