From a8800744f21d4cebd56bd74bbad900b4aca364bb Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Thu, 30 Dec 2021 12:13:13 -0500
Subject: [PATCH] listsub.c: style cleanup

---
 webcit/listsub.c | 67 ++++++++++++++++++++----------------------------
 1 file changed, 28 insertions(+), 39 deletions(-)

diff --git a/webcit/listsub.c b/webcit/listsub.c
index d445d05bd..0b6a90b03 100644
--- a/webcit/listsub.c
+++ b/webcit/listsub.c
@@ -1,22 +1,18 @@
-/*
- * Web forms for handling mailing list subscribe/unsubscribe requests.
- *
- * Copyright (c) 1996-2012 by the citadel.org team
- *
- * This program is open source software.  You can redistribute it and/or
- * modify it under the terms of the GNU General Public License, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
+// Web forms for handling mailing list subscribe/unsubscribe requests.
+//
+// Copyright (c) 1996-2022 by the citadel.org team
+//
+// This program is open source software.  You can redistribute it and/or
+// modify it under the terms of the GNU General Public License, version 3.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
 
 #include "webcit.h"
 
-/*
- * List subscription handling
- */
+// List subscription handling
 int Conditional_LISTSUB_EXECUTE_SUBSCRIBE(StrBuf *Target, WCTemplputParams *TP) {
 	int rc;
 	StrBuf *Line;
@@ -28,15 +24,13 @@ int Conditional_LISTSUB_EXECUTE_SUBSCRIBE(StrBuf *Target, WCTemplputParams *TP)
 	}
 
 	Room = sbstr("room");
-	if (Room == NULL)
-	{
+	if (Room == NULL) {
 		ImpMsg = _("You need to specify the mailinglist to subscribe to.");
 		AppendImportantMessage(ImpMsg, -1);
 		return 0;
 	}
 	Email = sbstr("email");
-	if (Email == NULL)
-	{
+	if (Email == NULL) {
 		ImpMsg = _("You need to specify the email address you'd like to subscribe with.");
 		AppendImportantMessage(ImpMsg, -1);
 		return 0;
@@ -65,15 +59,13 @@ int Conditional_LISTSUB_EXECUTE_UNSUBSCRIBE(StrBuf *Target, WCTemplputParams *TP
 	}
 
 	Room = sbstr("room");
-	if (Room == NULL)
-	{
+	if (Room == NULL) {
 		ImpMsg = _("You need to specify the mailinglist to subscribe to.");
 		AppendImportantMessage(ImpMsg, -1);
 		return 0;
 	}
 	Email = sbstr("email");
-	if (Email == NULL)
-	{
+	if (Email == NULL) {
 		ImpMsg = _("You need to specify the email address you'd like to subscribe with.");
 		AppendImportantMessage(ImpMsg, -1);
 		return 0;
@@ -84,13 +76,14 @@ int Conditional_LISTSUB_EXECUTE_UNSUBSCRIBE(StrBuf *Target, WCTemplputParams *TP
 	StrBuf_ServGetln(Line);
 	rc = GetServerStatusMsg(Line, NULL, 1, 2);
 	FreeStrBuf(&Line);
-	if (rc == 2)
+	if (rc == 2) {
 		putbstr("__FAIL", NewStrBufPlain(HKEY("1")));
+	}
 	return rc == 2;
 }
 
-int Conditional_LISTSUB_EXECUTE_CONFIRM_SUBSCRIBE(StrBuf *Target, WCTemplputParams *TP)
-{
+
+int Conditional_LISTSUB_EXECUTE_CONFIRM_SUBSCRIBE(StrBuf *Target, WCTemplputParams *TP) {
 	int rc;
 	StrBuf *Line;
 	const char *ImpMsg;
@@ -101,15 +94,13 @@ int Conditional_LISTSUB_EXECUTE_CONFIRM_SUBSCRIBE(StrBuf *Target, WCTemplputPara
 	}
 
 	Room = sbstr("room");
-	if (Room == NULL)
-	{
+	if (Room == NULL) {
 		ImpMsg = _("You need to specify the mailinglist to subscribe to.");
 		AppendImportantMessage(ImpMsg, -1);
 		return 0;
 	}
 	Token = sbstr("token");
-	if (Room == NULL)
-	{
+	if (Room == NULL) {
 		ImpMsg = _("You need to specify the mailinglist to subscribe to.");
 		AppendImportantMessage(ImpMsg, -1);
 		return 0;
@@ -120,15 +111,15 @@ int Conditional_LISTSUB_EXECUTE_CONFIRM_SUBSCRIBE(StrBuf *Target, WCTemplputPara
 	StrBuf_ServGetln(Line);
 	rc = GetServerStatusMsg(Line, NULL, 1, 2);
 	FreeStrBuf(&Line);
-	if (rc == 2)
+	if (rc == 2) {
 		putbstr("__FAIL", NewStrBufPlain(HKEY("1")));
+	}
 	return rc == 2;
 }
 
-void do_listsub(void)
-{
-	if (!havebstr("cmd"))
-	{
+
+void do_listsub(void) {
+	if (!havebstr("cmd")) {
 		putbstr("cmd", NewStrBufPlain(HKEY("choose")));
 	}
 	output_headers(1, 0, 0, 0, 1, 0);
@@ -136,6 +127,7 @@ void do_listsub(void)
 	end_burst();
 }
 
+
 void 
 InitModule_LISTSUB
 (void)
@@ -143,8 +135,5 @@ InitModule_LISTSUB
 	RegisterConditional("COND:LISTSUB:EXECUTE:SUBSCRIBE", 0, Conditional_LISTSUB_EXECUTE_SUBSCRIBE,  CTX_NONE);
 	RegisterConditional("COND:LISTSUB:EXECUTE:UNSUBSCRIBE", 0, Conditional_LISTSUB_EXECUTE_UNSUBSCRIBE,  CTX_NONE);
 	RegisterConditional("COND:LISTSUB:EXECUTE:CONFIRM:SUBSCRIBE", 0, Conditional_LISTSUB_EXECUTE_CONFIRM_SUBSCRIBE,  CTX_NONE);
-
 	WebcitAddUrlHandler(HKEY("listsub"), "", 0, do_listsub, ANONYMOUS|COOKIEUNNEEDED|FORCE_SESSIONCLOSE);
-
-
 }
-- 
2.30.2