RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

Warnings removed. Still don't know what to do about the pragma

Browse Source 
pack warnings in uemf.h.
This commit is contained in:
Joel Sherrill
1999-10-27 13:58:58 +00:00
parent c1cdaa0ce8
commit 3f4b575df0
6 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
c/src/libnetworking/rtems_webserver/socket.c
View File

@@ -209,7 +209,7 @@ static void socketAccept(socket_t* sp)
{ {
struct sockaddr_in addr; struct sockaddr_in addr;
socket_t *nsp; socket_t *nsp;
size_t len; int len;
int newSock, nid; int newSock, nid;
a_assert(sp); a_assert(sp);
@@ -980,9 +980,8 @@ static int socketNonBlock(socket_t *sp)
* Duplicate stdin and stdout * Duplicate stdin and stdout
*/ */
int DuplicateStdFile (int sid){ int DuplicateStdFile (int sid)
int i; {
if (0 != dup2(socketList[sid]->sock, 0) || 1 != dup2(socketList[sid]->sock, 1)) if (0 != dup2(socketList[sid]->sock, 0) || 1 != dup2(socketList[sid]->sock, 1))
return -1; return -1;

6
c/src/libnetworking/rtems_webserver/webcomp.c
View File

@@ -73,7 +73,7 @@ static int compile(char_t *fileList, char_t *prefix)
char_t file[FNAMESIZE]; char_t file[FNAMESIZE];
char_t *cp; char_t *cp;
char buf[512]; char buf[512];
unsigned char *p; char *p;
int j, i, len, fd, nFile; 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); fprintf(stdout, " { T(\"/%s\"), 0, 0 },\n", cp);
continue; continue;
} }
fprintf(stdout, " { T(\"/%s\"), page_%d, %d },\n", cp, nFile, fprintf(stdout, " { T(\"/%s\"), page_%d, %ld },\n", cp, nFile,
sbuf.st_size); (long) sbuf.st_size);
nFile++; nFile++;
} }
fclose(lp); fclose(lp);

11
c/src/libnetworking/rtems_webserver/webmain.c
View File

@@ -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. * Copyright (c) Go Ahead Software Inc., 1995-1999. All Rights Reserved.
* *
* See the file "license.txt" for usage and redistribution license requirements * See the file "license.txt" for usage and redistribution license requirements
*
* $Id$
*/ */
/******************************** Description *********************************/ /******************************** Description *********************************/
@@ -21,6 +23,8 @@
#include <sys/time.h> #include <sys/time.h>
#include <pthread.h> #include <pthread.h>
#include <rtems/error.h>
/*********************************** Locals ***********************************/ /*********************************** Locals ***********************************/
/* /*
* Change configuration here * Change configuration here
@@ -63,7 +67,7 @@ static void rtems_httpd_daemon();
/*********************************** Code *************************************/ /*********************************** Code *************************************/
/* /*
* Main -- entry point from LINUX * Main -- entry point from RTEMS
*/ */
int rtems_initialize_webserver() 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) 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; struct sigaction act;
#endif
struct itimerspec its = { {0,0}, {0,0} }; struct itimerspec its = { {0,0}, {0,0} };
struct sigevent se; struct sigevent se;
int status; int status;

7
cpukit/httpd/socket.c
View File

@@ -209,7 +209,7 @@ static void socketAccept(socket_t* sp)
{ {
struct sockaddr_in addr; struct sockaddr_in addr;
socket_t *nsp; socket_t *nsp;
size_t len; int len;
int newSock, nid; int newSock, nid;
a_assert(sp); a_assert(sp);
@@ -980,9 +980,8 @@ static int socketNonBlock(socket_t *sp)
* Duplicate stdin and stdout * Duplicate stdin and stdout
*/ */
int DuplicateStdFile (int sid){ int DuplicateStdFile (int sid)
int i; {
if (0 != dup2(socketList[sid]->sock, 0) || 1 != dup2(socketList[sid]->sock, 1)) if (0 != dup2(socketList[sid]->sock, 0) || 1 != dup2(socketList[sid]->sock, 1))
return -1; return -1;

6
cpukit/httpd/webcomp.c
View File

@@ -73,7 +73,7 @@ static int compile(char_t *fileList, char_t *prefix)
char_t file[FNAMESIZE]; char_t file[FNAMESIZE];
char_t *cp; char_t *cp;
char buf[512]; char buf[512];
unsigned char *p; char *p;
int j, i, len, fd, nFile; 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); fprintf(stdout, " { T(\"/%s\"), 0, 0 },\n", cp);
continue; continue;
} }
fprintf(stdout, " { T(\"/%s\"), page_%d, %d },\n", cp, nFile, fprintf(stdout, " { T(\"/%s\"), page_%d, %ld },\n", cp, nFile,
sbuf.st_size); (long) sbuf.st_size);
nFile++; nFile++;
} }
fclose(lp); fclose(lp);

11
cpukit/httpd/webmain.c
View File

@@ -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. * Copyright (c) Go Ahead Software Inc., 1995-1999. All Rights Reserved.
* *
* See the file "license.txt" for usage and redistribution license requirements * See the file "license.txt" for usage and redistribution license requirements
*
* $Id$
*/ */
/******************************** Description *********************************/ /******************************** Description *********************************/
@@ -21,6 +23,8 @@
#include <sys/time.h> #include <sys/time.h>
#include <pthread.h> #include <pthread.h>
#include <rtems/error.h>
/*********************************** Locals ***********************************/ /*********************************** Locals ***********************************/
/* /*
* Change configuration here * Change configuration here
@@ -63,7 +67,7 @@ static void rtems_httpd_daemon();
/*********************************** Code *************************************/ /*********************************** Code *************************************/
/* /*
* Main -- entry point from LINUX * Main -- entry point from RTEMS
*/ */
int rtems_initialize_webserver() 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) 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; struct sigaction act;
#endif
struct itimerspec its = { {0,0}, {0,0} }; struct itimerspec its = { {0,0}, {0,0} };
struct sigevent se; struct sigevent se;
int status; int status;