current filters.c,1.206,1.207

Update of /cvsroot/ijbswa/current
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23283

Modified Files:
	filters.c 
Log Message:
Let sockaddr_storage_to_ip() return void

The previous failure conditions weren't (supposed to be)
reachable and weren't consistently checked anyway.


Index: filters.c
===================================================================
RCS file: /cvsroot/ijbswa/current/filters.c,v
retrieving revision 1.206
retrieving revision 1.207
diff -C2 -d -r1.206 -r1.207
*** filters.c	4 Jun 2017 14:43:10 -0000	1.206
--- filters.c	4 Jun 2017 14:43:31 -0000	1.207
***************
*** 106,115 ****
   *          4  :  port = port number in network order;
   *
!  * Returns     :  0 = no errror; -1 otherwise.
   *
   *********************************************************************/
! static int sockaddr_storage_to_ip(const struct sockaddr_storage *addr,
!                                   uint8_t **ip, unsigned int *len,
!                                   in_port_t **port)
  {
     assert(NULL != addr);
--- 106,115 ----
   *          4  :  port = port number in network order;
   *
!  * Returns     :  void
   *
   *********************************************************************/
! static void sockaddr_storage_to_ip(const struct sockaddr_storage *addr,
!                                    uint8_t **ip, unsigned int *len,
!                                    in_port_t **port)
  {
     assert(NULL != addr);
***************
*** 149,158 ****
           break;
  
-       default:
-          /* Unsupported address family */
-          return(-1);
     }
- 
-    return(0);
  }
  
--- 149,153 ----
***************
*** 454,461 ****
  
     aca->mask.ss_family = aca->addr.ss_family;
!    if (sockaddr_storage_to_ip(&aca->mask, &mask_data, &addr_len, &mask_port))
!    {
!       return(-1);
!    }
  
     if (p)
--- 449,453 ----
  
     aca->mask.ss_family = aca->addr.ss_family;
!    sockaddr_storage_to_ip(&aca->mask, &mask_data, &addr_len, &mask_port);
  
     if (p)


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot