From 257b238736a8ad7c4be12e434003170be66b2169 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 30 Jul 2008 09:59:26 +0000 Subject: Add missing prototypes. --- cpukit/httpd/emfdb.h | 2 +- cpukit/httpd/socket.c | 2 +- cpukit/httpd/uemf.c | 2 +- cpukit/httpd/uemf.h | 28 ++++++++++++++-------------- cpukit/httpd/um.h | 10 +++++----- cpukit/httpd/webmain.c | 12 ++++++------ cpukit/httpd/webs.c | 8 ++++---- cpukit/httpd/webs.h | 18 +++++++++--------- cpukit/httpd/wsIntrn.h | 24 ++++++++++++------------ 9 files changed, 53 insertions(+), 53 deletions(-) (limited to 'cpukit/httpd') diff --git a/cpukit/httpd/emfdb.h b/cpukit/httpd/emfdb.h index 882c1c80d2..5fd6e5a2d4 100644 --- a/cpukit/httpd/emfdb.h +++ b/cpukit/httpd/emfdb.h @@ -93,7 +93,7 @@ extern int dbSearchStr(int did, char_t *table, char_t *column, extern void dbZero(int did); -extern char_t *basicGetProductDir(); +extern char_t *basicGetProductDir(void); extern void basicSetProductDir(char_t *proddir); #endif /* _h_EMFDB */ diff --git a/cpukit/httpd/socket.c b/cpukit/httpd/socket.c index 430139bd68..f8c77868f0 100644 --- a/cpukit/httpd/socket.c +++ b/cpukit/httpd/socket.c @@ -983,7 +983,7 @@ int socketSetBlock(int sid, int on) * Return true if a readable socket has buffered data. - not public */ -int socketDontBlock() +int socketDontBlock(void) { socket_t *sp; int i; diff --git a/cpukit/httpd/uemf.c b/cpukit/httpd/uemf.c index ffe6a04cd1..106f8bc4c6 100644 --- a/cpukit/httpd/uemf.c +++ b/cpukit/httpd/uemf.c @@ -286,7 +286,7 @@ int errorOpen(char_t *pname) return 0; } -void errorClose() +void errorClose(void) { } diff --git a/cpukit/httpd/uemf.h b/cpukit/httpd/uemf.h index 2e5b76dafb..fa8c03e6c1 100644 --- a/cpukit/httpd/uemf.h +++ b/cpukit/httpd/uemf.h @@ -887,7 +887,7 @@ typedef struct { * */ -extern void bclose(); +extern void bclose(void); extern int bopen(void *buf, int bufsize, int flags); /* @@ -967,8 +967,8 @@ typedef void (emfSchedProc)(void *data, int id); extern int emfSchedCallback(int delay, emfSchedProc *proc, void *arg); extern void emfUnschedCallback(int id); extern void emfReschedCallback(int id, int delay); -extern void emfSchedProcess(); -extern int emfInstGet(); +extern void emfSchedProcess(void); +extern int emfInstGet(void); extern void emfInstSet(int inst); extern void error(E_ARGS_DEC, int flags, char_t *fmt, ...); extern void (*errorSetHandler(void (*function)(int etype, char_t *msg))) \ @@ -1023,7 +1023,7 @@ extern void ringqAddNull(ringq_t *rq); extern int scriptSetVar(int engine, char_t *var, char_t *value); extern int scriptEval(int engine, char_t *cmd, char_t **rslt, int chan); -extern void socketClose(); +extern void socketClose(void); extern void socketCloseConnection(int sid); extern void socketCreateHandler(int sid, int mask, socketHandler_t handler, int arg); @@ -1035,7 +1035,7 @@ extern int socketFlush(int sid); extern int socketGets(int sid, char_t **buf); extern int socketGetPort(int sid); extern int socketInputBuffered(int sid); -extern int socketOpen(); +extern int socketOpen(void); extern int socketOpenConnection(char *host, int port, socketAccept_t accept, int flags); extern void socketProcess(int hid); @@ -1050,7 +1050,7 @@ extern int socketGetBlock(int sid); extern int socketAlloc(char *host, int port, socketAccept_t accept, int flags); extern void socketFree(int sid); -extern int socketGetError(); +extern int socketGetError(void); extern socket_t *socketPtr(int sid); extern int socketWaitForEvent(socket_t *sp, int events, int *errCode); extern void socketRegisterInterest(socket_t *sp, int handlerMask); @@ -1069,8 +1069,8 @@ extern int symDelete(sym_fd_t sd, char_t *name); extern void symWalk(sym_fd_t sd, void (*fn)(sym_t *symp)); extern sym_t *symFirst(sym_fd_t sd); extern sym_t *symNext(sym_fd_t sd); -extern int symSubOpen(); -extern void symSubClose(); +extern int symSubOpen(void); +extern void symSubClose(void); extern void trace(int lev, char_t *fmt, ...); extern void traceRaw(char_t *buf); @@ -1085,25 +1085,25 @@ extern int vxchdir(char *dirname); extern unsigned int hextoi(char_t *hexstring); extern unsigned int gstrtoi(char_t *s); -extern time_t timeMsec(); +extern time_t timeMsec(void); extern char_t *ascToUni(char_t *ubuf, char *str, int nBytes); extern char *uniToAsc(char *buf, char_t *ustr, int nBytes); extern char_t *ballocAscToUni(char *cp, int alen); extern char *ballocUniToAsc(char_t *unip, int ulen); -extern char_t *basicGetHost(); -extern char_t *basicGetAddress(); -extern char_t *basicGetProduct(); +extern char_t *basicGetHost(void); +extern char_t *basicGetAddress(void); +extern char_t *basicGetProduct(void); extern void basicSetHost(char_t *host); extern void basicSetAddress(char_t *addr); extern int harnessOpen(char_t **argv); extern void harnessClose(int status); extern void harnessTesting(char_t *msg, ...); -extern void harnessPassed(); +extern void harnessPassed(void); extern void harnessFailed(int line); -extern int harnessLevel(); +extern int harnessLevel(void); #endif /* _h_UEMF */ diff --git a/cpukit/httpd/um.h b/cpukit/httpd/um.h index b520893275..3bf6cf1758 100644 --- a/cpukit/httpd/um.h +++ b/cpukit/httpd/um.h @@ -76,12 +76,12 @@ typedef enum { /* * umOpen() must be called before accessing User Management functions */ -extern int umOpen(); +extern int umOpen(void); /* * umClose() should be called before shutdown to free memory */ -extern void umClose(); +extern void umClose(void); /* * umCommit() persists the user management database @@ -101,7 +101,7 @@ extern int umAddUser(char_t *user, char_t *password, extern int umDeleteUser(char_t *user); -extern char_t *umGetFirstUser(); +extern char_t *umGetFirstUser(void); extern char_t *umGetNextUser(char_t *lastUser); extern bool_t umUserExists(char_t *user); @@ -126,7 +126,7 @@ extern int umAddGroup(char_t *group, short privilege, extern int umDeleteGroup(char_t *group); -extern char_t *umGetFirstGroup(); +extern char_t *umGetFirstGroup(void); extern char_t *umGetNextGroup(char_t *lastUser); extern bool_t umGroupExists(char_t *group); @@ -152,7 +152,7 @@ extern int umAddAccessLimit(char_t *url, accessMeth_t am, extern int umDeleteAccessLimit(char_t *url); -extern char_t *umGetFirstAccessLimit(); +extern char_t *umGetFirstAccessLimit(void); extern char_t *umGetNextAccessLimit(char_t *lastUser); /* diff --git a/cpukit/httpd/webmain.c b/cpukit/httpd/webmain.c index c9c0b9cc15..42a14c34a7 100644 --- a/cpukit/httpd/webmain.c +++ b/cpukit/httpd/webmain.c @@ -63,7 +63,7 @@ websTimer_t *tp; /****************************** Forward Declarations **************************/ -static int initWebs(); +static int initWebs(void); static int aspTest(int eid, webs_t wp, int argc, char_t **argv); static void formTest(webs_t wp, char_t *path, char_t *query); static int websHomePageHandler(webs_t wp, char_t *urlPrefix, char_t *webDir, @@ -71,16 +71,16 @@ static int websHomePageHandler(webs_t wp, char_t *urlPrefix, char_t *webDir, static void timerProc(int signo); #if B_STATS static void printMemStats(int handle, char_t *fmt, ...); -static void memLeaks(); +static void memLeaks(void); #endif static timer_t timer_id; -static void rtems_httpd_daemon(); +static void rtems_httpd_daemon(rtems_task_argument args); /*********************************** Code *************************************/ /* * Main -- entry point from RTEMS */ -int rtems_initialize_webserver() +int rtems_initialize_webserver(void) { rtems_status_code sc; rtems_id tid; @@ -113,7 +113,7 @@ int rtems_initialize_webserver() } static void -rtems_httpd_daemon() +rtems_httpd_daemon(rtems_task_argument args) { /* * Initialize the memory allocator. Allow use of malloc and start with a @@ -172,7 +172,7 @@ rtems_httpd_daemon() * Initialize the web server. */ -static int initWebs() +static int initWebs(void) { struct hostent* hp; struct in_addr intaddr; diff --git a/cpukit/httpd/webs.c b/cpukit/httpd/webs.c index 4465a72afe..94e0091a77 100644 --- a/cpukit/httpd/webs.c +++ b/cpukit/httpd/webs.c @@ -1987,7 +1987,7 @@ void websFree(webs_t wp) * Return the server address */ -char_t *websGetHost() +char_t *websGetHost(void) { return websHost; } @@ -1997,7 +1997,7 @@ char_t *websGetHost() * Return the the url to access the server. (ip address) */ -char_t *websGetIpaddrUrl() +char_t *websGetIpaddrUrl(void) { return websIpaddrUrl; } @@ -2007,7 +2007,7 @@ char_t *websGetIpaddrUrl() * Return the server address */ -char_t *websGetHostUrl() +char_t *websGetHostUrl(void) { return websHostUrl; } @@ -2017,7 +2017,7 @@ char_t *websGetHostUrl() * Return the listen port */ -int websGetPort() +int websGetPort(void) { return websPort; } diff --git a/cpukit/httpd/webs.h b/cpukit/httpd/webs.h index 9bc61ddf5e..90932b1452 100644 --- a/cpukit/httpd/webs.h +++ b/cpukit/httpd/webs.h @@ -136,7 +136,7 @@ extern int websAccept(int sid, char *ipaddr, int port, int listenSid); extern int websAspDefine(char_t *name, int (*fn)(int ejid, webs_t wp, int argc, char_t **argv)); extern int websAspRequest(webs_t wp, char_t *lpath); -extern void websCloseListen(); +extern void websCloseListen(void); extern int websDecode64(char_t *outbuf, char_t *string, int buflen); extern void websDecodeUrl(char_t *token, char_t *decoded, int len); extern void websDone(webs_t wp, int code); @@ -147,14 +147,14 @@ extern char_t *websErrorMsg(int code); extern void websFooter(webs_t wp); extern int websFormDefine(char_t *name, void (*fn)(webs_t wp, char_t *path, char_t *query)); -extern char_t *websGetDefaultDir(); -extern char_t *websGetDefaultPage(); -extern char_t *websGetHostUrl(); -extern char_t *websGetIpaddrUrl(); -extern char_t *websGetPassword(); -extern int websGetPort(); +extern char_t *websGetDefaultDir(void); +extern char_t *websGetDefaultPage(void); +extern char_t *websGetHostUrl(void); +extern char_t *websGetIpaddrUrl(void); +extern char_t *websGetPassword(void); +extern int websGetPort(void); extern char_t *websGetPublishDir(char_t *path, char_t **urlPrefix); -extern char_t *websGetRealm(); +extern char_t *websGetRealm(void); extern int websGetRequestBytes(webs_t wp); extern char_t *websGetRequestDir(webs_t wp); extern int websGetRequestFlags(webs_t wp); @@ -173,7 +173,7 @@ extern int websPageOpen(webs_t wp, char_t *lpath, char_t *path, extern void websPageClose(webs_t wp); extern int websPublish(char_t *urlPrefix, char_t *path); extern void websRedirect(webs_t wp, char_t *url); -extern void websSecurityDelete(); +extern void websSecurityDelete(void); extern int websSecurityHandler(webs_t wp, char_t *urlPrefix, char_t *webDir, int arg, char_t *url, char_t *path, char_t *query); diff --git a/cpukit/httpd/wsIntrn.h b/cpukit/httpd/wsIntrn.h index 9fb11f9937..9d143917e4 100644 --- a/cpukit/httpd/wsIntrn.h +++ b/cpukit/httpd/wsIntrn.h @@ -238,12 +238,12 @@ extern int websPort; /* Port number */ /******************************** Prototypes **********************************/ -extern int websAspOpen(); -extern void websAspClose(); -extern void websFormOpen(); -extern void websFormClose(); +extern int websAspOpen(void); +extern void websAspClose(void); +extern void websFormOpen(void); +extern void websFormClose(void); extern int websAspWrite(int ejid, webs_t wp, int argc, char_t **argv); -extern void websDefaultClose(); +extern void websDefaultClose(void); extern int websDefaultHandler(webs_t wp, char_t *urlPrefix, char_t *webDir, int arg, char_t *url, char_t *path, char_t *query); @@ -251,9 +251,9 @@ extern int websFormHandler(webs_t wp, char_t *urlPrefix, char_t *webDir, int arg, char_t *url, char_t *path, char_t *query); extern int websCgiHandler(webs_t wp, char_t *urlPrefix, char_t *webDir, int arg, char_t *url, char_t *path, char_t *query); -extern void websCgiCleanup(); +extern void websCgiCleanup(void); extern int websCheckCgiProc(int handle); -extern char_t *websGetCgiCommName(); +extern char_t *websGetCgiCommName(void); extern int websLaunchCgiProc(char_t *cgiPath, char_t **argp, char_t **envp, char_t *stdIn, char_t *stdOut); @@ -269,8 +269,8 @@ extern void websPageSeek(webs_t wp, long offset); extern int websPageStat(webs_t wp, char_t *lpath, char_t *path, websStatType *sbuf); extern int websPageIsDirectory(char_t *lpath); -extern int websRomOpen(); -extern void websRomClose(); +extern int websRomOpen(void); +extern void websRomClose(void); extern int websRomPageOpen(webs_t wp, char_t *path, int mode, int perm); extern void websRomPageClose(int fd); extern int websRomPageReadData(webs_t wp, char *buf, int len); @@ -281,10 +281,10 @@ extern void websSetRequestSocketHandler(webs_t wp, int mask, extern int websSolutionHandler(webs_t wp, char_t *urlPrefix, char_t *webDir, int arg, char_t *url, char_t *path, char_t *query); -extern void websUrlHandlerClose(); -extern int websUrlHandlerOpen(); +extern void websUrlHandlerClose(void); +extern int websUrlHandlerOpen(void); extern int websOpenServer(int port, int retries); -extern void websCloseServer(); +extern void websCloseServer(void); extern char_t* websGetDateString(websStatType* sbuf); extern int strcmpci(char_t* s1, char_t* s2); -- cgit v1.2.3