Mailing List Archive

Author: jm
Date: Wed May 25 22:06:32 2005
New Revision: 178583

URL: http://svn.apache.org/viewcvs?rev=178583&view=rev
Log:
more whitespace and code formatting 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=178583&r1=178582&r2=178583&view=diff
==============================================================================
--- spamassassin/trunk/spamc/spamc.c (original)
+++ spamassassin/trunk/spamc/spamc.c Wed May 25 22:06:32 2005
@@ -233,11 +233,13 @@
* store the remaining arguments.
*/
exec_argv = malloc(sizeof(*exec_argv) * (argc - optind + 2));
- if (exec_argv == NULL)
+ if (exec_argv == NULL) {
return EX_OSERR;
+ }

- for (i = 0, j = optind - 1; j < argc; i++, j++)
+ for (i = 0, j = optind - 1; j < argc; i++, j++) {
exec_argv[i] = argv[j];
+ }
exec_argv[i] = NULL;

return EX_OK;
@@ -324,7 +326,7 @@
if (strcmp(optarg,"report") == 0) {
*extratype = 0;
}
- else if (strcmp(optarg,"revoke") == 0) {
+ else if (strcmp(optarg,"revoke") == 0) {
*extratype = 1;
}
else {
@@ -433,8 +435,9 @@

count++; // increment the line counter

- if(option[0] == '#' || option[0] == '\n')
+ if(option[0] == '#' || option[0] == '\n') {
continue;
+ }

tok = option;
while((tok = strtok(tok, " ")) != NULL) {
@@ -637,18 +640,22 @@
}
}

- if((combine_args(config_file, argc, argv, &combo_argc, combo_argv)) == EX_OK) {
+ 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) {
+ &extratype, &trans)) != EX_OK)
+ {
if (ret == EX_TEMPFAIL)
ret = EX_OK;
goto finish;
}
- } else {
+ }
+ else {
/* parse only command line arguments (default behaviour) */
if((ret = read_args(argc, argv, &max_size, &username,
- &extratype, &trans)) != EX_OK) {
+ &extratype, &trans)) != EX_OK)
+ {
if(ret == EX_TEMPFAIL)
ret = EX_OK;
goto finish;