diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-10-27 13:58:58 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-10-27 13:58:58 +0000 |
| commit | 3f4b575df0b2ad83bb57b1fa4bfbe5f37f8abcac (patch) | |
| tree | 090e2d665b704c2b4e215e255e9d2eb066d015bb /c/src/libnetworking/rtems_webserver | |
| parent | Patch from Emmanuel Raguet <raguet@crf.canon.fr> and Eric Valette (diff) | |
| download | rtems-3f4b575df0b2ad83bb57b1fa4bfbe5f37f8abcac.tar.bz2 | |
Warnings removed. Still don't know what to do about the pragma
pack warnings in uemf.h.
Diffstat (limited to 'c/src/libnetworking/rtems_webserver')
| -rw-r--r-- | c/src/libnetworking/rtems_webserver/socket.c | 7 | ||||
| -rw-r--r-- | c/src/libnetworking/rtems_webserver/webcomp.c | 8 | ||||
| -rw-r--r-- | c/src/libnetworking/rtems_webserver/webmain.c | 11 |
3 files changed, 16 insertions, 10 deletions
diff --git a/c/src/libnetworking/rtems_webserver/socket.c b/c/src/libnetworking/rtems_webserver/socket.c index 996255081d..101a1dbcc1 100644 --- a/c/src/libnetworking/rtems_webserver/socket.c +++ b/c/src/libnetworking/rtems_webserver/socket.c @@ -209,7 +209,7 @@ static void socketAccept(socket_t* sp) { struct sockaddr_in addr; socket_t *nsp; - size_t len; + int len; int newSock, nid; a_assert(sp); @@ -980,9 +980,8 @@ static int socketNonBlock(socket_t *sp) * Duplicate stdin and stdout */ -int DuplicateStdFile (int sid){ - int i; - +int DuplicateStdFile (int sid) +{ if (0 != dup2(socketList[sid]->sock, 0) || 1 != dup2(socketList[sid]->sock, 1)) return -1; diff --git a/c/src/libnetworking/rtems_webserver/webcomp.c b/c/src/libnetworking/rtems_webserver/webcomp.c index 90767da01f..d642a144c0 100644 --- a/c/src/libnetworking/rtems_webserver/webcomp.c +++ b/c/src/libnetworking/rtems_webserver/webcomp.c @@ -73,8 +73,8 @@ static int compile(char_t *fileList, char_t *prefix) char_t file[FNAMESIZE]; char_t *cp; char buf[512]; - unsigned char *p; - int j, i, len, fd, nFile; + char *p; + int j, i, len, fd, nFile; /* * Open list of files @@ -159,8 +159,8 @@ static int compile(char_t *fileList, char_t *prefix) fprintf(stdout, " { T(\"/%s\"), 0, 0 },\n", cp); continue; } - fprintf(stdout, " { T(\"/%s\"), page_%d, %d },\n", cp, nFile, - sbuf.st_size); + fprintf(stdout, " { T(\"/%s\"), page_%d, %ld },\n", cp, nFile, + (long) sbuf.st_size); nFile++; } fclose(lp); diff --git a/c/src/libnetworking/rtems_webserver/webmain.c b/c/src/libnetworking/rtems_webserver/webmain.c index 9c12cd394c..f61b649ced 100644 --- a/c/src/libnetworking/rtems_webserver/webmain.c +++ b/c/src/libnetworking/rtems_webserver/webmain.c @@ -1,9 +1,11 @@ /* - * main.c -- Main program for the GoAhead WebServer (LINUX version) + * main.c -- Main program for the GoAhead WebServer (RTEMS version) * * Copyright (c) Go Ahead Software Inc., 1995-1999. All Rights Reserved. * * See the file "license.txt" for usage and redistribution license requirements + * + * $Id$ */ /******************************** Description *********************************/ @@ -21,6 +23,8 @@ #include <sys/time.h> #include <pthread.h> +#include <rtems/error.h> + /*********************************** Locals ***********************************/ /* * Change configuration here @@ -63,7 +67,7 @@ static void rtems_httpd_daemon(); /*********************************** Code *************************************/ /* - * Main -- entry point from LINUX + * Main -- entry point from RTEMS */ int rtems_initialize_webserver() { @@ -269,7 +273,10 @@ static void formTest(webs_t wp, char_t *path, char_t *query) void *emfCreateTimer(int delay, void (*routine)(long arg), long arg) { +/* this variable is only used in the if'ed 0 section below */ +#if 0 struct sigaction act; +#endif struct itimerspec its = { {0,0}, {0,0} }; struct sigevent se; int status; |