Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-05 15:15:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Patch from Keith Outwater <vac4050@cae597.rsc.raytheon.com> to rename

Browse Source 
webserver trace() routine to goahead_trace() to avoid name conflicts
with ncurses.
This commit is contained in:
Joel Sherrill
2000-06-01 21:50:37 +00:00
parent e89694ee7e
commit fd16f5b587
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
c/src/libnetworking/rtems_webserver/balloc.c
View File

@@ -224,7 +224,7 @@ void *balloc(B_ARGS_DEC, int size)
#endif #endif
bp = (bType*) malloc(memSize); bp = (bType*) malloc(memSize);
if (bp == NULL) { 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); B_ARGS, memSize);
return NULL; return NULL;
} }
@@ -236,7 +236,7 @@ void *balloc(B_ARGS_DEC, int size)
#endif #endif
} else { } 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); B_ARGS, memSize);
return NULL; 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 * Nothing left on the primary free list, so malloc a new block
*/ */
if ((bp = (bType*) malloc(memSize)) == NULL) { 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); B_ARGS, memSize);
return NULL; return NULL;
} }
@@ -300,7 +300,7 @@ void *balloc(B_ARGS_DEC, int size)
bp->flags = B_MALLOCED; bp->flags = B_MALLOCED;
} else { } 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; return NULL;
} }
} }
@@ -577,7 +577,7 @@ static void bstatsWrite(int handle, char_t *fmt, ...)
buf = NULL; buf = NULL;
gvsnprintf(&buf, VALUE_MAX_STRING, fmt, args); gvsnprintf(&buf, VALUE_MAX_STRING, fmt, args);
va_end(args); va_end(args);
trace(0, buf); goahead_trace(0, buf);
if (buf) { if (buf) {
bfree(B_L, buf); bfree(B_L, buf);
} }

2
c/src/libnetworking/rtems_webserver/ejlex.c
View File

@@ -189,7 +189,7 @@ void ejLexFreeInputState(ej_t* ep, ejinput_t* state)
int ejLexGetToken(ej_t* ep, int state) int ejLexGetToken(ej_t* ep, int state)
{ {
ep->tid = getLexicalToken(ep, 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; return ep->tid;
} }

2
c/src/libnetworking/rtems_webserver/handler.c
View File

@@ -264,7 +264,7 @@ int websUrlHandlerRequest(webs_t wp)
return 1; return 1;
} }
if (!websValid(wp)) { if (!websValid(wp)) {
trace(0, goahead_trace(0,
T("webs: handler %s called websDone, but didn't return 1\n"), T("webs: handler %s called websDone, but didn't return 1\n"),
sp->urlPrefix); sp->urlPrefix);
return 1; return 1;

2
c/src/libnetworking/rtems_webserver/uemf.c
View File

@@ -47,7 +47,7 @@ void error(E_ARGS_DEC, int flags, char_t *fmt, ...)
* Trace log. Customize this function to log trace output * 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 #if DEBUG
va_list args; va_list args;

2
c/src/libnetworking/rtems_webserver/uemf.h
View File

@@ -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 int symDelete(sym_fd_t sd, char_t *name);
extern void symWalk(sym_fd_t sd, void (*fn)(sym_t *symp)); 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 valueInteger(long value);
extern value_t valueString(char_t *value, int flags); extern value_t valueString(char_t *value, int flags);

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

@@ -193,7 +193,7 @@ int websOpenListen(int port, int retries)
orig, port - 1); orig, port - 1);
return -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 * 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 * Arrange for a timeout to kill hung requests
*/ */
wp->timeout = emfCreateTimer(WEBS_TIMEOUT, websTimeout, (long) wp); 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; return 0;
} }
@@ -1144,7 +1144,7 @@ int websWrite(webs_t wp, char_t* fmt, ...)
buf = NULL; buf = NULL;
rc = 0; rc = 0;
if (gvsnprintf(&buf, WEBS_BUFSIZE, fmt, vargs) >= WEBS_BUFSIZE) { 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); va_end(vargs);
a_assert(buf); a_assert(buf);