- Don't print a bogus warning when reading on empty line in a .host file

- Move acl.c to a more appropriate location

diff --git a/Makefile.am b/Makefile.am
index 3ff67dc24783e839a24e55b2395de090606ab365..481a75fe265d0277f5a02e9f2d299e5e5eb4c2ea 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -431,11 +431,11 @@ SOURCES_libvlc_common = \
        src/stream_output/stream_output.c \
        src/stream_output/announce.c \
        src/stream_output/sap.c \
-       src/stream_output/acl.c \
        src/osd/osd.c \
        src/osd/osd_parser.c \
        src/osd/osd_text.c \
        src/osd/osd_widgets.c \
+       src/network/acl.c \
        src/network/getaddrinfo.c \
        src/network/io.c \
        src/network/tcp.c \

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 87825998151d89d65768a2192c9779856116843d..9ad33932b38be443a635c8ec3b0d3ebb46a4aa93 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -122,6 +122,7 @@ src/misc/variables.c
 src/misc/vlm.c
 src/misc/win32_specific.c
 src/misc/xml.c
+src/network/acl.c
 src/network/getaddrinfo.c
 src/network/httpd.c
 src/network/io.c

diff --git a/src/stream_output/acl.c b/src/network/acl.c
similarity index 99%
rename from src/stream_output/acl.c
rename to src/network/acl.c
index 9a957d1a7a50df82390830c5e1859d9609763c5c..b9cc0a63f7deff4a379fd82bb84c73d734d08732 100644 (file)
--- a/src/stream_output/acl.c
+++ b/src/network/acl.c
@@ -66,7 +66,7 @@ static int ACL_Resolve( vlc_object_t *p_this, uint8_t *p_bytes,
         msg_Err( p_this, "invalid IP address %s", psz_ip );
         return -1;
     }
-    
+
     p_bytes[16] = 0; /* avoids overflowing when i_bytes_match = 16 */
 
     i_family = res->ai_addr->sa_family;
@@ -75,7 +75,7 @@ static int ACL_Resolve( vlc_object_t *p_this, uint8_t *p_bytes,
         case AF_INET:
         {
             struct sockaddr_in *addr;
-                
+
             addr = (struct sockaddr_in *)res->ai_addr;
             memset( p_bytes, 0, 12 );
             memcpy( p_bytes + 12, &addr->sin_addr, 4 );
@@ -203,7 +203,7 @@ vlc_acl_t *__ACL_Create( vlc_object_t *p_this, vlc_bool_t b_allow )
     p_acl->i_size = 0;
     p_acl->p_entries = NULL;
     p_acl->b_allow_default = b_allow;
-    
+
     return p_acl;
 }
 
@@ -264,7 +264,7 @@ void ACL_Destroy( vlc_acl_t *p_acl )
 int ACL_LoadFile( vlc_acl_t *p_acl, const char *psz_path )
 {
     FILE *file;
-    
+
     if( p_acl == NULL )
         return -1;
 
@@ -296,6 +296,9 @@ int ACL_LoadFile( vlc_acl_t *p_acl, const char *psz_path )
         while( isspace( *psz_ip ) )
             psz_ip++;
 
+        if( *psz_ip == '\0' ) /* empty/blank line */
+            continue;
+
         ptr = strchr( psz_ip, '\n' );
         if( ptr == NULL )
         {