jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make program_name constant, don't duplicate or free it

Browse Source
This commit is contained in:
Pavel Roskin 2016-06-21 16:30:17 -07:00
parent b00ca6e03d
commit 951e632757
4 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/log.c
View File

@ -212,12 +212,6 @@ internal_log_end(struct log_config *l_cfg)
l_cfg->log_file = 0;
}
if (0 != l_cfg->program_name)
{
g_free(l_cfg->program_name);
l_cfg->program_name = 0;
}
ret = LOG_STARTUP_OK;
return ret;
}
@ -336,7 +330,7 @@ internal_config_read_logging(int file, struct log_config *lc,
list_clear(param_n);
/* setting defaults */
lc->program_name = g_strdup(applicationName);
lc->program_name = applicationName;
lc->log_file = 0;
lc->fd = 0;
lc->log_level = LOG_LEVEL_DEBUG;
@ -455,7 +449,7 @@ log_start_from_param(const struct log_config *iniParams)
g_staticLogConfig->log_level = iniParams->log_level;
g_staticLogConfig->log_lock = iniParams->log_lock;
g_staticLogConfig->log_lock_attr = iniParams->log_lock_attr;
g_staticLogConfig->program_name = g_strdup(iniParams->program_name);
g_staticLogConfig->program_name = iniParams->program_name;
g_staticLogConfig->syslog_level = iniParams->syslog_level;
ret = internal_log_start(g_staticLogConfig);

2
common/log.h
View File

@ -65,7 +65,7 @@ enum logReturns
struct log_config
{
char *program_name;
const char *program_name;
char *log_file;
int fd;
unsigned int log_level;

2
sesman/tools/sesadmin.c
View File

@ -59,7 +59,7 @@ int main(int argc, char **argv)
serv[0] = '\0';
port[0] = '\0';
logging.program_name = g_strdup("sesadmin");
logging.program_name = "sesadmin";
logging.log_file = g_strdup("xrdp-sesadmin.log");
logging.log_level = LOG_LEVEL_DEBUG;
logging.enable_syslog = 0;

2
sesman/tools/sestest.c
View File

@ -45,7 +45,7 @@ int main(int argc, char **argv)
log.enable_syslog = 0;
log.log_level = 99;
log.program_name = g_strdup("sestest");
log.program_name = "sestest";
log.log_file = g_strdup("sestest.log");
log_start_from_param(&log);
scp_init();