Browse Source

- fixed some of the warnings
- fixed typo in db_ops/db_ops.c
- eval module excluded from the compiled-by-default-list (bec. it doesn't
compile yet)

Andrei Pelinescu-Onciul 19 năm trước cách đây
mục cha
commit
7d95baf3c9
3 tập tin đã thay đổi với 8 bổ sung5 xóa
  1. 5 3
      Makefile
  2. 2 2
      io_wait.h
  3. 1 0
      modules/tm/dlg.c

+ 5 - 3
Makefile

@@ -48,14 +48,16 @@ skip_cfg_install?=
 skip_modules?=
 skip_modules?=
 
 
 # if not set on the cmd. line or the env, exclude this modules:
 # if not set on the cmd. line or the env, exclude this modules:
-exclude_modules?= 			acc cpl ext extcmd radius_acc radius_auth vm group mangler auth_diameter \
+exclude_modules?= 			acc cpl ext extcmd radius_acc radius_auth vm\
+							group mangler auth_diameter \
 							postgres snmp \
 							postgres snmp \
 							im \
 							im \
 							jabber mysql \
 							jabber mysql \
 							cpl-c \
 							cpl-c \
 							auth_radius group_radius uri_radius avp_radius \
 							auth_radius group_radius uri_radius avp_radius \
-							acc_radius dialog pa rls presence_b2b xcap xmlrpc osp tls \
-							unixsock
+							acc_radius dialog pa rls presence_b2b xcap xmlrpc\
+							osp tls \
+							unixsock eval
 # always exclude the CVS dir
 # always exclude the CVS dir
 override exclude_modules+= CVS $(skip_modules)
 override exclude_modules+= CVS $(skip_modules)
 
 

+ 2 - 2
io_wait.h

@@ -835,8 +835,8 @@ again:
 		 *  On newer kernels this is fixed (si_band is long in the kernel too).
 		 *  On newer kernels this is fixed (si_band is long in the kernel too).
 		 * -- andrei */
 		 * -- andrei */
 		if  ((_os_ver<0x020605) && (sizeof(siginfo.si_band)>sizeof(int))){
 		if  ((_os_ver<0x020605) && (sizeof(siginfo.si_band)>sizeof(int))){
-			sigio_band=*((int*)&siginfo.si_band);
-			sigio_fd=*(((int*)&siginfo.si_band)+1);
+			sigio_band=*((int*)(void*)&siginfo.si_band);
+			sigio_fd=*(((int*)(void*)&siginfo.si_band)+1);
 		}else
 		}else
 #endif
 #endif
 		{
 		{

+ 1 - 0
modules/tm/dlg.c

@@ -236,6 +236,7 @@ static inline int get_contact_uri(struct sip_msg* _m, str* _uri)
 	contact_t* c;
 	contact_t* c;
 
 
 	_uri->len = 0;
 	_uri->len = 0;
+	_uri->s = 0;
 
 
 	if (!_m->contact) return 1;
 	if (!_m->contact) return 1;