diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2006-02-21 21:15:19 +0000 |
|---|---|---|
| committer | Alex Beregszaszi <alex@rtfs.hu> | 2006-02-21 21:15:19 +0000 |
| commit | 33f5e2ec3ec7e2a8a3e8092f9aba802bd9cc2be2 (patch) | |
| tree | a71720b31068c9585478d3eba99f9a8031dd06be /ffserver.c | |
| parent | fb7a2bf6956173eda6f9caceef8599fa4f83500d (diff) | |
| download | ffmpeg-33f5e2ec3ec7e2a8a3e8092f9aba802bd9cc2be2.tar.gz | |
make those nasty variables static, also fix a html bug
Originally committed as revision 5044 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ffserver.c b/ffserver.c index 4c3726c5f3..4c55558093 100644 --- a/ffserver.c +++ b/ffserver.c @@ -232,10 +232,10 @@ typedef struct FeedData { struct sockaddr_in my_http_addr; struct sockaddr_in my_rtsp_addr; -char logfilename[1024]; -HTTPContext *first_http_ctx; -FFStream *first_feed; /* contains only feeds */ -FFStream *first_stream; /* contains all streams, including feeds */ +static char logfilename[1024]; +static HTTPContext *first_http_ctx; +static FFStream *first_feed; /* contains only feeds */ +static FFStream *first_stream; /* contains all streams, including feeds */ static void new_connection(int server_fd, int is_rtsp); static void close_connection(HTTPContext *c); @@ -278,11 +278,11 @@ static int ffserver_daemon; static int no_launch; static int need_to_start_children; -int nb_max_connections; -int nb_connections; +static int nb_max_connections; +static int nb_connections; -int max_bandwidth; -int current_bandwidth; +static int max_bandwidth; +static int current_bandwidth; static long cur_time; // Making this global saves on passing it around everywhere @@ -1298,8 +1298,8 @@ static int http_parse_request(HTTPContext *c) q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "Content-type: text/html\r\n"); q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "\r\n"); q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "<html><head><title>Too busy</title></head><body>\r\n"); - q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "The server is too busy to serve your request at this time.<p>\r\n"); - q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "The bandwidth being served (including your stream) is %dkbit/sec, and this exceeds the limit of %dkbit/sec\r\n", + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "<p>The server is too busy to serve your request at this time.</p>\r\n"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "<p>The bandwidth being served (including your stream) is %dkbit/sec, and this exceeds the limit of %dkbit/sec.</p>\r\n", current_bandwidth, max_bandwidth); q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "</body></html>\r\n"); |