Skip to content

Commit

Permalink
secfilter: clang-format for coherent indentation and coding style
Browse files Browse the repository at this point in the history
  • Loading branch information
linuxmaniac committed May 18, 2023
1 parent ba2cbf2 commit 82100e1
Show file tree
Hide file tree
Showing 3 changed files with 86 additions and 105 deletions.
35 changes: 18 additions & 17 deletions src/modules/secfilter/secfilter.c
Expand Up @@ -394,7 +394,7 @@ static int w_check_ua(struct sip_msg *msg)
list = list->next;
ua.len = len;
}

return 1;
}

Expand Down Expand Up @@ -458,8 +458,8 @@ static int check_user(struct sip_msg *msg, int type)
if(res != 0) {
return res;
}
if (user.s == NULL || domain.s == NULL) {

if(user.s == NULL || domain.s == NULL) {
return -1;
}

Expand All @@ -472,7 +472,7 @@ static int check_user(struct sip_msg *msg, int type)
while(list) {
if(name.len > list->s.len)
name.len = list->s.len;
if (name.s != NULL) {
if(name.s != NULL) {
res = cmpi_str(&list->s, &name);
if(res == 0) {
lock_get(secf_lock);
Expand Down Expand Up @@ -519,7 +519,7 @@ static int check_user(struct sip_msg *msg, int type)
while(list) {
if(name.len > list->s.len)
name.len = list->s.len;
if (name.s != NULL) {
if(name.s != NULL) {
res = cmpi_str(&list->s, &name);
if(res == 0) {
lock_get(secf_lock);
Expand Down Expand Up @@ -766,16 +766,15 @@ int secf_init_data(void)
}

secf_stats = shm_malloc(total_data * sizeof(int));
if(!secf_stats)
{
if(!secf_stats) {
SHM_MEM_ERROR;
shm_free(secf_data_1);
shm_free(secf_data_2);
shm_free(secf_data);
return -1;
}
memset(secf_stats, 0, total_data * sizeof(int));

if(secf_dst_exact_match != 0)
secf_dst_exact_match = 1;

Expand Down Expand Up @@ -816,13 +815,13 @@ static int mod_init(void)
LM_CRIT("cannot initialize lock.\n");
return -1;
}

secf_lock = lock_alloc();
if (!secf_lock) {
if(!secf_lock) {
LM_CRIT("cannot allocate memory for lock.\n");
return -1;
}
if (lock_init(secf_lock) == 0) {
if(lock_init(secf_lock) == 0) {
LM_CRIT("cannot initialize lock.\n");
return -1;
}
Expand Down Expand Up @@ -856,19 +855,21 @@ static void mod_destroy(void)
if(!secf_data)
return;

if(secf_rpc_reload_time!=NULL) {
if(secf_rpc_reload_time != NULL) {
shm_free(secf_rpc_reload_time);
secf_rpc_reload_time = 0;
}
/* Free shared data */
if (secf_data_1) secf_free_data(secf_data_1);
if (secf_data_2) secf_free_data(secf_data_2);
if(secf_data_1)
secf_free_data(secf_data_1);
if(secf_data_2)
secf_free_data(secf_data_2);
/* Destroy lock */
lock_destroy(&(*secf_data)->lock);
shm_free(secf_data);
secf_data = NULL;

if (secf_lock) {
if(secf_lock) {
lock_destroy(secf_lock);
lock_dealloc((void *)secf_lock);
secf_lock = NULL;
Expand Down Expand Up @@ -928,10 +929,10 @@ void secf_ht_timer(unsigned int ticks, void *param)

if(*secf_rpc_reload_time != 0
&& *secf_rpc_reload_time > time(NULL) - secf_reload_interval)
return;
return;

LM_DBG("cleaning old data list\n");
if (*secf_data == secf_data_1) {
if(*secf_data == secf_data_1) {
secf_free_data(secf_data_2);
} else {
secf_free_data(secf_data_1);
Expand Down
6 changes: 4 additions & 2 deletions src/modules/secfilter/secfilter_db.c
Expand Up @@ -42,7 +42,9 @@ static int check_version(void)
return -1;
}

if (db_check_table_version(&db_funcs, db_handle, &secf_table_name, mod_version) < 0) {
if(db_check_table_version(
&db_funcs, db_handle, &secf_table_name, mod_version)
< 0) {
DB_TABLE_VERSION_ERROR(secf_table_name);
db_funcs.close(db_handle);
return -1;
Expand Down Expand Up @@ -197,7 +199,7 @@ int secf_load_db(void)
}

/* Choose new hash table and free its old contents */
if (*secf_data == secf_data_1) {
if(*secf_data == secf_data_1) {
*secf_data = secf_data_2;
} else {
*secf_data = secf_data_1;
Expand Down

0 comments on commit 82100e1

Please sign in to comment.