d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simple_httpd was not buildable for some time due to multiple missing

Browse Source 
"static" keywords and -Werror,-Wmissing-variable-declarations

This change adds needed "static" so it builds again with WARNS?=6
No functional changes.

MFC after:	1 week
This commit is contained in:
Eugene Grosbein 2019-08-18 01:00:21 +00:00
parent 49640386b3
commit b311688b86
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
release/picobsd/tinyware/simple_httpd/simple_httpd.c
View File

@ -48,33 +48,33 @@
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
int http_port = 80; static int http_port = 80;
int daemonize = 1; static int daemonize = 1;
int verbose = 0; static int verbose = 0;
int http_sock, con_sock; static int http_sock, con_sock;
const char *fetch_mode = NULL; static const char *fetch_mode = NULL;
char homedir[100]; static char homedir[100];
char logfile[80]; static char logfile[80];
char *adate(void); static char *adate(void);
void init_servconnection(void); static void init_servconnection(void);
void http_date(void); static void http_date(void);
void http_output(const char *html); static void http_output(const char *html);
void http_request(void); static void http_request(void);
void log_line(char *req); static void log_line(char *req);
void wait_connection(void); static void wait_connection(void);
struct hostent *hst; static struct hostent *hst;
struct sockaddr_in source; static struct sockaddr_in source;
/* HTTP basics */ /* HTTP basics */
static char httpd_server_ident[] = "Server: FreeBSD/PicoBSD simple_httpd 1.1\r"; static char httpd_server_ident[] = "Server: FreeBSD/PicoBSD simple_httpd 1.1\r";
static char http_200[] = "HTTP/1.0 200 OK\r"; static char http_200[] = "HTTP/1.0 200 OK\r";
const char *default_mime_type = "application/octet-stream"; static const char *default_mime_type = "application/octet-stream";
const char *mime_type[][2] = { static const char *mime_type[][2] = {
{ "txt", "text/plain" }, { "txt", "text/plain" },
{ "htm", "text/html" }, { "htm", "text/html" },
{ "html", "text/html" }, { "html", "text/html" },
@ -83,7 +83,7 @@ const char *mime_type[][2] = {
{ "mp3", "audio/mpeg" } { "mp3", "audio/mpeg" }
}; };
const int mime_type_max = sizeof(mime_type) / sizeof(mime_type[0]) - 1; static const int mime_type_max = sizeof(mime_type) / sizeof(mime_type[0]) - 1;
/* Two parts, HTTP Header and then HTML */ /* Two parts, HTTP Header and then HTML */
static const char *http_404[2] = static const char *http_404[2] =
@ -101,7 +101,7 @@ This server only supports GET and HEAD requests.\n</BODY></HTML>\r\n"
/* /*
* Only called on initial invocation * Only called on initial invocation
*/ */
void static void
init_servconnection(void) init_servconnection(void)
{ {
struct sockaddr_in server; struct sockaddr_in server;
@ -125,7 +125,7 @@ init_servconnection(void)
/* /*
* Wait here until we see an incoming http request * Wait here until we see an incoming http request
*/ */
void static void
wait_connection(void) wait_connection(void)
{ {
socklen_t lg; socklen_t lg;
@ -142,7 +142,7 @@ wait_connection(void)
/* /*
* Print timestamp for HTTP HEAD and GET * Print timestamp for HTTP HEAD and GET
*/ */
void static void
http_date(void) http_date(void)
{ {
time_t tl; time_t tl;
@ -157,7 +157,7 @@ http_date(void)
/* /*
* Send data to the open socket * Send data to the open socket
*/ */
void static void
http_output(const char *html) http_output(const char *html)
{ {
write(con_sock, html, strlen(html)); write(con_sock, html, strlen(html));
@ -169,7 +169,7 @@ http_output(const char *html)
* Create and write the log information to file * Create and write the log information to file
* Log file format is one line per entry * Log file format is one line per entry
*/ */
void static void
log_line(char *req) log_line(char *req)
{ {
char log_buff[256]; char log_buff[256];
@ -213,7 +213,7 @@ log_line(char *req)
* We have a connection. Identify what type of request GET, HEAD, CGI, etc * We have a connection. Identify what type of request GET, HEAD, CGI, etc
* and do what needs to be done * and do what needs to be done
*/ */
void static void
http_request(void) http_request(void)
{ {
int fd, lg, i; int fd, lg, i;