projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ee511c8
)
removed StartLibCitadel()
author
Art Cancro
<ajc@citadel.org>
Wed, 3 Mar 2021 01:03:05 +0000
(20:03 -0500)
committer
Art Cancro
<ajc@citadel.org>
Wed, 3 Mar 2021 01:03:05 +0000
(20:03 -0500)
16 files changed:
citadel/sendcommand.c
patch
|
blob
|
history
citadel/server_main.c
patch
|
blob
|
history
libcitadel/lib/libcitadel.c
patch
|
blob
|
history
libcitadel/lib/libcitadel.h
patch
|
blob
|
history
libcitadel/tests/hashlist_test.c
patch
|
blob
|
history
libcitadel/tests/html_to_ascii_test.c
patch
|
blob
|
history
libcitadel/tests/mime_xdg_lookup_type.c
patch
|
blob
|
history
libcitadel/tests/mimeparser_test.c
patch
|
blob
|
history
libcitadel/tests/stringbuf_IO_test.c
patch
|
blob
|
history
libcitadel/tests/stringbuf_conversion.c
patch
|
blob
|
history
libcitadel/tests/stringbuf_stream.c
patch
|
blob
|
history
libcitadel/tests/stringbuf_test.c
patch
|
blob
|
history
libcitadel/tests/stripallbut_test.c
patch
|
blob
|
history
libcitadel/tests/wildfire_test.c
patch
|
blob
|
history
webcit/tests/test_main.c
patch
|
blob
|
history
webcit/webserver.c
patch
|
blob
|
history
diff --git
a/citadel/sendcommand.c
b/citadel/sendcommand.c
index 7d8e089853fc1416e11739d8a29a23f3da922d06..caca87fd9a534ff09c7887aad60da0be7b048f11 100644
(file)
--- 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;
int xfermode = 0;
char ctdldir[PATH_MAX]=CTDLDIR;
- StartLibCitadel(SIZ);
-
/* Parse command line */
while ((a = getopt(argc, argv, "h:w:")) != EOF) {
switch (a) {
/* 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 */
close(serv_sock);
alarm(0); /* cancel the watchdog timer */
+
fprintf(stderr, "sendcommand: processing ended.\n");
if (xfermode == '5') {
return(1);
}
return(0);
}
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 cd5a023e04d2bc921eac3d1e39438ae342e3be78..9dad4d756ae51602d73882e8ec15acb9752bee5e 100644
(file)
--- 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) {
*/
int main(int argc, char **argv) {
- size_t basesize = 64;
char facility[32];
int a; /* General-purpose variables */
struct passwd pw, *pwp = NULL;
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;
case 't':
break;
- //
basesize (passed to libcitadel)
+ //
deprecated
case 'B':
case 'B':
- basesize = atoi(optarg);
break;
// deprecated
break;
// deprecated
@@
-219,7
+217,6
@@
int main(int argc, char **argv) {
InitializeMasterCC();
InitializeMasterTSD();
InitializeMasterCC();
InitializeMasterTSD();
- StartLibCitadel(basesize);
setlogmask(LOG_UPTO(max_log_level));
openlog("citserver",
( running_as_daemon ? (LOG_PID) : (LOG_PID | LOG_PERROR) ),
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 51f0f1fb04632362b4f4c49d21708d19822a41fa..2713887cc03880b5ead1a5e2c2ff2fe66c026311 100644
(file)
--- a/
libcitadel/lib/libcitadel.c
+++ b/
libcitadel/lib/libcitadel.c
@@
-47,7
+47,6
@@
ConstStr RoomNetCfgStrs[maxRoomNetCfg] = {
extern int EnableSplice;
extern int EnableSplice;
-extern int BaseStrBufSize;
extern int ZLibCompressionRatio;
char *libcitadel_version_string(void) {
extern int ZLibCompressionRatio;
char *libcitadel_version_string(void) {
@@
-58,20
+57,6
@@
int libcitadel_version_number(void) {
return LIBCITADEL_VERSION_NUMBER;
}
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();
void ShutDownLibCitadel(void)
{
ShutDownLibCitadelMime();
diff --git
a/libcitadel/lib/libcitadel.h
b/libcitadel/lib/libcitadel.h
index 7740dc190215815d72a4d271b892801c95548f9a..3677c0312b7f0d27988dd590deab765b3338cfec 100644
(file)
--- 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);
char *libcitadel_version_string(void);
int libcitadel_version_number(void);
-void StartLibCitadel(size_t basesize);
void ShutDownLibCitadel(void);
/*
void ShutDownLibCitadel(void);
/*
diff --git
a/libcitadel/tests/hashlist_test.c
b/libcitadel/tests/hashlist_test.c
index e5a25507cbc4d56a27b4d826310fc078d0b6ad00..69ee47d27aec64beb247ee0ca1dc44abfa7d10fa 100644
(file)
--- 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);
{
setvbuf(stdout, NULL, _IONBF, 0);
- StartLibCitadel(8);
CU_BOOL Run = CU_FALSE ;
CU_set_output_filename("TestAutomated");
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 03cc1bc96e8824aa565ef0438595872a7ee718ce..8f91e38216f0e1e3409f4b0babd6f80cb77d34b0 100644
(file)
--- 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);
setvbuf(stdout, NULL, _IONBF, 0);
- StartLibCitadel(8);
CU_BOOL Run = CU_FALSE ;
CU_set_output_filename("TestAutomated");
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 f85f47654de7cf076c787dd3532997b24b911eea..d2c669d1467f19117103dee1feb76cf1cc29b8b2 100644
(file)
--- 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;
}
}
break;
}
}
- StartLibCitadel(8);
if (IconDir != NULL)
LoadIconDir(IconDir);
if (IconDir != NULL)
LoadIconDir(IconDir);
diff --git
a/libcitadel/tests/mimeparser_test.c
b/libcitadel/tests/mimeparser_test.c
index acb1a0087d28f89a21bcbd401ec32c3e741d66c0..a78fcaf18af5e2b656383412c4bfa5fa1c626116 100644
(file)
--- 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;
}
}
ma.printme = optarg;
}
}
- StartLibCitadel(8);
if (filename == NULL) {
printf("Filename requried! -f\n");
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 24ca8d1d34e2930fa06a4d4881014e51e14b4ebd..984b5beb4c608537068e60868f25bfcf8e0d16bf 100644
(file)
--- 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");
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 8305f4677918bef8682bedaea2f8f12d25bd0e1f..c73ece4d273d9489bd647d0391880d1897dabdf0 100644
(file)
--- 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);
setvbuf(stdout, NULL, _IONBF, 0);
- StartLibCitadel(8);
CU_BOOL Run = CU_FALSE ;
CU_set_output_filename("TestAutomated");
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 3c9d71719c2e05ebfb375cbdc70933a90624a2ce..32d4e779ece6d9468b9a9949dbc5a2bf59f87e20 100644
(file)
--- 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;
StreamEncode();
return 0;
diff --git
a/libcitadel/tests/stringbuf_test.c
b/libcitadel/tests/stringbuf_test.c
index 2515c298e6ee909f7be6ccbfe401a48a311284d5..2ca5c254fc717b85d6a595f3d2d83bd2b7750706 100644
(file)
--- 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);
///int i;
setvbuf(stdout, NULL, _IONBF, 0);
- StartLibCitadel(8);
CU_BOOL Run = CU_FALSE ;
if (argc > 0)
CU_BOOL Run = CU_FALSE ;
if (argc > 0)
diff --git
a/libcitadel/tests/stripallbut_test.c
b/libcitadel/tests/stripallbut_test.c
index fb67fb5a750978d631dedd242d310a5378cc3f5e..22ecf7305eb5907677325d4cb5fb0d488d3f4bf1 100644
(file)
--- 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);
{
setvbuf(stdout, NULL, _IONBF, 0);
- StartLibCitadel(8);
CU_set_output_filename("TestAutomated");
if (CU_initialize_registry()) {
CU_set_output_filename("TestAutomated");
if (CU_initialize_registry()) {
diff --git
a/libcitadel/tests/wildfire_test.c
b/libcitadel/tests/wildfire_test.c
index afbcac12a4260e6450d004863da7f36598adcdb7..26097d97b9644b9e96cb0b43aa438326e9f794ec 100644
(file)
--- 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;
StrBuf *Info;
int nWildfireHeaders = 0;
- StartLibCitadel(8);
printf("%s == %d?\n", libcitadel_version_string(), libcitadel_version_number());
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 1316da3f6c857faeaa0f155ca3e6b09d53071096..a0de76722ac67bae3bdd88ebf778ac2aba39c162 100644
(file)
--- 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)
{
*/
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];
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;
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);
break;
case 'i':
safestrncpy(ip_addr, optarg, sizeof ip_addr);
diff --git
a/webcit/webserver.c
b/webcit/webserver.c
index 23043c840f4da4d48a8467e9eecbf478c3ce4c34..96adf01c552edb7371283b1ab76b51a37ec98522 100644
(file)
--- 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;
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 */
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 '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);
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] "
"[-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
#ifdef HAVE_OPENSSL
"[-s] [-S cipher_suites]"
#endif