From: Art Cancro <ajc@citadel.org>
Date: Wed, 3 Mar 2021 01:03:05 +0000 (-0500)
Subject: removed StartLibCitadel()
X-Git-Tag: v939~100
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=b826c3117bb7ddf1386a4811cb2eb47ea4e1097c

removed StartLibCitadel()
---

diff --git a/citadel/sendcommand.c b/citadel/sendcommand.c
index 7d8e08985..caca87fd9 100644
--- a/citadel/sendcommand.c
+++ b/citadel/sendcommand.c
@@ -142,8 +142,6 @@ int main(int argc, char **argv)
 	int xfermode = 0;
 	char ctdldir[PATH_MAX]=CTDLDIR;
 
-	StartLibCitadel(SIZ);
-
 	/* Parse command line */
 	while ((a = getopt(argc, argv, "h:w:")) != EOF) {
 		switch (a) {
@@ -221,23 +219,10 @@ int main(int argc, char **argv)
 
 	close(serv_sock);
 	alarm(0);						/* cancel the watchdog timer */
+
 	fprintf(stderr, "sendcommand: processing ended.\n");
 	if (xfermode == '5') {
 		return(1);
 	}
 	return(0);
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/citadel/server_main.c b/citadel/server_main.c
index cd5a023e0..9dad4d756 100644
--- a/citadel/server_main.c
+++ b/citadel/server_main.c
@@ -69,7 +69,6 @@ void ctdl_lockfile(int op) {
  */
 int main(int argc, char **argv) {
 
-	size_t basesize = 64;
 	char facility[32];
 	int a;			/* General-purpose variables */
 	struct passwd pw, *pwp = NULL;
@@ -135,9 +134,8 @@ int main(int argc, char **argv) {
 		case 't':
 			break;
 
-		// basesize (passed to libcitadel)
+		// deprecated
                 case 'B':
-                        basesize = atoi(optarg);
                         break;
 
 		// deprecated
@@ -219,7 +217,6 @@ int main(int argc, char **argv) {
 	InitializeMasterCC();
 	InitializeMasterTSD();
 
-	StartLibCitadel(basesize);
 	setlogmask(LOG_UPTO(max_log_level));
 	openlog("citserver",
 		( running_as_daemon ? (LOG_PID) : (LOG_PID | LOG_PERROR) ),
diff --git a/libcitadel/lib/libcitadel.c b/libcitadel/lib/libcitadel.c
index 51f0f1fb0..2713887cc 100644
--- a/libcitadel/lib/libcitadel.c
+++ b/libcitadel/lib/libcitadel.c
@@ -47,7 +47,6 @@ ConstStr RoomNetCfgStrs[maxRoomNetCfg] = {
 
 
 extern int EnableSplice;
-extern int BaseStrBufSize;
 extern int ZLibCompressionRatio;
 
 char *libcitadel_version_string(void) {
@@ -58,20 +57,6 @@ int libcitadel_version_number(void) {
 	return LIBCITADEL_VERSION_NUMBER;
 }
 
-void StartLibCitadel(size_t basesize)
-{
-	const char *envvar;
-
-	BaseStrBufSize = basesize;
-	envvar = getenv("LIBCITADEL_ENABLE_SPLICE");
-	if (envvar != NULL)
-		EnableSplice = atol(envvar);
-
-	envvar = getenv("LIBCITADEL_ZLIB_LEVEL");
-	if (envvar != NULL)
-		ZLibCompressionRatio = atol(envvar);
-}
-
 void ShutDownLibCitadel(void)
 {
 	ShutDownLibCitadelMime();
diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h
index 7740dc190..3677c0312 100644
--- a/libcitadel/lib/libcitadel.h
+++ b/libcitadel/lib/libcitadel.h
@@ -120,7 +120,6 @@ extern const char *StrBufNOTNULL;
 
 char *libcitadel_version_string(void);
 int libcitadel_version_number(void);
-void StartLibCitadel(size_t basesize);
 void ShutDownLibCitadel(void);
 
 /*
diff --git a/libcitadel/tests/hashlist_test.c b/libcitadel/tests/hashlist_test.c
index e5a25507c..69ee47d27 100644
--- a/libcitadel/tests/hashlist_test.c
+++ b/libcitadel/tests/hashlist_test.c
@@ -312,7 +312,6 @@ int main(int argc, char* argv[])
 {
 	setvbuf(stdout, NULL, _IONBF, 0);
 
-	StartLibCitadel(8);
 	CU_BOOL Run = CU_FALSE ;
 	
 	CU_set_output_filename("TestAutomated");
diff --git a/libcitadel/tests/html_to_ascii_test.c b/libcitadel/tests/html_to_ascii_test.c
index 03cc1bc96..8f91e3821 100644
--- a/libcitadel/tests/html_to_ascii_test.c
+++ b/libcitadel/tests/html_to_ascii_test.c
@@ -214,7 +214,6 @@ int main(int argc, char* argv[])
 
 	setvbuf(stdout, NULL, _IONBF, 0);
 
-	StartLibCitadel(8);
 	CU_BOOL Run = CU_FALSE ;
 	
 	CU_set_output_filename("TestAutomated");
diff --git a/libcitadel/tests/mime_xdg_lookup_type.c b/libcitadel/tests/mime_xdg_lookup_type.c
index f85f47654..d2c669d14 100644
--- a/libcitadel/tests/mime_xdg_lookup_type.c
+++ b/libcitadel/tests/mime_xdg_lookup_type.c
@@ -49,7 +49,6 @@ int main(int argc, char* argv[])
 			break;
 		}
 	}
-	StartLibCitadel(8);
 
 	if (IconDir != NULL)
 		LoadIconDir(IconDir);
diff --git a/libcitadel/tests/mimeparser_test.c b/libcitadel/tests/mimeparser_test.c
index acb1a0087..a78fcaf18 100644
--- a/libcitadel/tests/mimeparser_test.c
+++ b/libcitadel/tests/mimeparser_test.c
@@ -234,7 +234,6 @@ int main(int argc, char* argv[])
 			ma.printme = optarg;
 		}
 	}
-	StartLibCitadel(8);
 
 	if (filename == NULL) {
 		printf("Filename requried! -f\n");
diff --git a/libcitadel/tests/stringbuf_IO_test.c b/libcitadel/tests/stringbuf_IO_test.c
index 24ca8d1d3..984b5beb4 100644
--- a/libcitadel/tests/stringbuf_IO_test.c
+++ b/libcitadel/tests/stringbuf_IO_test.c
@@ -457,7 +457,6 @@ int main(int argc, char* argv[])
 	}
 
 
-	StartLibCitadel(8);
 	CU_BOOL Run = CU_FALSE ;
 	
 	CU_set_output_filename("TestAutomated");
diff --git a/libcitadel/tests/stringbuf_conversion.c b/libcitadel/tests/stringbuf_conversion.c
index 8305f4677..c73ece4d2 100644
--- a/libcitadel/tests/stringbuf_conversion.c
+++ b/libcitadel/tests/stringbuf_conversion.c
@@ -458,7 +458,6 @@ int main(int argc, char* argv[])
 
 	setvbuf(stdout, NULL, _IONBF, 0);
 
-	StartLibCitadel(8);
 	CU_BOOL Run = CU_FALSE ;
 	
 	CU_set_output_filename("TestAutomated");
diff --git a/libcitadel/tests/stringbuf_stream.c b/libcitadel/tests/stringbuf_stream.c
index 3c9d71719..32d4e779e 100644
--- a/libcitadel/tests/stringbuf_stream.c
+++ b/libcitadel/tests/stringbuf_stream.c
@@ -157,7 +157,6 @@ int main(int argc, char* argv[])
 	}
 
 
-	StartLibCitadel(8);
 
 	StreamEncode();
 	return 0;
diff --git a/libcitadel/tests/stringbuf_test.c b/libcitadel/tests/stringbuf_test.c
index 2515c298e..2ca5c254f 100644
--- a/libcitadel/tests/stringbuf_test.c
+++ b/libcitadel/tests/stringbuf_test.c
@@ -624,7 +624,6 @@ int main(int argc, char* argv[])
 	///int i;
 	setvbuf(stdout, NULL, _IONBF, 0);
 
-	StartLibCitadel(8);
 	CU_BOOL Run = CU_FALSE ;
 
 	if (argc > 0)
diff --git a/libcitadel/tests/stripallbut_test.c b/libcitadel/tests/stripallbut_test.c
index fb67fb5a7..22ecf7305 100644
--- a/libcitadel/tests/stripallbut_test.c
+++ b/libcitadel/tests/stripallbut_test.c
@@ -128,7 +128,6 @@ int main(int argc, char* argv[])
 {
 	setvbuf(stdout, NULL, _IONBF, 0);
 
-	StartLibCitadel(8);
 
 	CU_set_output_filename("TestAutomated");
 	if (CU_initialize_registry()) {
diff --git a/libcitadel/tests/wildfire_test.c b/libcitadel/tests/wildfire_test.c
index afbcac12a..26097d97b 100644
--- a/libcitadel/tests/wildfire_test.c
+++ b/libcitadel/tests/wildfire_test.c
@@ -82,7 +82,6 @@ int main(int argc, char* argv[])
 	StrBuf *Info;
 	int nWildfireHeaders = 0;
 
-	StartLibCitadel(8);
 	printf("%s == %d?\n", libcitadel_version_string(), libcitadel_version_number());
        
 	
diff --git a/webcit/tests/test_main.c b/webcit/tests/test_main.c
index 1316da3f6..a0de76722 100644
--- a/webcit/tests/test_main.c
+++ b/webcit/tests/test_main.c
@@ -65,7 +65,6 @@ extern int LoadTemplates;
  */
 int main(int argc, char **argv)
 {
-	size_t basesize = 2;            /* how big should strbufs be on creation? */
 	pthread_attr_t attr;		/* Thread attributes */
 	int a;	        	/* General-purpose variables */
 	char tracefile[PATH_MAX];
@@ -115,10 +114,7 @@ int main(int argc, char **argv)
 			home_specified = 1;
 			home=1;
 			break;
-		case 'B': /* Basesize */
-			basesize = atoi(optarg);
-			if (basesize > 2)
-				StartLibCitadel(basesize);
+		case 'B': /* deprecated */
 			break;
 		case 'i':
 			safestrncpy(ip_addr, optarg, sizeof ip_addr);
diff --git a/webcit/webserver.c b/webcit/webserver.c
index 23043c840..96adf01c5 100644
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -64,7 +64,6 @@ void LoadMimeBlacklist(void);
 int main(int argc, char **argv)
 {
 	uid_t UID = -1;
-	size_t basesize = 2;            /* how big should strbufs be on creation? */
 	pthread_t SessThread;		/* Thread descriptor */
 	pthread_attr_t attr;		/* Thread attributes */
 	int a;		        	/* General-purpose variable */
@@ -129,10 +128,7 @@ int main(int argc, char **argv)
 		case 'g':
 			default_landing_page = strdup(optarg);
 			break;
-		case 'B': /* Basesize */
-			basesize = atoi(optarg);
-			if (basesize > 2)
-				StartLibCitadel(basesize);
+		case 'B': /* deprecated */
 			break;
 		case 'i':
 			safestrncpy(ip_addr, optarg, sizeof ip_addr);
@@ -199,7 +195,7 @@ int main(int argc, char **argv)
 				"[-d] [-Z] [-G i18ndumpfile] "
 				"[-u uid] [-h homedirectory] "
 				"[-D daemonizepid] [-v] "
-				"[-g defaultlandingpage] [-B basesize] "
+				"[-g defaultlandingpage] "
 #ifdef HAVE_OPENSSL
 				"[-s] [-S cipher_suites]"
 #endif