Skip to content

Commit

Permalink
Merge branch 'shimaore-misleading-indentation' into 2.2
Browse files Browse the repository at this point in the history 
(cherry picked from commit 29971c8)
  • Loading branch information
@razvancrainea
razvancrainea committed Nov 8, 2016
1 parent 85c3bc5 commit dd52b2f
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 27 deletions.
12 changes: 8 additions & 4 deletions modules/b2b_entities/b2b_entities.c
View file
Expand Up @@ -625,18 +625,22 @@ static inline int mi_print_b2be_dlg(struct mi_node *rpl, b2b_table htable, unsig
{
node1 = add_mi_node_child(node, MI_DUP_VALUE, "tm_tran", 7, NULL, 0);
if(node1 == NULL) goto error;
if(dlg->uac_tran)
if(dlg->uac_tran) {
attr = add_mi_attr(node1,MI_DUP_VALUE,"uac",3,NULL,0);
if(attr == NULL) goto error;
if(dlg->uas_tran)
}
if(dlg->uas_tran) {
attr = add_mi_attr(node1,MI_DUP_VALUE,"uas",3,NULL,0);
if(attr == NULL) goto error;
if(dlg->update_tran)
}
if(dlg->update_tran) {
attr = add_mi_attr(node1,MI_DUP_VALUE,"update",6,NULL,0);
if(attr == NULL) goto error;
if(dlg->cancel_tm_tran)
}
if(dlg->cancel_tm_tran) {
attr = add_mi_attr(node1,MI_DUP_VALUE,"cancel_tm",9,NULL,0);
if(attr == NULL) goto error;
}
}

if ( (leg=dlg->legs)!=NULL ) {
Expand Down
4 changes: 2 additions & 2 deletions modules/cachedb_sql/cachedb_sql.c
View file
Expand Up @@ -450,8 +450,8 @@ static int dbcache_fetch_counter(cachedb_con *con,str *attr,int *ret_val)
case DB_INT:
if (ret_val)
*ret_val = RES_ROWS(db_res)[0].values[0].val.int_val;
if (CACHEDBSQL_FUNC(con).free_result(CACHEDBSQL_CON(con), db_res) < 0)
LM_ERR("failed to freeing result of query\n");
if (CACHEDBSQL_FUNC(con).free_result(CACHEDBSQL_CON(con), db_res) < 0)
LM_ERR("failed to freeing result of query\n");
break;
default:
LM_ERR("unknown type of DB user column\n");
Expand Down
3 changes: 2 additions & 1 deletion modules/dialog/dlg_handlers.c
View file
Expand Up @@ -1659,13 +1659,14 @@ int fix_route_dialog(struct sip_msg *req,struct dlg_cell *dlg)
buf = req->buf;

if (req->route) {
for (it=req->route;it;it=it->sibling)
for (it=req->route;it;it=it->sibling) {
if (it->parsed && ((rr_t*)it->parsed)->deleted)
continue;
if ((lmp = del_lump(req,it->name.s - buf,it->len,HDR_ROUTE_T)) == 0) {
LM_ERR("del_lump failed \n");
return -1;
}
}
}

if ( leg->route_set.len !=0 && leg->route_set.s) {
Expand Down
2 changes: 1 addition & 1 deletion modules/presence/event_list.c
View file
Expand Up @@ -378,7 +378,7 @@ int search_event_params(event_t* ev, event_t* searched_ev)
found= 1;
break;
}
p= p->next;
p= p->next;
}
if(found== 0)
return -1;
Expand Down
2 changes: 1 addition & 1 deletion modules/rtpengine/rtpengine_funcs.c
View file
Expand Up @@ -294,7 +294,7 @@ ser_memmem(const void *b1, const void *b2, size_t len1, size_t len2)
if (memcmp(sp, pp, len2) == 0)
return sp;

sp++;
sp++;
}

return NULL;
Expand Down
2 changes: 1 addition & 1 deletion modules/rtpproxy/nhelpr_funcs.c
View file
Expand Up @@ -215,7 +215,7 @@ ser_memmem(const void *b1, const void *b2, size_t len1, size_t len2)
if (memcmp(sp, pp, len2) == 0)
return sp;

