From 94c2f05c0230a64c9515b2835303fd760e218e48 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Thu, 14 Dec 2017 11:03:25 -0500 Subject: [PATCH] minor style cleanups --- citadel/genstamp.c | 2 -- citadel/internet_addressing.c | 8 ++++---- citadel/locate_host.c | 22 +++++++++------------ citadel/sysdep.c | 37 ++++++++++++----------------------- 4 files changed, 26 insertions(+), 43 deletions(-) diff --git a/citadel/genstamp.c b/citadel/genstamp.c index 668e8c052..e8d5dd86b 100644 --- a/citadel/genstamp.c +++ b/citadel/genstamp.c @@ -10,7 +10,6 @@ #include #include "genstamp.h" - static char *months[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" @@ -20,7 +19,6 @@ static char *weekdays[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" }; - /* * Supplied with a unix timestamp, generate an RFC822-compliant textual * time and date stamp. diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c index ed160fae7..a9c1b6481 100644 --- a/citadel/internet_addressing.c +++ b/citadel/internet_addressing.c @@ -93,10 +93,10 @@ void utf8ify_rfc822_string(char *buf) { int illegal_non_rfc2047_encoding = 0; /* Sometimes, badly formed messages contain strings which were simply - * written out directly in some foreign character set instead of - * using RFC2047 encoding. This is illegal but we will attempt to - * handle it anyway by converting from a user-specified default - * charset to UTF-8 if we see any nonprintable characters. + * written out directly in some foreign character set instead of + * using RFC2047 encoding. This is illegal but we will attempt to + * handle it anyway by converting from a user-specified default + * charset to UTF-8 if we see any nonprintable characters. */ len = strlen(buf); for (i=0; i #include #include - #include - #include "context.h" #ifdef HAVE_RESOLV_H #include @@ -123,15 +121,14 @@ int rblcheck_backend(char *domain, char *txtbuf, int txtbufsize) { return(0); } - if( len > PACKETSZ ) + if (len > PACKETSZ) { answer = malloc(len); need_to_free_answer = 1; len = res_query(domain, C_IN, T_A, answer, len); if( len == -1 ) { if (txtbuf != NULL) { - snprintf(txtbuf, txtbufsize, - "Message rejected due to known spammer source IP address"); + snprintf(txtbuf, txtbufsize, "Message rejected due to known spammer source IP address"); } if (need_to_free_answer) free(answer); return(1); @@ -139,15 +136,15 @@ int rblcheck_backend(char *domain, char *txtbuf, int txtbufsize) { } if (server_shutting_down) { - if (txtbuf != NULL) + if (txtbuf != NULL) { snprintf(txtbuf, txtbufsize, "System shutting down"); + } if (need_to_free_answer) free(answer); return (1); } result = (char *) malloc(RESULT_SIZE); - result[ 0 ] = '\0'; - + result[0] = '\0'; /* Make another DNS query for textual data; this shouldn't * be a performance hit, since it'll now be cached at the @@ -168,8 +165,7 @@ int rblcheck_backend(char *domain, char *txtbuf, int txtbufsize) { if (len ==(-1)) { if (txtbuf != NULL) { - snprintf(txtbuf, txtbufsize, - "Message rejected due to known spammer source IP address"); + snprintf(txtbuf, txtbufsize, "Message rejected due to known spammer source IP address"); } if (need_to_free_answer) free(answer); free(result); @@ -296,11 +292,11 @@ int rbl_check(char *message_to_spammer) for (i=0; i<8; ++i) { char tokbuf[5]; extract_token(tokbuf, workbuf, i, ':', sizeof tokbuf); - memcpy(&tbuf[ (i*4) + (4-strlen(tokbuf)) ], tokbuf, strlen(tokbuf) ); } - if (strlen(tbuf) != 32) + if (strlen(tbuf) != 32) { goto finish_rbl; + } /* now reverse it and add dots */ strcpy(workbuf, tbuf); diff --git a/citadel/sysdep.c b/citadel/sysdep.c index cbed531f4..d17e2bf15 100644 --- a/citadel/sysdep.c +++ b/citadel/sysdep.c @@ -41,6 +41,7 @@ #include "modules/crypto/serv_crypto.h" /* Needed for init_ssl, client_write_ssl, client_read_ssl, destruct_ssl */ #include "housekeeping.h" #include "context.h" + /* * Signal handler to shut down the server. */ @@ -50,18 +51,19 @@ volatile int shutdown_and_halt = 0; volatile int restart_server = 0; volatile int running_as_daemon = 0; + static RETSIGTYPE signal_cleanup(int signum) { syslog(LOG_DEBUG, "sysdep: caught signal %d; shutting down.", signum); exit_signal = signum; server_shutting_down = 1; } + static RETSIGTYPE signal_exit(int signum) { exit(1); } - /* * Some initialization stuff... */ @@ -327,7 +329,6 @@ static void flush_client_inbuf(void) FlushStrBuf(CCC->ReadBuf); CCC->RecvBuf->ReadWritePointer = NULL; - } */ @@ -1098,8 +1099,6 @@ void HuntBadSession(void) struct timeval tv; struct ServiceFunctionHook *serviceptr; - - /* Next, add all of the client sockets. */ begin_critical_section(S_SESSION_TABLE); for (ptr = ContextList; ptr != NULL; ptr = ptr->next) { @@ -1115,13 +1114,12 @@ void HuntBadSession(void) if ( (ptr->state == CON_IDLE) && (ptr->kill_me == 0) && (ptr->client_socket > 0) - ) { + ) { FD_SET(ptr->client_socket, &readfds); if (ptr->client_socket > highest) highest = ptr->client_socket; - if ((select(highest + 1, &readfds, NULL, NULL, &tv) < 0) && - (errno == EBADF)) + if ((select(highest + 1, &readfds, NULL, NULL, &tv) < 0) && (errno == EBADF)) { /* Gotcha! */ syslog(LOG_ERR, @@ -1130,18 +1128,16 @@ void HuntBadSession(void) ptr->client_socket, ptr->is_local_socket, ptr->curr_user, - ptr->cs_host,ptr->cs_addr); - + ptr->cs_host,ptr->cs_addr + ); ptr->kill_me = 1; ptr->client_socket = -1; break; } } - } end_critical_section(S_SESSION_TABLE); - /* First, add the various master sockets to the fdset. */ for (serviceptr = ServiceHookTable; serviceptr != NULL; serviceptr = serviceptr->next ) { @@ -1163,11 +1159,9 @@ void HuntBadSession(void) break; } } - - } -const char *WorkerLogStr = "W"; + /* * This loop just keeps going and going and going... */ @@ -1190,9 +1184,7 @@ void *worker_thread(void *blah) { while (!server_shutting_down) { - /* make doubly sure we're not holding any stale db handles - * which might cause a deadlock. - */ + /* make doubly sure we're not holding any stale db handles * which might cause a deadlock */ cdb_check_handles(); do_select: force_purge = 0; bind_me = NULL; /* Which session shall we handle? */ @@ -1284,7 +1276,7 @@ do_select: force_purge = 0; } } - /* Next, check to see if it's a new client connecting * on a master socket. */ + /* Next, check to see if it's a new client connecting on a master socket. */ else if ((retval > 0) && (!server_shutting_down)) for (serviceptr = ServiceHookTable; serviceptr != NULL; serviceptr = serviceptr->next) { @@ -1386,14 +1378,12 @@ SKIP_SELECT: CC->input_waiting = 0; } - /* If there are asynchronous messages waiting and the - * client supports it, do those now */ - if ((CC->is_async) && (CC->async_waiting) - && (CC->h_async_function != NULL)) { + /* If there are asynchronous messages waiting and the client supports it, do those now */ + if ((CC->is_async) && (CC->async_waiting) && (CC->h_async_function != NULL)) { CC->h_async_function(); CC->async_waiting = 0; } - + force_purge = CC->kill_me; become_session(NULL); bind_me->state = CON_IDLE; @@ -1422,7 +1412,6 @@ SKIP_SELECT: } - /* * SyslogFacility() * Translate text facility name to syslog.h defined value. -- 2.30.2