diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-06-01 21:50:37 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-06-01 21:50:37 +0000 |
commit | fd16f5b5877923ceca7b07ebbd4ec7625fc5c384 (patch) | |
tree | 6e42ca44f73504d525282e5ead9f16da26a5499e /c | |
parent | Distributed the preinstall of the header files to the directories (diff) | |
download | rtems-fd16f5b5877923ceca7b07ebbd4ec7625fc5c384.tar.bz2 |
Patch from Keith Outwater <vac4050@cae597.rsc.raytheon.com> to rename
webserver trace() routine to goahead_trace() to avoid name conflicts
with ncurses.
Diffstat (limited to 'c')
-rw-r--r-- | c/src/libnetworking/rtems_webserver/balloc.c | 10 | ||||
-rw-r--r-- | c/src/libnetworking/rtems_webserver/ejlex.c | 2 | ||||
-rw-r--r-- | c/src/libnetworking/rtems_webserver/handler.c | 2 | ||||
-rw-r--r-- | c/src/libnetworking/rtems_webserver/uemf.c | 2 | ||||
-rw-r--r-- | c/src/libnetworking/rtems_webserver/uemf.h | 2 | ||||
-rw-r--r-- | c/src/libnetworking/rtems_webserver/webs.c | 6 |
6 files changed, 12 insertions, 12 deletions
diff --git a/c/src/libnetworking/rtems_webserver/balloc.c b/c/src/libnetworking/rtems_webserver/balloc.c index 20612ed148..f2dae27867 100644 --- a/c/src/libnetworking/rtems_webserver/balloc.c +++ b/c/src/libnetworking/rtems_webserver/balloc.c @@ -224,7 +224,7 @@ void *balloc(B_ARGS_DEC, int size) #endif bp = (bType*) malloc(memSize); if (bp == NULL) { - trace(0, T("B: malloc failed for %s:%d, size %d\n"), + goahead_trace(0, T("B: malloc failed for %s:%d, size %d\n"), B_ARGS, memSize); return NULL; } @@ -236,7 +236,7 @@ void *balloc(B_ARGS_DEC, int size) #endif } else { - trace(0, T("B: balloc failed for %s:%d, size %d\n"), + goahead_trace(0, T("B: balloc failed for %s:%d, size %d\n"), B_ARGS, memSize); return NULL; } @@ -286,7 +286,7 @@ void *balloc(B_ARGS_DEC, int size) * Nothing left on the primary free list, so malloc a new block */ if ((bp = (bType*) malloc(memSize)) == NULL) { - trace(0, T("B: malloc failed for %s:%d size %d\n"), + goahead_trace(0, T("B: malloc failed for %s:%d size %d\n"), B_ARGS, memSize); return NULL; } @@ -300,7 +300,7 @@ void *balloc(B_ARGS_DEC, int size) bp->flags = B_MALLOCED; } else { - trace(0, T("B: alloc failed for %s:%d size %d\n"), B_ARGS, size); + goahead_trace(0, T("B: alloc failed for %s:%d size %d\n"), B_ARGS, size); return NULL; } } @@ -577,7 +577,7 @@ static void bstatsWrite(int handle, char_t *fmt, ...) buf = NULL; gvsnprintf(&buf, VALUE_MAX_STRING, fmt, args); va_end(args); - trace(0, buf); + goahead_trace(0, buf); if (buf) { bfree(B_L, buf); } diff --git a/c/src/libnetworking/rtems_webserver/ejlex.c b/c/src/libnetworking/rtems_webserver/ejlex.c index 67e1504bd7..091d17411b 100644 --- a/c/src/libnetworking/rtems_webserver/ejlex.c +++ b/c/src/libnetworking/rtems_webserver/ejlex.c @@ -189,7 +189,7 @@ void ejLexFreeInputState(ej_t* ep, ejinput_t* state) int ejLexGetToken(ej_t* ep, int state) { ep->tid = getLexicalToken(ep, state); - trace(7, T("ejGetToken: %d, \"%s\"\n"), ep->tid, ep->token); + goahead_trace(7, T("ejGetToken: %d, \"%s\"\n"), ep->tid, ep->token); return ep->tid; } diff --git a/c/src/libnetworking/rtems_webserver/handler.c b/c/src/libnetworking/rtems_webserver/handler.c index d481ec3c0c..fb42d2d097 100644 --- a/c/src/libnetworking/rtems_webserver/handler.c +++ b/c/src/libnetworking/rtems_webserver/handler.c @@ -264,7 +264,7 @@ int websUrlHandlerRequest(webs_t wp) return 1; } if (!websValid(wp)) { - trace(0, + goahead_trace(0, T("webs: handler %s called websDone, but didn't return 1\n"), sp->urlPrefix); return 1; diff --git a/c/src/libnetworking/rtems_webserver/uemf.c b/c/src/libnetworking/rtems_webserver/uemf.c index 8a6675f944..a9302f989c 100644 --- a/c/src/libnetworking/rtems_webserver/uemf.c +++ b/c/src/libnetworking/rtems_webserver/uemf.c @@ -47,7 +47,7 @@ void error(E_ARGS_DEC, int flags, char_t *fmt, ...) * Trace log. Customize this function to log trace output */ -void trace(int level, char_t *afmt, ...) +void goahead_trace(int level, char_t *afmt, ...) { #if DEBUG va_list args; diff --git a/c/src/libnetworking/rtems_webserver/uemf.h b/c/src/libnetworking/rtems_webserver/uemf.h index c63e75bd99..8945907dfb 100644 --- a/c/src/libnetworking/rtems_webserver/uemf.h +++ b/c/src/libnetworking/rtems_webserver/uemf.h @@ -649,7 +649,7 @@ extern sym_t *symEnter(sym_fd_t sd, char_t *name, value_t v, int arg); extern int symDelete(sym_fd_t sd, char_t *name); extern void symWalk(sym_fd_t sd, void (*fn)(sym_t *symp)); -extern void trace(int lev, char_t *fmt, ...); +extern void goahead_trace(int lev, char_t *fmt, ...); extern value_t valueInteger(long value); extern value_t valueString(char_t *value, int flags); diff --git a/c/src/libnetworking/rtems_webserver/webs.c b/c/src/libnetworking/rtems_webserver/webs.c index e198cc1e9a..cee03ee01c 100644 --- a/c/src/libnetworking/rtems_webserver/webs.c +++ b/c/src/libnetworking/rtems_webserver/webs.c @@ -193,7 +193,7 @@ int websOpenListen(int port, int retries) orig, port - 1); return -1; } - trace(0, T("webs: Listening for HTTP requests on port %d\n"), port); + goahead_trace(0, T("webs: Listening for HTTP requests on port %d\n"), port); /* * Determine the full URL address to access the home page for this web server @@ -269,7 +269,7 @@ static int websAccept(int sid, char *ipaddr, int port) * Arrange for a timeout to kill hung requests */ wp->timeout = emfCreateTimer(WEBS_TIMEOUT, websTimeout, (long) wp); - trace(5, T("webs: accept request\n")); + goahead_trace(5, T("webs: accept request\n")); return 0; } @@ -1144,7 +1144,7 @@ int websWrite(webs_t wp, char_t* fmt, ...) buf = NULL; rc = 0; if (gvsnprintf(&buf, WEBS_BUFSIZE, fmt, vargs) >= WEBS_BUFSIZE) { - trace(0, T("webs: websWrite lost data, buffer overflow\n")); + goahead_trace(0, T("webs: websWrite lost data, buffer overflow\n")); } va_end(vargs); a_assert(buf); |