forked from Imagelibrary/rtems
Warnings removed. Still don't know what to do about the pragma
pack warnings in uemf.h.
This commit is contained in:
@@ -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;
|
||||
|
||||
|
||||
@@ -73,7 +73,7 @@ static int compile(char_t *fileList, char_t *prefix)
|
||||
char_t file[FNAMESIZE];
|
||||
char_t *cp;
|
||||
char buf[512];
|
||||
unsigned char *p;
|
||||
char *p;
|
||||
int j, i, len, fd, nFile;
|
||||
|
||||
/*
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -73,7 +73,7 @@ static int compile(char_t *fileList, char_t *prefix)
|
||||
char_t file[FNAMESIZE];
|
||||
char_t *cp;
|
||||
char buf[512];
|
||||
unsigned char *p;
|
||||
char *p;
|
||||
int j, i, len, fd, nFile;
|
||||
|
||||
/*
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user