DeforaNetworks/fwknop
DeforaNetworks/fwknop
3
0
Fork 0
Code Releases Activity

minor whitespace fixes

Browse Source
This commit is contained in:
Michael Rash 2011-10-13 22:02:21 -04:00
parent 9962dc0808
commit e36c833f55
1 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
server/fwknopd.c
View File

@ -63,7 +63,8 @@ main(int argc, char **argv)
*/ */
config_init(&opts, argc, argv); config_init(&opts, argc, argv);
/* Process any options that do their thing and exit. */ /* Process any options that do their thing and exit.
*/
/* Kill the currently running fwknopd? /* Kill the currently running fwknopd?
*/ */
@ -137,30 +138,30 @@ main(int argc, char **argv)
*/ */
init_logging(&opts); init_logging(&opts);
#if HAVE_LOCALE_H #if HAVE_LOCALE_H
/* Set the locale if specified. /* Set the locale if specified.
*/ */
if(opts.config[CONF_LOCALE] != NULL if(opts.config[CONF_LOCALE] != NULL
&& strncasecmp(opts.config[CONF_LOCALE], "NONE", 4) != 0) && strncasecmp(opts.config[CONF_LOCALE], "NONE", 4) != 0)
{ {
locale = setlocale(LC_ALL, opts.config[CONF_LOCALE]); locale = setlocale(LC_ALL, opts.config[CONF_LOCALE]);
if(locale == NULL) if(locale == NULL)
{ {
log_msg(LOG_ERR, log_msg(LOG_ERR,
"WARNING: Unable to set locale to '%s'.", "WARNING: Unable to set locale to '%s'.",
opts.config[CONF_LOCALE] opts.config[CONF_LOCALE]
); );
} }
else else
{ {
if(opts.verbose) if(opts.verbose)
log_msg(LOG_INFO, log_msg(LOG_INFO,
"Locale set to '%s'.", opts.config[CONF_LOCALE] "Locale set to '%s'.", opts.config[CONF_LOCALE]
); );
} }
} }
#endif #endif
/* Make sure we have a valid run dir and path leading to digest file /* Make sure we have a valid run dir and path leading to digest file
* in case it configured to be somewhere other than the run dir. * in case it configured to be somewhere other than the run dir.
@ -386,7 +387,7 @@ check_dir_path(const char *filepath, const char *fp_desc, unsigned char use_base
char tmp_path[MAX_PATH_LEN]; char tmp_path[MAX_PATH_LEN];
char *ndx; char *ndx;
/* /*
* FIXME: We shouldn't use a hard-coded dir-separator here. * FIXME: We shouldn't use a hard-coded dir-separator here.
*/ */
/* But first make sure we are using an absolute path. /* But first make sure we are using an absolute path.
@ -561,7 +562,7 @@ daemonize_process(fko_srv_options_t *opts)
fprintf(stderr, "* PID file error. The lock may not be effective.\n"); fprintf(stderr, "* PID file error. The lock may not be effective.\n");
} }
/* Chdir to the root of the filesystem /* Chdir to the root of the filesystem
*/ */
if ((chdir("/")) < 0) { if ((chdir("/")) < 0) {
perror("Could not chdir() to /: "); perror("Could not chdir() to /: ");
@ -622,7 +623,7 @@ write_pid_file(fko_srv_options_t *opts)
old_pid = get_running_pid(opts); old_pid = get_running_pid(opts);
if(old_pid) if(old_pid)
return old_pid; return old_pid;
/* Otherwise, consider it an error. /* Otherwise, consider it an error.
*/ */
perror("Unable read existing PID file: "); perror("Unable read existing PID file: ");