sp++;
sp++;
}

return NULL;
Expand Down
35 changes: 19 additions & 16 deletions modules/seas/encode_contact.c
View file
Expand Up @@ -144,10 +144,10 @@ int encode_contact(char *hdrstart,int hdrlen,contact_t *body,unsigned char *wher
return -1;
}else{
if((j=encode_uri2(hdrstart,hdrlen,body->uri,&puri,&where[i]))<0){
LM_ERR("failed to codify the URI\n");
return -1;
LM_ERR("failed to codify the URI\n");
return -1;
}else{
i+=j;
i+=j;
}
}
where[0]=flags;
Expand Down Expand Up @@ -250,8 +250,8 @@ int dump_contact_body_test(char *hdr,int hdrlen,unsigned char *payload,int payle
}
if(segregationLevel & (JUNIT|SEGREGATE|ONLY_URIS)){
for(i=0,offset=2+numcontacts;i<numcontacts;i++){
dump_contact_test(hdr,hdrlen,&payload[offset],payload[2+i],fd,segregationLevel,prefix);
offset+=payload[2+i];
dump_contact_test(hdr,hdrlen,&payload[offset],payload[2+i],fd,segregationLevel,prefix);
offset+=payload[2+i];
}
}
return 1;
Expand Down Expand Up @@ -289,24 +289,27 @@ int dump_contact_test(char *hdr,int hdrlen,unsigned char* payload,int paylen,int
n=write(fd,&hdr[payload[i]],payload[i+1]);
n=write(fd,"\n",1);
i+=2;
}else
} else {
n=write(fd,"(null)\n",7);
n=write(fd,prefix,strlen(prefix));
n=write(fd,"getQValue=(F)",13);
}
n=write(fd,prefix,strlen(prefix));
n=write(fd,"getQValue=(F)",13);
if(flags & HAS_Q_F){
n=write(fd,&hdr[payload[i]],payload[i+1]);
n=write(fd,"\n",1);
i+=2;
}else
} else {
n=write(fd,"(null)\n",7);
n=write(fd,prefix,strlen(prefix));
n=write(fd,"getExpires=(I)",14);
}
n=write(fd,prefix,strlen(prefix));
n=write(fd,"getExpires=(I)",14);
if(flags & HAS_EXPIRES_F){
n=write(fd,&hdr[payload[i]],payload[i+1]);
n=write(fd,"\n",1);
i+=2;
}else
} else {
n=write(fd,"(null)\n",7);
}
if(flags & HAS_RECEIVED_F){
i+=2;
}
Expand All @@ -316,12 +319,12 @@ int dump_contact_test(char *hdr,int hdrlen,unsigned char* payload,int paylen,int
n=write(fd,prefix,strlen(prefix));
n=write(fd,"getParameter=(SAVP)",19);
for(i+=payload[1];i<paylen-1;i+=2){
printf("%.*s=",payload[i+1]-payload[i]-1,&hdr[payload[i]]);
printf("%.*s;",(payload[i+2]-payload[i+1])==0?0:(payload[i+2]-payload[i+1]-1),&hdr[payload[i+1]]);
printf("%.*s=",payload[i+1]-payload[i]-1,&hdr[payload[i]]);
printf("%.*s;",(payload[i+2]-payload[i+1])==0?0:(payload[i+2]-payload[i+1]-1),&hdr[payload[i+1]]);
}
n=write(fd,"\n",1);
if (n < 0)
LM_ERR("error while writing the final eol\n");
if (n < 0)
LM_ERR("error while writing the final eol\n");
}
return 0;
}
2 changes: 1 addition & 1 deletion parser/sdp/sdp_helpr_funcs.c
View file
Expand Up @@ -91,7 +91,7 @@ static void * ser_memmem(const void *b1, const void *b2, size_t len1, size_t len
if (memcmp(sp, pp, len2) == 0)
return sp;

sp++;
sp++;
}

return NULL;
Expand Down

0 comments on commit dd52b2f

Please sign in to comment.