abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2025-08-11 08:54:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reformat httpd* using astylerc

Browse Source
This commit is contained in:
Dirk Ziegelmeier 2017-09-17 17:58:36 +02:00
parent c35b1099a4
commit 6164f0cd34
5 changed files with 344 additions and 352 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/apps/httpd/httpd.c
View File

@ -142,8 +142,7 @@
#define HTTP_DATA_TO_SEND_CONTINUE 1 #define HTTP_DATA_TO_SEND_CONTINUE 1
#define HTTP_NO_DATA_TO_SEND 0 #define HTTP_NO_DATA_TO_SEND 0
typedef struct typedef struct {
{
const char *name; const char *name;
u8_t shtml; u8_t shtml;
} default_filename; } default_filename;
@ -2201,8 +2200,7 @@ http_find_file(struct http_state *hs, const char *uri, int is_09)
} }
sub = uri; sub = uri;
ext = uri; ext = uri;
for (sub = strstr(sub, "."); sub != NULL; sub = strstr(sub, ".")) for (sub = strstr(sub, "."); sub != NULL; sub = strstr(sub, ".")) {
{
ext = sub; ext = sub;
sub++; sub++;
} }

9
src/apps/httpd/httpd_structs.h
View File

@ -6,16 +6,14 @@
#if LWIP_HTTPD_DYNAMIC_HEADERS #if LWIP_HTTPD_DYNAMIC_HEADERS
/** This struct is used for a list of HTTP header strings for various /** This struct is used for a list of HTTP header strings for various
* filename extensions. */ * filename extensions. */
typedef struct typedef struct {
{
const char *extension; const char *extension;
const char *content_type; const char *content_type;
} tHTTPHeader; } tHTTPHeader;
/** A list of strings used in HTTP headers (see RFC 1945 HTTP/1.0 and /** A list of strings used in HTTP headers (see RFC 1945 HTTP/1.0 and
* RFC 2616 HTTP/1.1 for header field definitions) */ * RFC 2616 HTTP/1.1 for header field definitions) */
static const char * const g_psHTTPHeaderStrings[] = static const char *const g_psHTTPHeaderStrings[] = {
{
"HTTP/1.0 200 OK\r\n", "HTTP/1.0 200 OK\r\n",
"HTTP/1.0 404 File not found\r\n", "HTTP/1.0 404 File not found\r\n",
"HTTP/1.0 400 Bad Request\r\n", "HTTP/1.0 400 Bad Request\r\n",
@ -82,8 +80,7 @@ static const char * const g_psHTTPHeaderStrings[] =
/** A list of extension-to-HTTP header strings (see outdated RFC 1700 MEDIA TYPES /** A list of extension-to-HTTP header strings (see outdated RFC 1700 MEDIA TYPES
* and http://www.iana.org/assignments/media-types for registered content types * and http://www.iana.org/assignments/media-types for registered content types
* and subtypes) */ * and subtypes) */
static const tHTTPHeader g_psHTTPHeaders[] = static const tHTTPHeader g_psHTTPHeaders[] = {
{
{ "html", HTTP_HDR_HTML}, { "html", HTTP_HDR_HTML},
{ "htm", HTTP_HDR_HTML}, { "htm", HTTP_HDR_HTML},
{ "shtml", HTTP_HDR_SSI}, { "shtml", HTTP_HDR_SSI},

9
src/apps/httpd/makefsdata/makefsdata.c
View File

@ -107,8 +107,7 @@ static int payload_alingment_dummy_counter = 0;
#define MAX_PATH_LEN 256 #define MAX_PATH_LEN 256
struct file_entry struct file_entry {
{
struct file_entry *next; struct file_entry *next;
const char *filename_c; const char *filename_c;
}; };
@ -445,8 +444,7 @@ int process_sub(FILE *data_file, FILE *struct_file)
filesProcessed += process_sub(data_file, struct_file); filesProcessed += process_sub(data_file, struct_file);
CHDIR(".."); CHDIR("..");
curSubdir[sublen] = 0; curSubdir[sublen] = 0;
} } else {
else {
printf("WARNING: cannot process sub due to path length restrictions: \"%s/%s\"\n", curSubdir, currName); printf("WARNING: cannot process sub due to path length restrictions: \"%s/%s\"\n", curSubdir, currName);
} }
} }
@ -786,8 +784,7 @@ int process_file(FILE *data_file, FILE *struct_file, const char *filename)
fprintf(struct_file, "data_%s," NEWLINE, varname); fprintf(struct_file, "data_%s," NEWLINE, varname);
fprintf(struct_file, "data_%s + %d," NEWLINE, varname, i); fprintf(struct_file, "data_%s + %d," NEWLINE, varname, i);
fprintf(struct_file, "sizeof(data_%s) - %d," NEWLINE, varname, i); fprintf(struct_file, "sizeof(data_%s) - %d," NEWLINE, varname, i);
switch(flags) switch (flags) {
{
case (FS_FILE_FLAGS_HEADER_INCLUDED): case (FS_FILE_FLAGS_HEADER_INCLUDED):
flags_str = "FS_FILE_FLAGS_HEADER_INCLUDED"; flags_str = "FS_FILE_FLAGS_HEADER_INCLUDED";
break; break;