generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Drop remaining unneeded != NULL

Browse Source 
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-08-15 21:31:59 +02:00
parent 60dbed6067
commit 81a663f49e
16 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
ffserver.c
View File

@@ -592,7 +592,7 @@ static void start_multicast(void)
int default_port, stream_index;
default_port = 6000;
for(stream = first_stream; stream != NULL; stream = stream->next) {
for(stream = first_stream; stream; stream = stream->next) {
if (stream->is_multicast) {
unsigned random0 = av_lfg_get(&random_state);
unsigned random1 = av_lfg_get(&random_state);
@@ -696,7 +696,7 @@ static int http_server(void)
/* wait for events on each HTTP handle */
c = first_http_ctx;
delay = 1000;
while (c != NULL) {
while (c) {
int fd;
fd = c->fd;
switch(c->state) {
@@ -763,7 +763,7 @@ static int http_server(void)
}
/* now handle the events */
for(c = first_http_ctx; c != NULL; c = c_next) {
for(c = first_http_ctx; c; c = c_next) {
c_next = c->next;
if (handle_connection(c) < 0) {
log_connection(c);
@@ -881,7 +881,7 @@ static void close_connection(HTTPContext *c)
/* remove connection from list */
cp = &first_http_ctx;
while ((*cp) != NULL) {
while (*cp) {
c1 = *cp;
if (c1 == c)
*cp = c->next;
@@ -890,7 +890,7 @@ static void close_connection(HTTPContext *c)
}
/* remove references, if any (XXX: do it faster) */
for(c1 = first_http_ctx; c1 != NULL; c1 = c1->next) {
for(c1 = first_http_ctx; c1; c1 = c1->next) {
if (c1->rtsp_c == c)
c1->rtsp_c = NULL;
}
@@ -1486,7 +1486,7 @@ static void compute_real_filename(char *filename, int max_size)
p = strrchr(file1, '.');
if (p)
*p = '\0';
for(stream = first_stream; stream != NULL; stream = stream->next) {
for(stream = first_stream; stream; stream = stream->next) {
av_strlcpy(file2, stream->filename, sizeof(file2));
p = strrchr(file2, '.');
if (p)
@@ -1595,7 +1595,7 @@ static int http_parse_request(HTTPContext *c)
av_strlcpy(filename, "index.html", sizeof(filename) - 1);
stream = first_stream;
while (stream != NULL) {
while (stream) {
if (!strcmp(stream->filename, filename) && validate_acl(stream, c))
break;
stream = stream->next;
@@ -1974,7 +1974,7 @@ static void compute_status(HTTPContext *c)
avio_printf(pb, "<table cellspacing=0 cellpadding=4>\n");
avio_printf(pb, "<tr><th valign=top>Path<th align=left>Served<br>Conns<th><br>bytes<th valign=top>Format<th>Bit rate<br>kbits/s<th align=left>Video<br>kbits/s<th><br>Codec<th align=left>Audio<br>kbits/s<th><br>Codec<th align=left valign=top>Feed\n");
stream = first_stream;
while (stream != NULL) {
while (stream) {
char sfilename[1024];
char *eosf;
@@ -2063,7 +2063,7 @@ static void compute_status(HTTPContext *c)
avio_printf(pb, "</table>\n");
stream = first_stream;
while (stream != NULL) {
while (stream) {
if (stream->feed == stream) {
avio_printf(pb, "<h2>Feed %s</h2>", stream->filename);
if (stream->pid) {
@@ -2141,7 +2141,7 @@ static void compute_status(HTTPContext *c)
avio_printf(pb, "<tr><th>#<th>File<th>IP<th>Proto<th>State<th>Target bits/sec<th>Actual bits/sec<th>Bytes transferred\n");
c1 = first_http_ctx;
i = 0;
while (c1 != NULL) {
while (c1) {
int bitrate;
int j;
@@ -2785,7 +2785,7 @@ static int http_receive_data(HTTPContext *c)
}
/* wake up any waiting connections */
for(c1 = first_http_ctx; c1 != NULL; c1 = c1->next) {
for(c1 = first_http_ctx; c1; c1 = c1->next) {
if (c1->state == HTTPSTATE_WAIT_FEED &&
c1->stream->feed == c->stream->feed)
c1->state = HTTPSTATE_SEND_DATA;
@@ -2841,7 +2841,7 @@ static int http_receive_data(HTTPContext *c)
c->stream->feed_opened = 0;
close(c->feed_fd);
/* wake up any waiting connections to stop waiting for feed */
for(c1 = first_http_ctx; c1 != NULL; c1 = c1->next) {
for(c1 = first_http_ctx; c1; c1 = c1->next) {
if (c1->state == HTTPSTATE_WAIT_FEED &&
c1->stream->feed == c->stream->feed)
c1->state = HTTPSTATE_SEND_DATA_TRAILER;
@@ -3043,7 +3043,7 @@ static void rtsp_cmd_describe(HTTPContext *c, const char *url)
if (*path == '/')
path++;
for(stream = first_stream; stream != NULL; stream = stream->next) {
for(stream = first_stream; stream; stream = stream->next) {
if (!stream->is_feed &&
stream->fmt && !strcmp(stream->fmt->name, "rtp") &&
!strcmp(path, stream->filename)) {
@@ -3081,7 +3081,7 @@ static HTTPContext *find_rtp_session(const char *session_id)
if (session_id[0] == '\0')
return NULL;
for(c = first_http_ctx; c != NULL; c = c->next) {
for(c = first_http_ctx; c; c = c->next) {
if (!strcmp(c->session_id, session_id))
return c;
}
@@ -3121,7 +3121,7 @@ static void rtsp_cmd_setup(HTTPContext *c, const char *url,
path++;
/* now check each stream */
for(stream = first_stream; stream != NULL; stream = stream->next) {
for(stream = first_stream; stream; stream = stream->next) {
if (!stream->is_feed &&
stream->fmt && !strcmp(stream->fmt->name, "rtp")) {
/* accept aggregate filenames only if single stream */
@@ -3582,7 +3582,7 @@ static void remove_stream(FFStream *stream)
{
FFStream **ps;
ps = &first_stream;
while (*ps != NULL) {
while (*ps) {
if (*ps == stream)
*ps = (*ps)->next;
else
@@ -3648,7 +3648,7 @@ static void build_file_streams(void)
int i, ret;
/* gather all streams */
for(stream = first_stream; stream != NULL; stream = stream_next) {
for(stream = first_stream; stream; stream = stream_next) {
AVFormatContext *infile = NULL;
stream_next = stream->next;
if (stream->stream_type == STREAM_TYPE_LIVE &&
@@ -3700,7 +3700,7 @@ static void build_feed_streams(void)
int i;
/* gather all streams */
for(stream = first_stream; stream != NULL; stream = stream->next) {
for(stream = first_stream; stream; stream = stream->next) {
feed = stream->feed;
if (feed) {
if (stream->is_feed) {
@@ -3715,7 +3715,7 @@ static void build_feed_streams(void)
}
/* create feed files if needed */
for(feed = first_feed; feed != NULL; feed = feed->next_feed) {
for(feed = first_feed; feed; feed = feed->next_feed) {
int fd;
if (avio_check(feed->feed_filename, AVIO_FLAG_READ) > 0) {
@@ -3847,7 +3847,7 @@ static void compute_bandwidth(void)
int i;
FFStream *stream;
for(stream = first_stream; stream != NULL; stream = stream->next) {
for(stream = first_stream; stream; stream = stream->next) {
bandwidth = 0;
for(i=0;i<stream->nb_streams;i++) {
AVStream *st = stream->streams[i];
@@ -4294,7 +4294,7 @@ static int parse_ffconfig(const char *filename)
FFStream *sfeed;
sfeed = first_feed;
while (sfeed != NULL) {
while (sfeed) {
if (!strcmp(sfeed->filename, arg))
break;
sfeed = sfeed->next_feed;