Browse code

merger errors fixed

Jiri Kuthan authored on 08/10/2003 20:23:18
Showing 1 changed files
... ...
@@ -1564,7 +1564,6 @@ char * build_res_buf_from_sip_req( unsigned int code, char *text ,str *new_tag,
1564 1564
 	struct lump_rpl   *lump;
1565 1565
 	struct lump_rpl   *body;
1566 1566
 	int               i;
1567
-	char              backup;
1568 1567
 	str               received = {0,0};
1569 1568
 	str               rport = {0,0};
1570 1569
 	str               warning = {0,0};
... ...
@@ -1594,7 +1593,7 @@ char * build_res_buf_from_sip_req( unsigned int code, char *text ,str *new_tag,
1594 1593
 
1595 1594
 	/* check if received needs to be added */
1596 1595
 	if (received_test(msg)) {
1597
-		if ((received_buf=received_builder(msg,&received_len))==0) {
1596
+		if ((received.s=received_builder(msg,&received.len))==0) {
1598 1597
 			LOG(L_ERR, "ERROR: build_res_buf_from_sip_req: "
1599 1598
 				"alas, received_builder failed\n");
1600 1599
 			goto error00;