Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
9f30598b
Commit
9f30598b
authored
Feb 01, 2006
by
Rémi Denis-Courmont
Browse files
Simpler use of HAVE_ASSERT
parent
547ace84
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/libvlc.c
View file @
9f30598b
...
...
@@ -42,7 +42,11 @@
#include
<stdio.h>
/* sprintf() */
#include
<string.h>
/* strerror() */
#include
<stdlib.h>
/* free() */
#include
<assert.h>
#ifdef HAVE_ASSERT
# include <assert.h>
#else
# define assert( c ) ((void)0)
#endif
#ifndef WIN32
# include <netinet/in.h>
/* BSD: struct in_addr */
...
...
@@ -2728,13 +2732,12 @@ char *FromLocale( const char *locale )
inb
--
;
vlc_iconv
(
libvlc
.
from_locale
,
NULL
,
NULL
,
NULL
,
NULL
);
}
vlc_mutex_unlock
(
&
libvlc
.
from_locale_lock
);
#ifdef HAVE_ASSERT
vlc_mutex_unlock
(
&
libvlc
.
from_locale_lock
);
assert
(
inb
==
0
);
assert
(
*
iptr
==
'\0'
);
assert
(
*
optr
==
'\0'
);
assert
(
strlen
(
output
)
==
(
size_t
)(
optr
-
output
));
#endif
return
realloc
(
output
,
optr
-
output
+
1
);
}
return
(
char
*
)
locale
;
...
...
@@ -2777,12 +2780,10 @@ char *ToLocale( const char *utf8 )
}
vlc_mutex_unlock
(
&
libvlc
.
to_locale_lock
);
#ifdef HAVE_ASSERT
assert
(
inb
==
0
);
assert
(
*
iptr
==
'\0'
);
assert
(
*
optr
==
'\0'
);
assert
(
strlen
(
output
)
==
(
size_t
)(
optr
-
output
));
#endif
return
realloc
(
output
,
optr
-
output
+
1
);
}
return
(
char
*
)
utf8
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment