--------------------- PatchSet 1872 Date: 2001/04/10 13:13:09 Author: rvenning Branch: rvenning_tosaddracl Tag: (none) Log: fixed compile warnings (and the inet_addr occurence I toyed with to replace safe_inet_addr) Members: src/acl.c:1.28.2.3->1.28.2.4 Index: squid/src/acl.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/acl.c,v retrieving revision 1.28.2.3 retrieving revision 1.28.2.4 diff -u -r1.28.2.3 -r1.28.2.4 --- squid/src/acl.c 10 Apr 2001 13:10:26 -0000 1.28.2.3 +++ squid/src/acl.c 10 Apr 2001 13:13:09 -0000 1.28.2.4 @@ -1,6 +1,6 @@ /* - * $Id: acl.c,v 1.28.2.3 2001/04/10 13:10:26 rvenning Exp $ + * $Id: acl.c,v 1.28.2.4 2001/04/10 13:13:09 rvenning Exp $ * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels @@ -998,8 +998,8 @@ /* maybe it is a permissible trailing integer or dotted quad - in which case there is nothing else left on the line */ if (!strtok(NULL, w_space) && /* OK to discard, trust me */ - (sscanf(t, "0x%x", &trailer) || sscanf(t, "%d", &trailer) || - inet_addr(t, (struct in_addr *)&trailer))) { + (sscanf(t, "0x%lx", &trailer) || sscanf(t, "%ld", &trailer) || + safe_inet_addr(t, (struct in_addr *)&trailer))) { /* we really do have a int on the end of the line, in 0x1234 or plain 1234 format */ A->trailer = trailer;