diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-12-02 11:00:38 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-12-02 11:00:38 +0000 |
commit | 086442b7b1504d636364792d67178ea6ec861049 (patch) | |
tree | acaa303e3d3e1052b1f7b7cab41c54502012d917 /cpukit | |
parent | 2009-12-02 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
download | rtems-086442b7b1504d636364792d67178ea6ec861049.tar.bz2 |
Whitespace removal.
Diffstat (limited to 'cpukit')
-rw-r--r-- | cpukit/shttpd/cgi.c | 4 | ||||
-rw-r--r-- | cpukit/shttpd/compat_unix.c | 2 | ||||
-rw-r--r-- | cpukit/shttpd/compat_win32.c | 16 | ||||
-rw-r--r-- | cpukit/shttpd/compat_wince.c | 4 | ||||
-rw-r--r-- | cpukit/shttpd/compat_wince.h | 2 | ||||
-rw-r--r-- | cpukit/shttpd/config.c | 2 | ||||
-rw-r--r-- | cpukit/shttpd/log.c | 6 | ||||
-rw-r--r-- | cpukit/shttpd/md5.c | 2 | ||||
-rw-r--r-- | cpukit/shttpd/shttpd.c | 6 |
9 files changed, 22 insertions, 22 deletions
diff --git a/cpukit/shttpd/cgi.c b/cpukit/shttpd/cgi.c index 771789195c..98d83db241 100644 --- a/cpukit/shttpd/cgi.c +++ b/cpukit/shttpd/cgi.c @@ -119,7 +119,7 @@ add_http_headers_to_env(struct env_block *b, const char *s, int len) /* Find where this header ends. Remember where value starts */ for (p = s, v = NULL; p < e && *p != '\n'; p++) - if (v == NULL && *p == ':') + if (v == NULL && *p == ':') v = p; /* 2 null terminators and "HTTP_" */ @@ -186,7 +186,7 @@ prepare_environment(const struct conn *c, const char *prog, addenv(blk, "PATH_TRANSLATED=%s", prog); if (h->ct.v_vec.len > 0) - addenv(blk, "CONTENT_TYPE=%.*s", + addenv(blk, "CONTENT_TYPE=%.*s", h->ct.v_vec.len, h->ct.v_vec.ptr); if (c->query != NULL) diff --git a/cpukit/shttpd/compat_unix.c b/cpukit/shttpd/compat_unix.c index 649d0c8f21..819361fd8c 100644 --- a/cpukit/shttpd/compat_unix.c +++ b/cpukit/shttpd/compat_unix.c @@ -10,7 +10,7 @@ #include "defs.h" -void +void set_close_on_exec(int fd) { (void) fcntl(fd, F_SETFD, FD_CLOEXEC); diff --git a/cpukit/shttpd/compat_win32.c b/cpukit/shttpd/compat_win32.c index 43078e48d9..ee1221e7a2 100644 --- a/cpukit/shttpd/compat_win32.c +++ b/cpukit/shttpd/compat_win32.c @@ -508,19 +508,19 @@ WinMain(HINSTANCE h, HINSTANCE prev, char *cmdline, int show) hIcon = LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(ID_ICON)); if (hIcon == NULL) hIcon = LoadIcon(NULL, IDI_APPLICATION); - cls.lpfnWndProc = (WNDPROC) WindowProc; + cls.lpfnWndProc = (WNDPROC) WindowProc; cls.hIcon = hIcon; - cls.lpszClassName = "shttpd v." VERSION; + cls.lpszClassName = "shttpd v." VERSION; - if (!RegisterClass(&cls)) + if (!RegisterClass(&cls)) elog(E_FATAL, NULL, "RegisterClass: %d", ERRNO); else if ((hWnd = CreateWindow(cls.lpszClassName, "",WS_OVERLAPPEDWINDOW, 0, 0, 0, 0, NULL, NULL, NULL, ctx)) == NULL) elog(E_FATAL, NULL, "CreateWindow: %d", ERRNO); - while (GetMessage(&msg, (HWND) NULL, 0, 0)) { - TranslateMessage(&msg); - DispatchMessage(&msg); + while (GetMessage(&msg, (HWND) NULL, 0, 0)) { + TranslateMessage(&msg); + DispatchMessage(&msg); } return (0); @@ -534,7 +534,7 @@ fix_directory_separators(char *path) if (*path == '/') *path = '\\'; if (*path == '\\') - while (path[1] == '\\' || path[1] == '/') + while (path[1] == '\\' || path[1] == '/') (void) memmove(path + 1, path + 2, strlen(path + 2) + 1); } @@ -715,7 +715,7 @@ closedir(DIR *dir) free(dir); } - if (result == -1) + if (result == -1) errno = EBADF; return (result); diff --git a/cpukit/shttpd/compat_wince.c b/cpukit/shttpd/compat_wince.c index 36702f6d4b..edf8da21fa 100644 --- a/cpukit/shttpd/compat_wince.c +++ b/cpukit/shttpd/compat_wince.c @@ -860,7 +860,7 @@ The century, that is, the year divided by 100 then truncated. For 4-digit years, the result is zero-padded and exactly two characters; but for other years, there may a negative sign or more digits. In this way, `<<%C%y>>' is equivalent to `<<%Y>>'. [tm_year] - + o %d The day of the month, formatted with two digits (from `<<01>>' to `<<31>>'). [tm_mday] @@ -892,7 +892,7 @@ includes January 4th, and begin on Mondays. Therefore, if January 1st, 2nd, or 3rd falls on a Sunday, that day and earlier belong to the last week of the previous year; and if December 29th, 30th, or 31st falls on Monday, that day and later belong to week 1 of the next year. For -consistency with %Y, it always has at least four characters. +consistency with %Y, it always has at least four characters. Example: "%G" for Saturday 2nd January 1999 gives "1998", and for Tuesday 30th December 1997 gives "1998". [tm_year, tm_wday, tm_yday] diff --git a/cpukit/shttpd/compat_wince.h b/cpukit/shttpd/compat_wince.h index 651ec507cd..02f655707d 100644 --- a/cpukit/shttpd/compat_wince.h +++ b/cpukit/shttpd/compat_wince.h @@ -97,7 +97,7 @@ struct _stat { #define S_IFDIR 0040000 #define S_IFREG 0100000 #define S_IEXEC 0000100 -#define S_IWRITE 0000200 +#define S_IWRITE 0000200 #define S_IREAD 0000400 #define _S_IFDIR S_IFDIR /* MSVCRT compatibilit */ diff --git a/cpukit/shttpd/config.c b/cpukit/shttpd/config.c index 2adfb857de..92793d912c 100644 --- a/cpukit/shttpd/config.c +++ b/cpukit/shttpd/config.c @@ -209,7 +209,7 @@ initialize_context(struct shttpd_ctx *ctx, const char *config_file, elog(E_FATAL,0,"init_ctx: bad line: [%s]",line); if ((opt = find_option(0, var)) == NULL) - elog(E_FATAL, NULL, + elog(E_FATAL, NULL, "set_option: unknown variable [%s]", var); set_option(opt, val, tmpvars); } diff --git a/cpukit/shttpd/log.c b/cpukit/shttpd/log.c index ee87731373..4786daec1e 100644 --- a/cpukit/shttpd/log.c +++ b/cpukit/shttpd/log.c @@ -62,17 +62,17 @@ elog(int flags, struct conn *c, const char *fmt, ...) } /* - * HACK: m68k-gcc <= 4.2.1 ICEs on the snprintf below for some + * HACK: m68k-gcc <= 4.2.1 ICEs on the snprintf below for some * coldfire variants for yet unknown reasons. * C.f.: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=32307 - + * T.S, 2008/3/25 -- 4.2.3 still has this problem */ #if defined(__GNUC__) && \ ( (__GNUC__ < 4 ) || \ ( (__GNUC__ == 4 ) && (__GNUC_MINOR__ < 2 ) ) || \ ( (__GNUC__ == 4 ) && (__GNUC_MINOR__ == 2 ) && (__GNUC_PATCHLEVEL__ <= 3 ) ) ) -#if defined(__mcoldfire__) +#if defined(__mcoldfire__) #define SPLIT_SNPRINTF 1 #endif /* __mcoldfire__ */ #endif /* __GNUC__ */ diff --git a/cpukit/shttpd/md5.c b/cpukit/shttpd/md5.c index ddd90e1302..4e9c4701d6 100644 --- a/cpukit/shttpd/md5.c +++ b/cpukit/shttpd/md5.c @@ -201,7 +201,7 @@ MD5Update(MD5_CTX *ctx, unsigned char const *buf, unsigned len) } /* - * Final wrapup - pad to 64-byte boundary with the bit pattern + * Final wrapup - pad to 64-byte boundary with the bit pattern * 1 0* (64-bit count of bits processed, MSB-first) */ void diff --git a/cpukit/shttpd/shttpd.c b/cpukit/shttpd/shttpd.c index c9bd0c69d3..7004e42945 100644 --- a/cpukit/shttpd/shttpd.c +++ b/cpukit/shttpd/shttpd.c @@ -135,7 +135,7 @@ stop_stream(struct stream *stream) stream->flags &= ~(FLAG_R | FLAG_W | FLAG_ALWAYS_READY); DBG(("%d %s stopped. %lu of content data, %d now in a buffer", - stream->conn->rem.chan.sock, + stream->conn->rem.chan.sock, stream->io_class ? stream->io_class->name : "(null)", (unsigned long) stream->io.total, io_data_len(&stream->io))); } @@ -1030,7 +1030,7 @@ shttpd_poll(struct shttpd_ctx *ctx, int milliseconds) /* Read from the local end if it is ready */ if (io_space_len(&c->loc.io) && ((c->loc.flags & FLAG_ALWAYS_READY) - + #if !defined(NO_CGI) ||(c->loc.io_class == &io_cgi && FD_ISSET(c->loc.chan.fd, &read_set)) @@ -1043,7 +1043,7 @@ shttpd_poll(struct shttpd_ctx *ctx, int milliseconds) write_stream(&c->rem, &c->loc); if (io_data_len(&c->loc.io) > 0 && c->rem.io_class != NULL) - write_stream(&c->loc, &c->rem); + write_stream(&c->loc, &c->rem); if (c->rem.nread_last > 0) c->ctx->in += c->rem.nread_last; |