javanetsim-cvs

[Alexander B. <da...@us...>]

Update of /cvsroot/javanetsim/IceScan/icesockets
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv12476/icesockets

Modified Files:
	iceregex.h sock_name.h 
Log Message:
no message

Index: iceregex.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icesockets/iceregex.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** iceregex.h	16 Dec 2006 20:44:18 -0000	1.10
--- iceregex.h	17 Dec 2006 21:03:17 -0000	1.11
***************
*** 32,36 ****
        
        bool match(icestring const& s, std::vector<icestring> &v){
! 		  return false;
        }
  
--- 32,36 ----
        
        bool match(icestring const& s, std::vector<icestring> &v){
!           return false;
        }
  
***************
*** 89,97 ****
        
        ~IceRegex(){
!           delete ovector_;
        }
        
        void init_regex(){          
!           const char *error;
            int   error_offset;
            
--- 89,98 ----
        
        ~IceRegex(){
!           pcre_free(pcre_);
!           delete[] ovector_;
        }
        
        void init_regex(){          
!           const char *error = NULL;
            int   error_offset;
            
***************
*** 117,121 ****
--- 118,126 ----
              &capture_count_);         /* where to put the data */
       
+           if(rc<0) exit(-1);
+           
            ovector_ = new int[3*(capture_count_+1)];
+           
+           free((void *) error);
        }
        

Index: sock_name.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icesockets/sock_name.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** sock_name.h	17 Dec 2006 18:49:55 -0000	1.11
--- sock_name.h	17 Dec 2006 21:03:17 -0000	1.12
***************
*** 72,76 ****
      struct addrinfo hints, *res;
      char hname[1024];
-     char *rname;
      int cnt = 0;
      
--- 72,75 ----
***************
*** 88,93 ****
   	
      while(res){
!         rname = inet_ntoa( *( &( ((sockaddr_in *)res->ai_addr)->sin_addr ) ) );
!         icestring is(rname);
          
          v.push_back(is);
--- 87,91 ----
   	
      while(res){
!         icestring is(inet_ntoa( *( &( ((sockaddr_in *)res->ai_addr)->sin_addr ) ) ));
          
          v.push_back(is);
***************
*** 96,99 ****
--- 94,99 ----
      }
      
+     freeaddrinfo(res);
+     
      return cnt;
  }