diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-04-13 16:24:28 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-04-13 16:24:28 -0600 |
commit | 43ec94a665e13552402ff4f102e0f65f6792cf29 (patch) | |
tree | 05da26d1bb5e364c1a388afd54630d5ae3ca4aa7 /apps/netutils/thttpd | |
parent | 70b6bb22af51defd713adfd452309f32f0e523aa (diff) | |
download | px4-nuttx-43ec94a665e13552402ff4f102e0f65f6792cf29.tar.gz px4-nuttx-43ec94a665e13552402ff4f102e0f65f6792cf29.tar.bz2 px4-nuttx-43ec94a665e13552402ff4f102e0f65f6792cf29.zip |
More trailing whilespace removal
Diffstat (limited to 'apps/netutils/thttpd')
-rw-r--r-- | apps/netutils/thttpd/Kconfig | 6 | ||||
-rw-r--r-- | apps/netutils/thttpd/Makefile | 2 | ||||
-rw-r--r-- | apps/netutils/thttpd/cgi-src/ssi.c | 8 | ||||
-rw-r--r-- | apps/netutils/thttpd/config.h | 2 | ||||
-rw-r--r-- | apps/netutils/thttpd/fdwatch.c | 2 | ||||
-rw-r--r-- | apps/netutils/thttpd/libhttpd.c | 22 | ||||
-rw-r--r-- | apps/netutils/thttpd/thttpd.c | 22 | ||||
-rw-r--r-- | apps/netutils/thttpd/thttpd_cgi.c | 4 | ||||
-rw-r--r-- | apps/netutils/thttpd/timers.c | 2 |
9 files changed, 35 insertions, 35 deletions
diff --git a/apps/netutils/thttpd/Kconfig b/apps/netutils/thttpd/Kconfig index 403ce8092..3229ff403 100644 --- a/apps/netutils/thttpd/Kconfig +++ b/apps/netutils/thttpd/Kconfig @@ -218,7 +218,7 @@ choice is an error. Typical values, if they're defined, are "users" for THTTPD_TILDE_MAP1 - and "public_html" for THTTPD_TILDE_MAP2. + and "public_html" for THTTPD_TILDE_MAP2. config THTTPD_USE_TILDE_MAP1 bool "Tilde mapping 1" @@ -244,7 +244,7 @@ config THTTPD_USE_TILDE_MAP2 the name of a subdirectory off of the user's actual home dir, something like "public_html". - The typical value THTTPD_TILDE_MAP2 is "public_html". + The typical value THTTPD_TILDE_MAP2 is "public_html". config THTTPD_TILDE_MAP_NONE bool "No tilde mapping" @@ -286,7 +286,7 @@ config THTTPD_TILDE_MAP2 the name of a subdirectory off of the user's actual home dir, something like "public_html". - The typical value THTTPD_TILDE_MAP2 is "public_html". + The typical value THTTPD_TILDE_MAP2 is "public_html". config THTTPD_GENERATE_INDICES bool "Generate name indices" diff --git a/apps/netutils/thttpd/Makefile b/apps/netutils/thttpd/Makefile index 02a86f477..a2eaa3476 100644 --- a/apps/netutils/thttpd/Makefile +++ b/apps/netutils/thttpd/Makefile @@ -40,7 +40,7 @@ include $(APPDIR)/Make.defs # THTTPD Library ASRCS = -CSRCS = +CSRCS = ifeq ($(CONFIG_NET_TCP),y) CSRCS += thttpd.c libhttpd.c thttpd_cgi.c thttpd_alloc.c thttpd_strings.c timers.c fdwatch.c tdate_parse.c diff --git a/apps/netutils/thttpd/cgi-src/ssi.c b/apps/netutils/thttpd/cgi-src/ssi.c index c8bdab4ed..12d59d271 100644 --- a/apps/netutils/thttpd/cgi-src/ssi.c +++ b/apps/netutils/thttpd/cgi-src/ssi.c @@ -187,7 +187,7 @@ static int get_filename(char *vfilename, char *filename, /* Used for the various commands that accept a file name. These commands * accept two tags: virtual Gives a virtual path to a document on the - * server. file Gives a pathname relative to the current directory. ../ + * server. file Gives a pathname relative to the current directory. ../ * cannot be used in this pathname, nor can absolute paths be used. */ @@ -208,7 +208,7 @@ static int get_filename(char *vfilename, char *filename, { return -1; } - + if (fl - vl + strlen(val) >= fnsize) { return -1; @@ -403,7 +403,7 @@ static void do_config(FILE *instream, char *vfilename, char *filename, * strftime library call. g_sizefmt Determines the formatting to be used * when displaying the size of a file. Valid choices are bytes, for a * formatted byte count (formatted as 1,234,567), or abbrev for an - * abbreviated version displaying the number of kilobytes or megabytes the + * abbreviated version displaying the number of kilobytes or megabytes the * file occupies. */ @@ -495,7 +495,7 @@ static void do_include(FILE *instream, char *vfilename, char *filename, (void)fclose(instream2); } -static void do_echo(FILE *instream, char *vfilename, char *filename, +static void do_echo(FILE *instream, char *vfilename, char *filename, char *directive, char *tag, char *val) { char *cp; diff --git a/apps/netutils/thttpd/config.h b/apps/netutils/thttpd/config.h index e7bbb5ad9..56690adda 100644 --- a/apps/netutils/thttpd/config.h +++ b/apps/netutils/thttpd/config.h @@ -232,7 +232,7 @@ * about tildes. Enabling both options is an error. * * Typical values, if they're defined, are "users" for CONFIG_THTTPD_TILDE_MAP1 and "public_html" - * for CONFIG_THTTPD_TILDE_MAP2. + * for CONFIG_THTTPD_TILDE_MAP2. */ # if defined(CONFIG_THTTPD_TILDE_MAP1) && defined(CONFIG_THTTPD_TILDE_MAP2) diff --git a/apps/netutils/thttpd/fdwatch.c b/apps/netutils/thttpd/fdwatch.c index 50ea65e78..8a578b40c 100644 --- a/apps/netutils/thttpd/fdwatch.c +++ b/apps/netutils/thttpd/fdwatch.c @@ -107,7 +107,7 @@ static void fdwatch_dump(const char *msg, FAR struct fdwatch_s *fw) { int i; - + fwvdbg("%s\n", msg); fwvdbg("nwatched: %d nfds: %d\n", fw->nwatched, fw->nfds); for (i = 0; i < fw->nwatched; i++) diff --git a/apps/netutils/thttpd/libhttpd.c b/apps/netutils/thttpd/libhttpd.c index f147125d5..2b4b9767c 100644 --- a/apps/netutils/thttpd/libhttpd.c +++ b/apps/netutils/thttpd/libhttpd.c @@ -532,7 +532,7 @@ static void send_authenticate(httpd_conn *hc, char *realm) (void)snprintf(header, maxheader, "%s%s\"\r\n", headstr, realm); httpd_send_err(hc, 401, err401title, header, err401form, hc->encodedurl); - /* If the request was a POST then there might still be data to be read, so + /* If the request was a POST then there might still be data to be read, so * we need to do a lingering close. */ @@ -1046,8 +1046,8 @@ static int vhost_map(httpd_conn *hc) { /* Skip dots in the hostname. If we don't, then we get vhost * directories in higher level of filestructure if dot gets involved - * into path construction. It's `while' used here instead of `if' for - * it's possible to have a hostname formed with two dots at the end of + * into path construction. It's `while' used here instead of `if' for + * it's possible to have a hostname formed with two dots at the end of * it. */ @@ -1146,9 +1146,9 @@ static char *expand_filename(char *path, char **restP, bool tildemapped) if ((path[0] == '/' && strncmp(path, httpd_root, strlen(httpd_root)) != 0) || path[0] != '/') { /* Start out with httpd_root in checked. Allow space in the reallocation - * include NULL terminator and possibly a '/' + * include NULL terminator and possibly a '/' */ - + checkedlen = strlen(httpd_root); httpd_realloc_str(&checked, &maxchecked, checkedlen+2); strcpy(checked, httpd_root); @@ -1175,7 +1175,7 @@ static char *expand_filename(char *path, char **restP, bool tildemapped) httpd_realloc_str(&checked, &maxchecked, 1); checked[0] = '\0'; checkedlen = 0; - } + } /* Copy the whole filename (minus the leading '.') into rest. */ @@ -1725,7 +1725,7 @@ static void ls_child(int argc, char **argv) break; } - /* Now the world permissions. Owner and group permissions are + /* Now the world permissions. Owner and group permissions are * not of interest to web clients. */ @@ -2531,7 +2531,7 @@ int httpd_got_request(httpd_conn *hc) break; } break; - + case CHST_LF: switch (c) { @@ -2994,7 +2994,7 @@ int httpd_parse_request(httpd_conn *hc) } } - /* Ok, the request has been parsed. Now we resolve stuff that may require + /* Ok, the request has been parsed. Now we resolve stuff that may require * the entire request. */ @@ -3169,7 +3169,7 @@ int httpd_start_request(httpd_conn *hc, struct timeval *nowP) } /* Is it world-readable or world-executable? We check explicitly instead - * of just trying to open it, so that no one ever gets surprised by a file + * of just trying to open it, so that no one ever gets surprised by a file * that's not set world-readable and yet somehow is readable by the HTTP * server and therefore the *whole* world. */ @@ -3374,7 +3374,7 @@ int httpd_start_request(httpd_conn *hc, struct timeval *nowP) } #endif - /* It's not CGI. If it's executable or there's pathinfo, someone's trying + /* It's not CGI. If it's executable or there's pathinfo, someone's trying * to either serve or run a non-CGI file as CGI. Either case is * prohibited. */ diff --git a/apps/netutils/thttpd/thttpd.c b/apps/netutils/thttpd/thttpd.c index 57fe43514..6f082fc23 100644 --- a/apps/netutils/thttpd/thttpd.c +++ b/apps/netutils/thttpd/thttpd.c @@ -173,7 +173,7 @@ static int handle_newconnect(struct timeval *tv, int listen_fd) struct connect_s *conn; ClientData client_data; - /* This loops until the accept() fails, trying to start new connections as + /* This loops until the accept() fails, trying to start new connections as * fast as possible so we don't overrun the listen queue. */ @@ -183,7 +183,7 @@ static int handle_newconnect(struct timeval *tv, int listen_fd) /* Get the next free connection from the free list */ conn = free_connections; - + /* Are there any free connections? */ if (!conn) @@ -234,7 +234,7 @@ static int handle_newconnect(struct timeval *tv, int listen_fd) } nvdbg("New connection fd %d\n", conn->hc->conn_fd); - + /* Remove the connection entry from the free list */ conn->conn_state = CNST_READING; @@ -246,7 +246,7 @@ static int handle_newconnect(struct timeval *tv, int listen_fd) conn->wakeup_timer = NULL; conn->linger_timer = NULL; conn->offset = 0; - + /* Set the connection file descriptor to no-delay mode */ httpd_set_ndelay(conn->hc->conn_fd); @@ -294,7 +294,7 @@ static void handle_read(struct connect_s *conn, struct timeval *tv) { return; } - + ndbg("read(fd=%d) failed: %d\n", hc->conn_fd, errno); BADREQUEST("read"); goto errout_with_400; @@ -448,7 +448,7 @@ static void handle_send(struct connect_s *conn, struct timeval *tv) /* httpd_write does not return until all bytes have been sent * (or an error occurs). */ - + nwritten = httpd_write(hc->conn_fd, hc->buffer, hc->buflen); if (nwritten < 0) { @@ -488,8 +488,8 @@ static void handle_linger(struct connect_s *conn, struct timeval *tv) httpd_conn *hc = conn->hc; int ret; - /* In lingering-close mode we just read and ignore bytes. An error or EOF - * ends things, otherwise we go until a timeout + /* In lingering-close mode we just read and ignore bytes. An error or EOF + * ends things, otherwise we go until a timeout */ ret = read(conn->hc->conn_fd, hc->buffer, CONFIG_THTTPD_IOBUFFERSIZE); @@ -533,7 +533,7 @@ static void clear_connection(struct connect_s *conn, struct timeval *tv) * this unless it's necessary, because it ties up a connection slot and * file descriptor which means our maximum connection-handling rateis * lower. So, elsewhere we set a flag when we detect the few - * circumstances that make a lingering close necessary. If the flag isn't + * circumstances that make a lingering close necessary. If the flag isn't * set we do the real close now. */ @@ -790,7 +790,7 @@ int thttpd_main(int argc, char **argv) { if (!handle_newconnect(&tv, hs->listen_fd)) { - /* Go around the loop and do another fdwatch, rather than + /* Go around the loop and do another fdwatch, rather than * dropping through and processing existing connections. New * connections always get priority. */ @@ -820,7 +820,7 @@ int thttpd_main(int argc, char **argv) */ if (conn->conn_state != CNST_SENDING) - { + { break; } } diff --git a/apps/netutils/thttpd/thttpd_cgi.c b/apps/netutils/thttpd/thttpd_cgi.c index 9e63b25b4..1c931bb22 100644 --- a/apps/netutils/thttpd/thttpd_cgi.c +++ b/apps/netutils/thttpd/thttpd_cgi.c @@ -530,7 +530,7 @@ static inline int cgi_interpose_output(struct cgi_conn_s *cc) return 1; } - /* Figure out the status. Look for a Status: or Location: header; else if + /* Figure out the status. Look for a Status: or Location: header; else if * there's an HTTP header line, get it from there; else default to 200. */ @@ -811,7 +811,7 @@ static int cgi_child(int argc, char **argv) cc->rdfd = pipefd[0]; close(pipefd[1]); - + if (ret < 0) { nlldbg("STDOUT dup2: %d\n", errno); diff --git a/apps/netutils/thttpd/timers.c b/apps/netutils/thttpd/timers.c index dc94306b0..cd97cb3f8 100644 --- a/apps/netutils/thttpd/timers.c +++ b/apps/netutils/thttpd/timers.c @@ -293,7 +293,7 @@ void tmr_run(struct timeval *now) { next = tmr->next; - /* Since the lists are sorted, as soon as we find a timer * that isn'tmr + /* Since the lists are sorted, as soon as we find a timer * that isn'tmr * ready yet, we can go on to the next list */ |