Changeset fd16f5b5 in rtems

Timestamp:

06/01/00 21:50:37 (24 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Children:

19f4540e

Parents:

e89694e

Message:

Patch from Keith Outwater <vac4050@…> to rename
webserver trace() routine to goahead_trace() to avoid name conflicts
with ncurses.

Location:

c/src/libnetworking/rtems_webserver

Files:

• balloc.c (modified) (5 diffs)
• ejlex.c (modified) (1 diff)
• handler.c (modified) (1 diff)
• uemf.c (modified) (1 diff)
• uemf.h (modified) (1 diff)
• webs.c (modified) (3 diffs)

c/src/libnetworking/rtems_webserver/balloc.c

@@ -225 +225 @@
                         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;
@@ -237 +237 @@
 
                 } 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;
@@ -287 +287 @@
  */
                         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;
@@ -301 +301 @@
 
                 } 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;
                 }
@@ -578 +578 @@
         gvsnprintf(&buf, VALUE_MAX_STRING, fmt, args);
         va_end(args);
-        trace(0, buf);
+        goahead_trace(0, buf);
         if (buf) {
                 bfree(B_L, buf);

c/src/libnetworking/rtems_webserver/ejlex.c

@@ -190 +190 @@
 {
         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;
 }

c/src/libnetworking/rtems_webserver/handler.c

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

c/src/libnetworking/rtems_webserver/uemf.c

@@ -48 +48 @@
  */
 
-void trace(int level, char_t *afmt, ...)
+void goahead_trace(int level, char_t *afmt, ...)
 {
 #if DEBUG

c/src/libnetworking/rtems_webserver/uemf.h

@@ -650 +650 @@
 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);

c/src/libnetworking/rtems_webserver/webs.c

@@ -194 +194 @@
                 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);
 
 /*
@@ -270 +270 @@
  */
         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;
 }
@@ -1145 +1145 @@
         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);