Skip to content

V
vlc-1.1
Commit 9f30598b authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Simpler use of HAVE_ASSERT

parent 547ace84
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 6 deletions
src/libvlc.c
View file @ 9f30598b
...@@ -42,7 +42,11 @@ ...@@ -42,7 +42,11 @@
#include <stdio.h> /* sprintf() */ #include <stdio.h> /* sprintf() */
#include <string.h> /* strerror() */ #include <string.h> /* strerror() */
#include <stdlib.h> /* free() */ #include <stdlib.h> /* free() */
#include <assert.h> #ifdef HAVE_ASSERT
# include <assert.h>
#else
# define assert( c ) ((void)0)
#endif
#ifndef WIN32 #ifndef WIN32
# include <netinet/in.h> /* BSD: struct in_addr */ # include <netinet/in.h> /* BSD: struct in_addr */
...@@ -2728,13 +2732,12 @@ char *FromLocale( const char *locale ) ...@@ -2728,13 +2732,12 @@ char *FromLocale( const char *locale )
inb--; inb--;
vlc_iconv( libvlc.from_locale, NULL, NULL, NULL, NULL ); vlc_iconv( libvlc.from_locale, NULL, NULL, NULL, NULL );
} }
vlc_mutex_unlock( &libvlc.from_locale_lock ); vlc_mutex_unlock( &libvlc.from_locale_lock );
#ifdef HAVE_ASSERT
assert (inb == 0); assert (inb == 0);
assert (*iptr == '\0'); assert (*iptr == '\0');
assert (*optr == '\0'); assert (*optr == '\0');
assert (strlen( output ) == (size_t)(optr - output)); assert (strlen( output ) == (size_t)(optr - output));
#endif
return realloc( output, optr - output + 1 ); return realloc( output, optr - output + 1 );
} }
return (char *)locale; return (char *)locale;
...@@ -2777,12 +2780,10 @@ char *ToLocale( const char *utf8 ) ...@@ -2777,12 +2780,10 @@ char *ToLocale( const char *utf8 )
} }
vlc_mutex_unlock( &libvlc.to_locale_lock ); vlc_mutex_unlock( &libvlc.to_locale_lock );
#ifdef HAVE_ASSERT
assert (inb == 0); assert (inb == 0);
assert (*iptr == '\0'); assert (*iptr == '\0');
assert (*optr == '\0'); assert (*optr == '\0');
assert (strlen( output ) == (size_t)(optr - output)); assert (strlen( output ) == (size_t)(optr - output));
#endif
return realloc( output, optr - output + 1 ); return realloc( output, optr - output + 1 );
} }
return (char *)utf8; return (char *)utf8;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment