Przeglądaj źródła

- unnecesarry parameter removed from *_duplicate_rr (thanks to Daniel)

Jan Janak 22 lat temu
rodzic
commit
22c83b9200
3 zmienionych plików z 9 dodań i 9 usunięć
  1. 1 1
      modules/tm/dlg.c
  2. 6 6
      parser/parse_rr.c
  3. 2 2
      parser/parse_rr.h

+ 1 - 1
modules/tm/dlg.c

@@ -321,7 +321,7 @@ static inline int get_route_set(struct sip_msg* _m, rr_t** _rs, unsigned char _o
 
 			p = (rr_t*)ptr->parsed;
 			while(p) {
-				if (shm_duplicate_rr(_m, &t, p) < 0) {
+				if (shm_duplicate_rr(&t, p) < 0) {
 					LOG(L_ERR, "get_route_set(): Error while duplicating rr_t\n");
 					goto error;
 				}

+ 6 - 6
parser/parse_rr.c

@@ -223,12 +223,12 @@ static inline void xlate_pointers(rr_t* _orig, rr_t* _r)
 /*
  * Duplicate a single rr_t structure using pkg_malloc or shm_malloc
  */
-static inline int do_duplicate_rr(struct sip_msg* _m, rr_t** _new, rr_t* _r, int _shm)
+static inline int do_duplicate_rr(rr_t** _new, rr_t* _r, int _shm)
 {
 	int len, ret;
 	rr_t* res;
 
-	if (!_m || !_new || !_r) {
+	if (!_new || !_r) {
 		LOG(L_ERR, "duplicate_rr(): Invalid parameter value\n");
 		return -1;
 	}
@@ -272,16 +272,16 @@ static inline int do_duplicate_rr(struct sip_msg* _m, rr_t** _new, rr_t* _r, int
 /*
  * Duplicate a single rr_t structure using pkg_malloc
  */
-int duplicate_rr(struct sip_msg* _m, rr_t** _new, rr_t* _r)
+int duplicate_rr(rr_t** _new, rr_t* _r)
 {
-	return do_duplicate_rr(_m, _new, _r, 0);
+	return do_duplicate_rr(_new, _r, 0);
 }
 
 
 /*
  * Duplicate a single rr_t structure using pkg_malloc
  */
-int shm_duplicate_rr(struct sip_msg* _m, rr_t** _new, rr_t* _r)
+int shm_duplicate_rr(rr_t** _new, rr_t* _r)
 {
-	return do_duplicate_rr(_m, _new, _r, 1);
+	return do_duplicate_rr(_new, _r, 1);
 }

+ 2 - 2
parser/parse_rr.h

@@ -79,13 +79,13 @@ void print_rr(FILE* _o, rr_t* _r);
 /*
  * Duplicate a single rr_t structure using pkg_malloc
  */
-int duplicate_rr(struct sip_msg* _m, rr_t** _new, rr_t* _r);
+int duplicate_rr(rr_t** _new, rr_t* _r);
 
 
 /*
  * Duplicate a single rr_t structure using pkg_malloc
  */
-int shm_duplicate_rr(struct sip_msg* _m, rr_t** _new, rr_t* _r);
+int shm_duplicate_rr(rr_t** _new, rr_t* _r);
 
 
 #endif /* PARSE_RR_H */