ben.carrasco/freeswitch
1
0 Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-11-10 11:50:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

run indent on the whole tree and update copyright dates in prep for 1.0.5

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16579 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale committed 2010-02-06 03:38:24 +00:00
1 parent 7b347417e5
commit 886e1ddb4d
229 files changed
+20252 -20192
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/mod/loggers/mod_console/mod_console.c
+17 -18
View File
@@ -1,6 +1,6 @@
/*
* FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
* Copyright (C) 2005-2009, Anthony Minessale II <anthm@freeswitch.org>
* Copyright (C) 2005-2010, Anthony Minessale II <anthm@freeswitch.org>
*
* Version: MPL 1.1
*
@@ -43,11 +43,17 @@ static HANDLE hStdout;
static WORD wOldColorAttrs;
static CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
static WORD
static WORD
#else
static const char*
static const char *
#endif
COLORS[] = { SWITCH_SEQ_DEFAULT_COLOR, SWITCH_SEQ_FRED, SWITCH_SEQ_FRED, SWITCH_SEQ_FRED, SWITCH_SEQ_FMAGEN, SWITCH_SEQ_FCYAN, SWITCH_SEQ_FGREEN, SWITCH_SEQ_FYELLOW };
COLORS[] =
{ SWITCH_SEQ_DEFAULT_COLOR, SWITCH_SEQ_FRED, SWITCH_SEQ_FRED, SWITCH_SEQ_FRED, SWITCH_SEQ_FMAGEN, SWITCH_SEQ_FCYAN, SWITCH_SEQ_FGREEN,
SWITCH_SEQ_FYELLOW };
static switch_memory_pool_t *module_pool = NULL;
@@ -261,8 +267,7 @@ SWITCH_STANDARD_API(console_api_function)
"--------------------------------------------------------------------------------\n"
"console help\n"
"console loglevel [[0-7] | <loglevel_string>]\n"
"console colorize [on|off|toggle]\n"
"--------------------------------------------------------------------------------\n";
"console colorize [on|off|toggle]\n" "--------------------------------------------------------------------------------\n";
const char *loglevel_usage_string = "USAGE:\n"
"--------------------------------------------------------------------------------\n"
"console loglevel [[0-7] | <loglevel_string>]\n"
@@ -274,17 +279,11 @@ SWITCH_STANDARD_API(console_api_function)
" 1 alert\n"
" 2 crit\n"
" 3 err\n"
" 4 warning\n"
" 5 notice\n"
" 6 info\n"
" 7 debug\n"
"--------------------------------------------------------------------------------\n";
" 4 warning\n" " 5 notice\n" " 6 info\n" " 7 debug\n" "--------------------------------------------------------------------------------\n";
const char *colorize_usage_string = "USAGE:\n"
"--------------------------------------------------------------------------------\n"
"console colorize [on|off|toggle]\n"
"\n"
"Enable, disable, or toggle console coloring.\n"
"--------------------------------------------------------------------------------\n";
"\n" "Enable, disable, or toggle console coloring.\n" "--------------------------------------------------------------------------------\n";
if (session)
return SWITCH_STATUS_FALSE;
@@ -315,10 +314,10 @@ SWITCH_STANDARD_API(console_api_function)
level = atoi(argv[1]);
} else {
level = switch_log_str2level(argv[1]);
}
}
}
if (level == SWITCH_LOG_INVALID) {
stream->write_function(stream, "-ERR Invalid console loglevel (%s)!\n\n", argc>1? argv[1] : "");
stream->write_function(stream, "-ERR Invalid console loglevel (%s)!\n\n", argc > 1 ? argv[1] : "");
} else {
hard_log_level = level;
stream->write_function(stream, "+OK console log level set to %s\n", switch_log_level2str(hard_log_level));
@@ -337,11 +336,11 @@ SWITCH_STANDARD_API(console_api_function)
}
stream->write_function(stream, "+OK console color %s\n", COLORIZE ? "enabled" : "disabled");
} else { /* if (!strcasecmp(argv[0], "help")) { */
} else { /* if (!strcasecmp(argv[0], "help")) { */
stream->write_function(stream, "%s", usage_string);
}
done:
done:
switch_safe_free(mycmd);
return status;
}
src/mod/loggers/mod_logfile/mod_logfile.c
+4 -4
View File
@@ -154,11 +154,11 @@ static switch_status_t mod_logfile_rotate(logfile_profile_t *profile)
}
break;
}
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "New log started.\n");
end:
if (pool) {
switch_core_destroy_memory_pool(&pool);
}
@@ -231,7 +231,7 @@ static switch_status_t process_node(const switch_log_node_t *node, switch_log_le
if (ok) {
if (profile->log_uuid && !zstr(node->userdata)) {
char buf[2048];
switch_snprintf(buf, sizeof(buf), "%s %s", node->userdata, node->data);
switch_snprintf(buf, sizeof(buf), "%s %s", node->userdata, node->data);
mod_logfile_raw_write(profile, buf);
} else {
mod_logfile_raw_write(profile, node->data);
@@ -387,7 +387,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_logfile_shutdown)
{
switch_hash_index_t *hi;
const void *var;
void *val;
void *val;
switch_log_unbind_logger(mod_logfile_logger);
switch_event_unbind(&globals.node);
src/mod/loggers/mod_syslog/mod_syslog.c
+31 -31
View File
@@ -1,6 +1,6 @@
/*
* FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
* Copyright (C) 2005-2009, James Martelletti <james@nerdc0re.com>
* Copyright (C) 2005-2010, James Martelletti <james@nerdc0re.com>
*
* Version: MPL 1.1
*
@@ -49,13 +49,13 @@ static switch_log_level_t log_level;
static struct {
char *ident;
char *format;
int facility;
int facility;
switch_bool_t log_uuid;
} globals;
struct _facility_table_entry {
char *description;
int facility;
int facility;
};
SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_ident, globals.ident);
@@ -64,33 +64,33 @@ SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_format, globals.format);
switch_status_t set_global_facility(const char *facility)
{
const struct _facility_table_entry facilities[] = {
{ "auth", LOG_AUTH },
#if !defined (__SVR4) && !defined (__sun)
{ "authpriv", LOG_AUTHPRIV },
{ "ftp", LOG_FTP },
{"auth", LOG_AUTH},
#if !defined (__SVR4) && !defined (__sun)
{"authpriv", LOG_AUTHPRIV},
{"ftp", LOG_FTP},
#endif
{ "cron", LOG_CRON },
{ "daemon", LOG_DAEMON },
{ "kern", LOG_KERN },
{ "local0", LOG_LOCAL0 },
{ "local1", LOG_LOCAL1 },
{ "local2", LOG_LOCAL2 },
{ "local3", LOG_LOCAL3 },
{ "local4", LOG_LOCAL4 },
{ "local5", LOG_LOCAL5 },
{ "local6", LOG_LOCAL6 },
{ "local7", LOG_LOCAL7 },
{ "lpr", LOG_LPR },
{ "mail", LOG_MAIL },
{ "news", LOG_NEWS },
{ "syslog", LOG_SYSLOG },
{ "user", LOG_USER },
{ "uucp", LOG_UUCP },
{ NULL, 0 }
{"cron", LOG_CRON},
{"daemon", LOG_DAEMON},
{"kern", LOG_KERN},
{"local0", LOG_LOCAL0},
{"local1", LOG_LOCAL1},
{"local2", LOG_LOCAL2},
{"local3", LOG_LOCAL3},
{"local4", LOG_LOCAL4},
{"local5", LOG_LOCAL5},
{"local6", LOG_LOCAL6},
{"local7", LOG_LOCAL7},
{"lpr", LOG_LPR},
{"mail", LOG_MAIL},
{"news", LOG_NEWS},
{"syslog", LOG_SYSLOG},
{"user", LOG_USER},
{"uucp", LOG_UUCP},
{NULL, 0}
};
const struct _facility_table_entry *entry = facilities;
while(!zstr(entry->description)) {
while (!zstr(entry->description)) {
if (!strcasecmp(entry->description, facility)) {
globals.facility = entry->facility;
return SWITCH_STATUS_SUCCESS;
@@ -148,7 +148,7 @@ static switch_status_t mod_syslog_logger(const switch_log_node_t *node, switch_l
/* don't log blank lines */
if (!zstr(node->data) && (strspn(node->data, " \t\r\n") < strlen(node->data))) {
if (globals.log_uuid && !zstr(node->userdata)) {
syslog(syslog_level, "%s %s", node->userdata, node->data);
syslog(syslog_level, "%s %s", node->userdata, node->data);
} else {
syslog(syslog_level, "%s", node->data);
}
@@ -161,9 +161,9 @@ static switch_status_t load_config(void)
{
char *cf = "syslog.conf";
switch_xml_t cfg, xml, settings, param;
/* default log level */
log_level = SWITCH_LOG_WARNING;
/* default log level */
log_level = SWITCH_LOG_WARNING;
/* default facility */
globals.facility = DEFAULT_FACILITY;
@@ -208,7 +208,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_syslog_load)
{
switch_status_t status;
*module_interface = &console_module_interface;
memset(&globals, 0, sizeof(globals));
if ((status = load_config()) != SWITCH_STATUS_SUCCESS) {