[vlc-commits] src/missing: remove return after assert case since this is only needed for non-debug builds which are not used by developers anyway
Felix Paul Kühne
git at videolan.org
Mon Mar 3 19:09:54 CET 2014
vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Mon Mar 3 19:09:47 2014 +0100| [b13cc6465b1eb9ebc682e1c1dd4152027a0d40ed] | committer: Felix Paul Kühne
src/missing: remove return after assert case since this is only needed for non-debug builds which are not used by developers anyway
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b13cc6465b1eb9ebc682e1c1dd4152027a0d40ed
---
src/missing.c | 29 -----------------------------
1 file changed, 29 deletions(-)
diff --git a/src/missing.c b/src/missing.c
index 5d51214..d1c7ebd 100644
--- a/src/missing.c
+++ b/src/missing.c
@@ -45,14 +45,12 @@ char *httpd_ClientIP (const httpd_client_t *cl, char *psz_ip, int *port)
{
(void) cl; (void) psz_ip; (void) port;
assert (0);
- return NULL;
}
httpd_file_sys_t *httpd_FileDelete (httpd_file_t *file)
{
(void) file;
assert (0);
- return NULL;
}
httpd_file_t *httpd_FileNew (httpd_host_t *host,
@@ -65,14 +63,12 @@ httpd_file_t *httpd_FileNew (httpd_host_t *host,
(void) login; (void) password;
(void) cb; (void) data;
assert (0);
- return NULL;
}
httpd_handler_sys_t *httpd_HandlerDelete (httpd_handler_t *handler)
{
(void) handler;
assert (0);
- return NULL;
}
httpd_handler_t *httpd_HandlerNew (httpd_host_t *host, const char *url,
@@ -84,7 +80,6 @@ httpd_handler_t *httpd_HandlerNew (httpd_host_t *host, const char *url,
(void) login; (void) password;
(void) cb; (void) data;
assert (0);
- return NULL;
}
void httpd_HostDelete (httpd_host_t *h)
@@ -121,7 +116,6 @@ const char *httpd_MsgGet (const httpd_message_t *m, const char *name)
{
(void) m; (void) name;
assert (0);
- return NULL;
}
void httpd_RedirectDelete (httpd_redirect_t *r)
@@ -135,14 +129,12 @@ httpd_redirect_t *httpd_RedirectNew (httpd_host_t *host,
{
(void) host; (void) dst; (void) src;
assert (0);
- return NULL;
}
char *httpd_ServerIP (const httpd_client_t *client, char *ip, int *port)
{
(void) client; (void) ip; (void) port;
assert (0);
- return NULL;
}
void httpd_StreamDelete (httpd_stream_t *stream)
@@ -155,7 +147,6 @@ int httpd_StreamHeader (httpd_stream_t *stream, uint8_t *data, int count)
{
(void) stream; (void) data; (void) count;
assert (0);
- return 0;
}
httpd_stream_t *httpd_StreamNew (httpd_host_t *host,
@@ -165,14 +156,12 @@ httpd_stream_t *httpd_StreamNew (httpd_host_t *host,
(void) host; (void) url; (void) content_type;
(void) login; (void) password;
assert (0);
- return NULL;
}
int httpd_StreamSend (httpd_stream_t *stream, const block_t *p_block)
{
(void) stream; (void) p_block;
assert (0);
- return 0;
}
int httpd_StreamSetHTTPHeaders (httpd_stream_t * stream,
@@ -181,7 +170,6 @@ int httpd_StreamSetHTTPHeaders (httpd_stream_t * stream,
{
(void) stream; (void) headers; (void) i_headers;
assert (0);
- return 0;
}
int httpd_UrlCatch (httpd_url_t *url, int request, httpd_callback_t cb,
@@ -189,7 +177,6 @@ int httpd_UrlCatch (httpd_url_t *url, int request, httpd_callback_t cb,
{
(void) url; (void) request; (void) cb; (void) data;
assert (0);
- return 0;
}
void httpd_UrlDelete (httpd_url_t *url)
@@ -203,7 +190,6 @@ httpd_url_t *httpd_UrlNew (httpd_host_t *host, const char *url,
{
(void) host; (void) url; (void) login; (void) password;
assert (0);
- return NULL;
}
#endif /* !ENABLE_HTTPD */
@@ -220,21 +206,18 @@ char *sdp_AddMedia (char **sdp, const char *type, const char *protocol,
VLC_UNUSED (bw); VLC_UNUSED (ptname); VLC_UNUSED (clockrate);
VLC_UNUSED (channels); VLC_UNUSED (fmtp);
assert (*sdp == NULL);
- return NULL;
}
char *sdp_AddAttribute (char **sdp, const char *name, const char *fmt, ...)
{
VLC_UNUSED (sdp); VLC_UNUSED (name); VLC_UNUSED (fmt);
assert (*sdp == NULL);
- return NULL;
}
int sout_AccessOutControl (sout_access_out_t *out, int query, ...)
{
VLC_UNUSED (out); VLC_UNUSED (query);
assert (0);
- return 0;
}
void sout_AccessOutDelete (sout_access_out_t *out)
@@ -256,21 +239,18 @@ ssize_t sout_AccessOutRead (sout_access_out_t *out, block_t *block)
{
VLC_UNUSED (out); VLC_UNUSED (block);
assert (0);
- return 0;
}
int sout_AccessOutSeek (sout_access_out_t *out, off_t offset)
{
VLC_UNUSED (out); VLC_UNUSED (offset);
assert (0);
- return 0;
}
ssize_t sout_AccessOutWrite (sout_access_out_t *out, block_t *block)
{
VLC_UNUSED (out); VLC_UNUSED (block);
assert (0);
- return 0;
}
#undef sout_AnnounceRegisterSDP
@@ -288,7 +268,6 @@ int sout_AnnounceUnRegister (vlc_object_t *obj, session_descriptor_t *d)
{
VLC_UNUSED (obj); VLC_UNUSED (d);
assert (0);
- return 0;
}
#undef sout_EncoderCreate
@@ -302,7 +281,6 @@ sout_input_t *sout_MuxAddStream (sout_mux_t *mux, es_format_t *fmt)
{
VLC_UNUSED (mux); VLC_UNUSED (fmt);
assert (0);
- return NULL;
}
void sout_MuxDelete (sout_mux_t *mux)
@@ -321,7 +299,6 @@ int sout_MuxGetStream (sout_mux_t *p_mux, int i_blocks, mtime_t *pi_dts)
{
VLC_UNUSED (p_mux); VLC_UNUSED (i_blocks); VLC_UNUSED (pi_dts);
assert (0);
- return 0;
}
sout_mux_t *sout_MuxNew (sout_instance_t *instance, const char *mux,
@@ -329,14 +306,12 @@ sout_mux_t *sout_MuxNew (sout_instance_t *instance, const char *mux,
{
VLC_UNUSED (instance); VLC_UNUSED (mux); VLC_UNUSED (out);
assert (0);
- return NULL;
}
int sout_MuxSendBuffer (sout_mux_t *mux, sout_input_t *input, block_t *block)
{
VLC_UNUSED (mux); VLC_UNUSED (input); VLC_UNUSED (block);
assert (0);
- return 0;
}
void sout_StreamChainDelete (sout_stream_t *p_first, sout_stream_t *p_last)
@@ -352,7 +327,6 @@ sout_stream_t *sout_StreamChainNew (sout_instance_t *p_sout, char *psz_chain,
VLC_UNUSED (p_sout); VLC_UNUSED (psz_chain); VLC_UNUSED (p_next);
VLC_UNUSED (pp_last);
assert (0);
- return NULL;
}
char *vlc_sdp_Start (vlc_object_t *obj, const char *cfg,
@@ -373,7 +347,6 @@ int vlm_Control (vlm_t *vlm, int query, ...)
VLC_UNUSED (query);
VLC_UNUSED (vlm);
assert (0);
- return 0;
}
void vlm_Delete (vlm_t *vlm)
@@ -388,7 +361,6 @@ int vlm_ExecuteCommand (vlm_t *vlm, const char *cmd, vlm_message_t **pm)
VLC_UNUSED (cmd);
VLC_UNUSED (pm);
assert (0);
- return 0;
}
vlm_message_t *vlm_MessageAdd (vlm_message_t *a, vlm_message_t *b)
@@ -396,7 +368,6 @@ vlm_message_t *vlm_MessageAdd (vlm_message_t *a, vlm_message_t *b)
VLC_UNUSED (a);
VLC_UNUSED (b);
assert (0);
- return NULL;
}
void vlm_MessageDelete (vlm_message_t *m)
More information about the vlc-commits
mailing list