mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-07-18 12:39:13 +00:00
indent
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8688 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
263b226665
commit
9bbcabbbdd
16
src/switch.c
16
src/switch.c
@ -213,10 +213,10 @@ int main(int argc, char *argv[])
|
|||||||
char *usageDesc;
|
char *usageDesc;
|
||||||
int alt_dirs = 0;
|
int alt_dirs = 0;
|
||||||
int known_opt;
|
int known_opt;
|
||||||
int high_prio = 0;
|
int high_prio = 0;
|
||||||
switch_core_flag_t flags = SCF_USE_SQL;
|
switch_core_flag_t flags = SCF_USE_SQL;
|
||||||
int ret;
|
int ret;
|
||||||
switch_file_t *fd;
|
switch_file_t *fd;
|
||||||
switch_memory_pool_t *pool = NULL;
|
switch_memory_pool_t *pool = NULL;
|
||||||
|
|
||||||
usageDesc = "these are the optional arguments you can pass to freeswitch\n"
|
usageDesc = "these are the optional arguments you can pass to freeswitch\n"
|
||||||
@ -526,12 +526,12 @@ int main(int argc, char *argv[])
|
|||||||
|
|
||||||
apr_pool_create(&pool, NULL);
|
apr_pool_create(&pool, NULL);
|
||||||
if (switch_file_open(&fd,
|
if (switch_file_open(&fd,
|
||||||
pid_path,
|
pid_path,
|
||||||
SWITCH_FOPEN_WRITE | SWITCH_FOPEN_CREATE,
|
SWITCH_FOPEN_WRITE | SWITCH_FOPEN_CREATE,
|
||||||
SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE,
|
SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE,
|
||||||
pool) != SWITCH_STATUS_SUCCESS) {
|
pool) != SWITCH_STATUS_SUCCESS) {
|
||||||
fprintf(stderr, "Cannot open pid file %s.\n", pid_path);
|
fprintf(stderr, "Cannot open pid file %s.\n", pid_path);
|
||||||
return 255;
|
return 255;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (switch_file_lock(fd, SWITCH_FLOCK_EXCLUSIVE | SWITCH_FLOCK_NONBLOCK) != SWITCH_STATUS_SUCCESS) {
|
if (switch_file_lock(fd, SWITCH_FLOCK_EXCLUSIVE | SWITCH_FLOCK_NONBLOCK) != SWITCH_STATUS_SUCCESS) {
|
||||||
|
@ -56,7 +56,7 @@ static switch_status_t switch_core_db_persistant_execute_trans(switch_core_db_t
|
|||||||
retries = 1000;
|
retries = 1000;
|
||||||
}
|
}
|
||||||
|
|
||||||
again:
|
again:
|
||||||
|
|
||||||
while (begin_retries > 0) {
|
while (begin_retries > 0) {
|
||||||
again = 0;
|
again = 0;
|
||||||
@ -107,7 +107,7 @@ static switch_status_t switch_core_db_persistant_execute_trans(switch_core_db_t
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
done:
|
done:
|
||||||
|
|
||||||
switch_core_db_exec(db, "end transaction", NULL, NULL, NULL);
|
switch_core_db_exec(db, "end transaction", NULL, NULL, NULL);
|
||||||
|
|
||||||
|
@ -250,8 +250,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_menu_stack_free(switch_ivr_menu_t * s
|
|||||||
if (stack != NULL && stack->pool != NULL) {
|
if (stack != NULL && stack->pool != NULL) {
|
||||||
if (switch_test_flag(stack, SWITCH_IVR_MENU_FLAG_STACK)
|
if (switch_test_flag(stack, SWITCH_IVR_MENU_FLAG_STACK)
|
||||||
&& switch_test_flag(stack, SWITCH_IVR_MENU_FLAG_FREEPOOL)) {
|
&& switch_test_flag(stack, SWITCH_IVR_MENU_FLAG_FREEPOOL)) {
|
||||||
switch_memory_pool_t *pool = stack->pool;
|
switch_memory_pool_t *pool = stack->pool;
|
||||||
status = switch_core_destroy_memory_pool(&pool);
|
status = switch_core_destroy_memory_pool(&pool);
|
||||||
} else {
|
} else {
|
||||||
status = SWITCH_STATUS_SUCCESS;
|
status = SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user