* modules/gui/wxwidgets/playlist.cpp: don't call treectrl->EnsureVisible() when updat...

[vlc] / include / network.h

diff --git a/include/network.h b/include/network.h
index ad871becb4a8078bb4fbd5972a8d9b1a6713a44d..9d80e03f352d0b3b1efb4b09b56ec4d1eab22ea8 100644 (file)
--- a/include/network.h
+++ b/include/network.h
@@ -308,11 +308,12 @@ static inline char *vlc_b64_encode( char *src )
     static const char b64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
     size_t len = strlen( src );
 
+    char *ret;
     char *dst = (char *)malloc( ( len + 4 ) * 4 / 3 );
     if( dst == NULL )
         return NULL;
 
-    char *ret = dst;
+    ret = dst;
 
     while( len > 0 )
     {
@@ -551,7 +552,7 @@ static inline int net_GetSockAddress( int fd, char *address, int *port )
     struct sockaddr_storage addr;
     socklen_t addrlen = sizeof( addr );
 
-    return getpeername( fd, (struct sockaddr *)&addr, &addrlen )
+    return getsockname( fd, (struct sockaddr *)&addr, &addrlen )
         || vlc_getnameinfo( (struct sockaddr *)&addr, addrlen, address,
                             NI_MAXNUMERICHOST, port, NI_NUMERICHOST )
         ? VLC_EGENERIC : 0;