You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2005/05/26 07:04:34 UTC
svn commit: r178582 - /spamassassin/trunk/spamc/spamc.c
Author: jm
Date: Wed May 25 22:04:33 2005
New Revision: 178582
URL: http://svn.apache.org/viewcvs?rev=178582&view=rev
Log:
whitespace cleanup
Modified:
spamassassin/trunk/spamc/spamc.c
Modified: spamassassin/trunk/spamc/spamc.c
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/spamc/spamc.c?rev=178582&r1=178581&r2=178582&view=diff
==============================================================================
--- spamassassin/trunk/spamc/spamc.c (original)
+++ spamassassin/trunk/spamc/spamc.c Wed May 25 22:04:33 2005
@@ -122,7 +122,7 @@
static void
usg(char *str)
{
- printf("%s", str);
+ printf("%s", str);
}
void
@@ -621,45 +621,45 @@
signal(SIGPIPE, SIG_IGN);
#endif
- /* set some defaults */
- max_size = 250 * 1024;
- username = NULL;
-
- combo_argc = 1;
- combo_argv[0] = strdup(argv[0]);
- check_malloc(combo_argv[0]);
- // TODO: leaked. not a big deal since spamc exits quickly
-
- for(i=0; i<argc; i++) {
- if(strncmp(argv[i], "-F", 2) == 0) {
- config_file = argv[i+1];
- break;
+ /* set some defaults */
+ max_size = 250 * 1024;
+ username = NULL;
+
+ combo_argc = 1;
+ combo_argv[0] = strdup(argv[0]);
+ check_malloc(combo_argv[0]);
+ // TODO: leaked. not a big deal since spamc exits quickly
+
+ for(i=0; i<argc; i++) {
+ if(strncmp(argv[i], "-F", 2) == 0) {
+ config_file = argv[i+1];
+ break;
+ }
+ }
+
+ if((combine_args(config_file, argc, argv, &combo_argc, combo_argv)) == EX_OK) {
+ /* Parse the combined arguments of command line and config file */
+ if ((ret = read_args(combo_argc, combo_argv, &max_size, &username,
+ &extratype, &trans)) != EX_OK) {
+ if (ret == EX_TEMPFAIL)
+ ret = EX_OK;
+ goto finish;
}
- }
-
- if((combine_args(config_file, argc, argv, &combo_argc, combo_argv)) == EX_OK) {
- /* Parse the combined arguments of command line and config file */
- if ((ret = read_args(combo_argc, combo_argv, &max_size, &username,
- &extratype, &trans)) != EX_OK) {
- if (ret == EX_TEMPFAIL)
- ret = EX_OK;
- goto finish;
- }
- } else {
- /* parse only command line arguments (default behaviour) */
- if((ret = read_args(argc, argv, &max_size, &username,
- &extratype, &trans)) != EX_OK) {
- if(ret == EX_TEMPFAIL)
- ret = EX_OK;
- goto finish;
- }
- }
-
- ret = get_current_user(&username);
- if (ret != EX_OK)
- goto finish;
-
- if ((flags & SPAMC_RANDOMIZE_HOSTS) != 0) {
+ } else {
+ /* parse only command line arguments (default behaviour) */
+ if((ret = read_args(argc, argv, &max_size, &username,
+ &extratype, &trans)) != EX_OK) {
+ if(ret == EX_TEMPFAIL)
+ ret = EX_OK;
+ goto finish;
+ }
+ }
+
+ ret = get_current_user(&username);
+ if (ret != EX_OK)
+ goto finish;
+
+ if ((flags & SPAMC_RANDOMIZE_HOSTS) != 0) {
/* we don't need strong randomness; this is just so we pick
* a random host for loadbalancing.
*/