소스 검색

- fixed some icc warnings
- bumped ver. no

Andrei Pelinescu-Onciul 23 년 전
부모
커밋
a9a8cb6e0e
4개의 변경된 파일9개의 추가작업 그리고 9개의 파일을 삭제
  1. 1 1
      Makefile
  2. 1 1
      Makefile.defs
  3. 5 5
      msg_translator.c
  4. 2 2
      resolve.c

+ 1 - 1
Makefile

@@ -10,7 +10,7 @@ auto_gen=lex.yy.c cfg.tab.c   #lexx, yacc etc
 #include  source related defs
 include Makefile.sources
 
-exclude_modules=CVS mysql pike radius_acc radius_auth snmp
+exclude_modules=CVS cpl cpl-c ext radius_acc radius_auth snmp
 static_modules=
 static_modules_path=$(addprefix modules/, $(static_modules))
 extra_sources=$(wildcard $(addsuffix /*.c, $(static_modules_path)))

+ 1 - 1
Makefile.defs

@@ -8,7 +8,7 @@
 VERSION = 0
 PATCHLEVEL = 8
 SUBLEVEL = 7
-EXTRAVERSION = -13-2
+EXTRAVERSION = -14-gpl
 
 RELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 OS = $(shell uname -s)

+ 5 - 5
msg_translator.c

@@ -165,7 +165,7 @@ char * warning_builder( struct sip_msg *msg, unsigned int *returned_len)
 
 
 
-char* received_builder(struct sip_msg *msg, int *received_len)
+char* received_builder(struct sip_msg *msg, unsigned int *received_len)
 {
 	char *buf;
 	int  len;
@@ -281,9 +281,9 @@ static inline int lumps_len(struct lump* l)
 /* another helper functions, adds/Removes the lump,
 	code moved form build_req_from_req  */
 
-static /*inline*/ void process_lumps(	struct lump* l,	char* new_buf, 
-									int* new_buf_offs, char* orig,
-									int* orig_offs)
+static inline void process_lumps(	struct lump* l,	char* new_buf, 
+									unsigned int* new_buf_offs, char* orig,
+									unsigned int* orig_offs)
 {
 	struct lump *t;
 	struct lump *r;
@@ -586,7 +586,7 @@ char * build_res_buf_from_sip_req( unsigned int code, char *text,
 	int               i;
 	char              backup;
 	char              *received_buf;
-	int               received_len;
+	unsigned int               received_len;
 	char              *warning;
 	unsigned int      warning_len;
 	int r;

+ 2 - 2
resolve.c

@@ -399,9 +399,9 @@ struct hostent* sip_resolvehost(char* name, unsigned short* port)
 						" unable to perform SRV lookup\n", len);
 		}else{
 			/* check if it's an ip address */
-			if ( ((ip=str2ip(name, len))!=0)
+			if ( ((ip=str2ip((unsigned char*)name, len))!=0)
 #ifdef	USE_IPV6
-				  || ((ip=str2ip6(name, len))!=0)
+				  || ((ip=str2ip6((unsigned char*)name, len))!=0)
 #endif
 				){
 				/* we are lucky, this is an ip address */