Remove non-portable references to syslog from apps/examples

7 files changed, 104 insertions, 129 deletions

diff --git a/apps/examples/poll/host.c b/apps/examples/poll/host.c
index 302cceb0f..3cd4095e2 100644
--- a/apps/examples/poll/host.c
+++ b/apps/examples/poll/host.c
@@ -89,7 +89,7 @@ int main(int argc, char **argv, char **envp)
   sockfd = socket(PF_INET, SOCK_STREAM, 0);
   if (sockfd < 0)
     {
-      message("client socket failure %d\n", errno);
+      printf("client socket failure %d\n", errno);
       goto errout_with_outbufs;
     }
 
@@ -99,13 +99,13 @@ int main(int argc, char **argv, char **envp)
   myaddr.sin_port        = htons(LISTENER_PORT);
   myaddr.sin_addr.s_addr = inet_addr(TARGETIP);
 
-  message("client: Connecting to %s...\n", TARGETIP);
+  printf("client: Connecting to %s...\n", TARGETIP);
   if (connect( sockfd, (struct sockaddr*)&myaddr, sizeof(struct sockaddr_in)) < 0)
     {
-      message("client: connect failure: %d\n", errno);
+      printf("client: connect failure: %d\n", errno);
       goto errout_with_socket;
     }
-  message("client: Connected\n");
+  printf("client: Connected\n");
 
   /* Then send and receive messages */
 
@@ -114,50 +114,50 @@ int main(int argc, char **argv, char **envp)
       sprintf(outbuf, "Remote message %d", i);
       len = strlen(outbuf);
 
-      message("client: Sending '%s' (%d bytes)\n", outbuf, len);
+      printf("client: Sending '%s' (%d bytes)\n", outbuf, len);
       nbytessent = send(sockfd, outbuf, len, 0);
-      message("client: Sent %d bytes\n", nbytessent);
+      printf("client: Sent %d bytes\n", nbytessent);
 
       if (nbytessent < 0)
         {
-          message("client: send failed: %d\n", errno);
+          printf("client: send failed: %d\n", errno);
           goto errout_with_socket;
         }
       else if (nbytessent != len)
         {
-          message("client: Bad send length: %d Expected: %d\n", nbytessent, len);
+          printf("client: Bad send length: %d Expected: %d\n", nbytessent, len);
           goto errout_with_socket;
         }
 
-      message("client: Receiving...\n");
+      printf("client: Receiving...\n");
       nbytesrecvd = recv(sockfd, inbuf, IOBUFFER_SIZE, 0);
 
       if (nbytesrecvd < 0)
         {
-          message("client: recv failed: %d\n", errno);
+          printf("client: recv failed: %d\n", errno);
           goto errout_with_socket;
         }
       else if (nbytesrecvd == 0)
         {
-          message("client: The server broke the connections\n");
+          printf("client: The server broke the connections\n");
           goto errout_with_socket;
         }
 
       inbuf[nbytesrecvd] = '\0';
-      message("client: Received '%s' (%d bytes)\n", inbuf, nbytesrecvd);
+      printf("client: Received '%s' (%d bytes)\n", inbuf, nbytesrecvd);
 
       if (nbytesrecvd != len)
         {
-          message("client: Bad recv length: %d Expected: %d\n", nbytesrecvd, len);
+          printf("client: Bad recv length: %d Expected: %d\n", nbytesrecvd, len);
           goto errout_with_socket;
         }
       else if (memcmp(inbuf, outbuf, len) != 0)
         {
-          message("client: Received outbuf does not match sent outbuf\n");
+          printf("client: Received outbuf does not match sent outbuf\n");
           goto errout_with_socket;
         }
 
-      message("client: Sleeping\n");
+      printf("client: Sleeping\n");
       sleep(8);
     }
 
diff --git a/apps/examples/poll/net_listener.c b/apps/examples/poll/net_listener.c
index 841d7d95c..996e63c3b 100644
--- a/apps/examples/poll/net_listener.c
+++ b/apps/examples/poll/net_listener.c
@@ -94,7 +94,7 @@ struct net_listener_s
 
 static bool net_closeclient(struct net_listener_s *nls, int sd)
 {
-  message("net_listener: Closing host side connection sd=%d\n", sd);
+  printf("net_listener: Closing host side connection sd=%d\n", sd);
   close(sd);
   FD_CLR(sd, &nls->master);
 
@@ -123,13 +123,13 @@ static inline bool net_incomingdata(struct net_listener_s *nls, int sd)
   for (;;)
 #endif
     {
-      message("net_listener: Read data from sd=%d\n", sd);
+      printf("net_listener: Read data from sd=%d\n", sd);
       ret = recv(sd, nls->buffer, IOBUFFER_SIZE, 0);
       if (ret < 0)
         {
           if (errno != EINTR)
             {
-              message("net_listener: recv failed sd=%d: %d\n", sd, errno);
+              printf("net_listener: recv failed sd=%d: %d\n", sd, errno);
               if (errno != EAGAIN)
                 {
                   net_closeclient(nls, sd);
@@ -139,14 +139,14 @@ static inline bool net_incomingdata(struct net_listener_s *nls, int sd)
         }
       else if (ret == 0)
         {
-          message("net_listener: Client connection lost sd=%d\n", sd);
+          printf("net_listener: Client connection lost sd=%d\n", sd);
           net_closeclient(nls, sd);
           return false;
         }
       else
         {
           nls->buffer[ret]='\0';
-          message("poll_listener: Read '%s' (%d bytes)\n", nls->buffer, ret);
+          printf("poll_listener: Read '%s' (%d bytes)\n", nls->buffer, ret);
 
           /* Echo the data back to the client */
 
@@ -157,7 +157,7 @@ static inline bool net_incomingdata(struct net_listener_s *nls, int sd)
                 {
                   if (errno != EINTR)
                     {
-                       message("net_listener: Send failed sd=%d: %d\n", sd, errno);
+                       printf("net_listener: Send failed sd=%d: %d\n", sd, errno);
                        net_closeclient(nls, sd);
                        return false;
                     }
@@ -187,12 +187,12 @@ static inline bool net_connection(struct net_listener_s *nls)
   for (;;)
 #endif
     {
-      message("net_listener: Accepting new connection on sd=%d\n", nls->listensd);
+      printf("net_listener: Accepting new connection on sd=%d\n", nls->listensd);
 
       sd = accept(nls->listensd, NULL, NULL);
       if (sd < 0)
         {
-          message("net_listener: accept failed: %d\n", errno);
+          printf("net_listener: accept failed: %d\n", errno);
 
           if (errno != EINTR)
             {
@@ -203,7 +203,7 @@ static inline bool net_connection(struct net_listener_s *nls)
         {
           /* Add the new connection to the master set */
 
-          message("net_listener: Connection accepted for sd=%d\n", sd);
+          printf("net_listener: Connection accepted for sd=%d\n", sd);
 
           FD_SET(sd, &nls->master);
           if (sd > nls->mxsd)
@@ -227,11 +227,11 @@ static inline bool net_mksocket(struct net_listener_s *nls)
 
   /* Create a listening socket */
 
-  message("net_listener: Initializing listener socket\n");
+  printf("net_listener: Initializing listener socket\n");
   nls->listensd = socket(AF_INET, SOCK_STREAM, 0);
   if (nls->listensd < 0)
     {
-      message("net_listener: socket failed: %d\n", errno);
+      printf("net_listener: socket failed: %d\n", errno);
       return false;
     }
 
@@ -241,7 +241,7 @@ static inline bool net_mksocket(struct net_listener_s *nls)
   ret = setsockopt(nls->listensd, SOL_SOCKET,  SO_REUSEADDR, (char*)&value, sizeof(int));
   if (ret < 0)
     {
-      message("net_listener: setsockopt failed: %d\n", errno);
+      printf("net_listener: setsockopt failed: %d\n", errno);
       close(nls->listensd);
       return false;
     }
@@ -252,7 +252,7 @@ static inline bool net_mksocket(struct net_listener_s *nls)
   ret = ioctl(nls->listensd, FIONBIO, (char *)&value);
   if (ret < 0)
     {
-      message("net_listener: ioctl failed: %d\n", errno);
+      printf("net_listener: ioctl failed: %d\n", errno);
       close(nls->listensd);
       return false;
     }
@@ -267,7 +267,7 @@ static inline bool net_mksocket(struct net_listener_s *nls)
   ret = bind(nls->listensd, (struct sockaddr *)&nls->addr, sizeof(struct sockaddr_in));
   if (ret < 0)
     {
-      message("net_listener: bind failed: %d\n", errno);
+      printf("net_listener: bind failed: %d\n", errno);
       close(nls->listensd);
       return false;
     }
@@ -277,7 +277,7 @@ static inline bool net_mksocket(struct net_listener_s *nls)
   ret = listen(nls->listensd, 32);
   if (ret < 0)
     {
-      message("net_listener: bind failed: %d\n", errno);
+      printf("net_listener: bind failed: %d\n", errno);
       close(nls->listensd);
       return false;
     }
@@ -372,12 +372,12 @@ void *net_listener(pthread_addr_t pvarg)
     {
       /* Wait on select */
 
-      message("net_listener: Calling select(), listener sd=%d\n", nls.listensd);
+      printf("net_listener: Calling select(), listener sd=%d\n", nls.listensd);
       memcpy(&nls.working, &nls.master, sizeof(fd_set));
       ret = select(nls.mxsd + 1, (FAR fd_set*)&nls.working, (FAR fd_set*)NULL, (FAR fd_set*)NULL, &timeout);
       if (ret < 0)
         {
-          message("net_listener: select failed: %d\n", errno);
+          printf("net_listener: select failed: %d\n", errno);
           break;
         }
 
@@ -385,7 +385,7 @@ void *net_listener(pthread_addr_t pvarg)
 
       if (ret == 0)
         {
-          message("net_listener: Timeout\n");
+          printf("net_listener: Timeout\n");
           continue;
         }
 
@@ -400,7 +400,7 @@ void *net_listener(pthread_addr_t pvarg)
             {
               /* Yes, is it our listener? */
 
-              message("net_listener: Activity on sd=%d\n", i);
+              printf("net_listener: Activity on sd=%d\n", i);
 
               nsds--;
               if (i == nls.listensd)
diff --git a/apps/examples/poll/net_reader.c b/apps/examples/poll/net_reader.c
index beecee275..d50181bf7 100644
--- a/apps/examples/poll/net_reader.c
+++ b/apps/examples/poll/net_reader.c
@@ -155,23 +155,23 @@ static void net_receive(int sd)
 
       if (ret < 0)
         {
-          message("net_reader: select failed: %d\n", errno);
+          printf("net_reader: select failed: %d\n", errno);
           return;
         }
       else if (ret == 0)
         {
-          message("net_reader: Timeout\n");
+          printf("net_reader: Timeout\n");
         }
       else
         {
-          message("net_reader: Read data from sd=%d\n", sd);
+          printf("net_reader: Read data from sd=%d\n", sd);
           memset(buffer, '?', IOBUFFER_SIZE); /* Just to make sure we really receive something */
           ret = recv(sd, buffer, IOBUFFER_SIZE, 0);
           if (ret < 0)
             {
               if (errno != EINTR)
                 {
-                  message("net_reader: recv failed sd=%d: %d\n", sd, errno);
+                  printf("net_reader: recv failed sd=%d: %d\n", sd, errno);
                   if (errno != EAGAIN)
                     {
                        return;
@@ -180,13 +180,13 @@ static void net_receive(int sd)
             }
           else if (ret == 0)
             {
-              message("net_reader: Client connection lost sd=%d\n", sd);
+              printf("net_reader: Client connection lost sd=%d\n", sd);
               return;
             }
           else
             {
               buffer[ret]='\0';
-              message("net_reader: Read '%s' (%d bytes)\n", buffer, ret);
+              printf("net_reader: Read '%s' (%d bytes)\n", buffer, ret);
 
               /* Echo the data back to the client */
 
@@ -197,7 +197,7 @@ static void net_receive(int sd)
                     {
                       if (errno != EINTR)
                         {
-                           message("net_reader: Send failed sd=%d: %d\n", sd, errno);
+                           printf("net_reader: Send failed sd=%d: %d\n", sd, errno);
                            return;
                         }
                     }
@@ -240,7 +240,7 @@ void *net_reader(pthread_addr_t pvarg)
   listensd = socket(PF_INET, SOCK_STREAM, 0);
   if (listensd < 0)
     {
-      message("net_reader: socket failure: %d\n", errno);
+      printf("net_reader: socket failure: %d\n", errno);
       goto errout;
     }
 
@@ -249,7 +249,7 @@ void *net_reader(pthread_addr_t pvarg)
   optval = 1;
   if (setsockopt(listensd, SOL_SOCKET, SO_REUSEADDR, (void*)&optval, sizeof(int)) < 0)
     {
-      message("net_reader: setsockopt SO_REUSEADDR failure: %d\n", errno);
+      printf("net_reader: setsockopt SO_REUSEADDR failure: %d\n", errno);
       goto errout_with_listensd;
     }
 
@@ -261,7 +261,7 @@ void *net_reader(pthread_addr_t pvarg)
 
   if (bind(listensd, (struct sockaddr*)&addr, sizeof(struct sockaddr_in)) < 0)
     {
-      message("net_reader: bind failure: %d\n", errno);
+      printf("net_reader: bind failure: %d\n", errno);
       goto errout_with_listensd;
     }
 
@@ -269,7 +269,7 @@ void *net_reader(pthread_addr_t pvarg)
 
   if (listen(listensd, 5) < 0)
     {
-      message("net_reader: listen failure %d\n", errno);
+      printf("net_reader: listen failure %d\n", errno);
       goto errout_with_listensd;
     }
 
@@ -279,15 +279,15 @@ void *net_reader(pthread_addr_t pvarg)
     {
       /* Accept only one connection */
 
-      message("net_reader: Accepting new connections on port %d\n", LISTENER_PORT);
+      printf("net_reader: Accepting new connections on port %d\n", LISTENER_PORT);
       addrlen = sizeof(struct sockaddr_in);
       acceptsd = accept(listensd, (struct sockaddr*)&addr, &addrlen);
       if (acceptsd < 0)
         {
-          message("net_reader: accept failure: %d\n", errno);
+          printf("net_reader: accept failure: %d\n", errno);
           continue;
         }
-      message("net_reader: Connection accepted on sd=%d\n", acceptsd);
+      printf("net_reader: Connection accepted on sd=%d\n", acceptsd);
 
       /* Configure to "linger" until all data is sent when the socket is closed */
 
@@ -296,7 +296,7 @@ void *net_reader(pthread_addr_t pvarg)
       ling.l_linger = 30;     /* timeout is seconds */
       if (setsockopt(acceptsd, SOL_SOCKET, SO_LINGER, &ling, sizeof(struct linger)) < 0)
         {
-        message("net_reader: setsockopt SO_LINGER failure: %d\n", errno);
+        printf("net_reader: setsockopt SO_LINGER failure: %d\n", errno);
         goto errout_with_acceptsd;
       }
 #endif
@@ -305,7 +305,7 @@ void *net_reader(pthread_addr_t pvarg)
 
       net_receive(acceptsd);
 
-      message("net_reader: Closing sd=%d\n", acceptsd);
+      printf("net_reader: Closing sd=%d\n", acceptsd);
       close(acceptsd);
     }
 
diff --git a/apps/examples/poll/poll_internal.h b/apps/examples/poll/poll_internal.h
index b621531b3..534a6e2ec 100644
--- a/apps/examples/poll/poll_internal.h
+++ b/apps/examples/poll/poll_internal.h
@@ -71,31 +71,6 @@
 #  undef HAVE_NETPOLL
 #endif
 
-/* If debug is enabled, then use syslog so that OS debug output and
- * the test output are synchronized.
- *
- * These macros will differ depending upon if the toolchain supports
- * macros with a variable number of arguments or not.
- */
-
-#ifdef CONFIG_CPP_HAVE_VARARGS
-# ifdef CONFIG_DEBUG
-#   define message(...) syslog(__VA_ARGS__)
-#   define msgflush()
-# else
-#   define message(...) printf(__VA_ARGS__)
-#   define msgflush()   fflush(stdout)
-# endif
-#else
-# ifdef CONFIG_DEBUG
-#   define message      syslog
-#   define msgflush()
-# else
-#   define message      printf
-#   define msgflush()   fflush(stdout)
-# endif
-#endif
-
 #define FIFO_PATH1 "/dev/fifo0"
 #define FIFO_PATH2 "/dev/fifo1"
 
diff --git a/apps/examples/poll/poll_listener.c b/apps/examples/poll/poll_listener.c
index e253d59ff..23272d0a5 100644
--- a/apps/examples/poll/poll_listener.c
+++ b/apps/examples/poll/poll_listener.c
@@ -104,12 +104,12 @@ void *poll_listener(pthread_addr_t pvarg)
 
   /* Open the FIFO for non-blocking read */
 
-  message("poll_listener: Opening %s for non-blocking read\n", FIFO_PATH1);
+  printf("poll_listener: Opening %s for non-blocking read\n", FIFO_PATH1);
   fd = open(FIFO_PATH1, O_RDONLY|O_NONBLOCK);
   if (fd < 0)
     {
-      message("poll_listener: ERROR Failed to open FIFO %s: %d\n",
-              FIFO_PATH1, errno);
+      printf("poll_listener: ERROR Failed to open FIFO %s: %d\n",
+             FIFO_PATH1, errno);
       (void)close(fd);
       return (void*)-1;
     }
@@ -118,7 +118,7 @@ void *poll_listener(pthread_addr_t pvarg)
 
   for (;;)
     {
-      message("poll_listener: Calling poll()\n");
+      printf("poll_listener: Calling poll()\n");
 
       memset(fds, 0, sizeof(struct pollfd)*NPOLLFDS);
 #ifdef HAVE_CONSOLE
@@ -135,19 +135,19 @@ void *poll_listener(pthread_addr_t pvarg)
 
       ret = poll(fds, NPOLLFDS, POLL_LISTENER_DELAY);
 
-      message("\npoll_listener: poll returned: %d\n", ret);
+      printf("\npoll_listener: poll returned: %d\n", ret);
       if (ret < 0)
         {
-          message("poll_listener: ERROR poll failed: %d\n", errno);
+          printf("poll_listener: ERROR poll failed: %d\n", errno);
         }
       else if (ret == 0)
         {
-          message("poll_listener: Timeout\n");
+          printf("poll_listener: Timeout\n");
           timeout = true;
         }
       else if (ret > NPOLLFDS)
         {
-          message("poll_listener: ERROR poll reported: %d\n", errno);
+          printf("poll_listener: ERROR poll reported: %d\n", errno);
         }
       else
         {
@@ -157,13 +157,13 @@ void *poll_listener(pthread_addr_t pvarg)
       nevents = 0;
       for (i = 0; i < NPOLLFDS; i++)
         {
-          message("poll_listener: FIFO revents[%d]=%02x\n", i, fds[i].revents);
+          printf("poll_listener: FIFO revents[%d]=%02x\n", i, fds[i].revents);
           if (timeout)
             {
               if (fds[i].revents != 0)
                 {
-                  message("poll_listener: ERROR? expected revents=00, received revents[%d]=%02x\n",
-                          fds[i].revents, i);
+                  printf("poll_listener: ERROR? expected revents=00, received revents[%d]=%02x\n",
+                         fds[i].revents, i);
                 }
             }
           else if (pollin)
@@ -174,15 +174,15 @@ void *poll_listener(pthread_addr_t pvarg)
                  }
                else if (fds[i].revents != 0)
                 {
-                   message("poll_listener: ERROR unexpected revents[%d]=%02x\n",
-                           i, fds[i].revents);
+                   printf("poll_listener: ERROR unexpected revents[%d]=%02x\n",
+                          i, fds[i].revents);
                  }
             }
         }
 
       if (pollin && nevents != ret)
         {
-           message("poll_listener: ERROR found %d events, poll reported %d\n", nevents, ret);
+           printf("poll_listener: ERROR found %d events, poll reported %d\n", nevents, ret);
         }
 
       /* In any event, read until the pipe/serial  is empty */
@@ -224,12 +224,12 @@ void *poll_listener(pthread_addr_t pvarg)
                     {
                       if ((fds[i].revents & POLLIN) != 0)
                         {
-                          message("poll_listener: ERROR no read data[%d]\n", i);
+                          printf("poll_listener: ERROR no read data[%d]\n", i);
                         }
                     }
                   else if (errno != EINTR)
                     {
-                      message("poll_listener: read[%d] failed: %d\n", i, errno);
+                      printf("poll_listener: read[%d] failed: %d\n", i, errno);
                     }
                   nbytes = 0;
                 }
@@ -237,12 +237,12 @@ void *poll_listener(pthread_addr_t pvarg)
                 {
                   if (timeout)
                     {
-                      message("poll_listener: ERROR? Poll timeout, but data read[%d]\n", i);
-                      message("               (might just be a race condition)\n");
+                      printf("poll_listener: ERROR? Poll timeout, but data read[%d]\n", i);
+                      printf("               (might just be a race condition)\n");
                     }
 
                   buffer[nbytes] = '\0';
-                  message("poll_listener: Read[%d] '%s' (%d bytes)\n", i, buffer, nbytes);
+                  printf("poll_listener: Read[%d] '%s' (%d bytes)\n", i, buffer, nbytes);
                 }
 
               /* Suppress error report if no read data on the next time through */
@@ -254,7 +254,7 @@ void *poll_listener(pthread_addr_t pvarg)
 
       /* Make sure that everything is displayed */
 
-      msgflush();
+      fflush(stdout);
     }
 
   /* Won't get here */
diff --git a/apps/examples/poll/poll_main.c b/apps/examples/poll/poll_main.c
index 5aa62805f..11479e1a3 100644
--- a/apps/examples/poll/poll_main.c
+++ b/apps/examples/poll/poll_main.c
@@ -98,20 +98,20 @@ int poll_main(int argc, char *argv[])
 
   /* Open FIFOs */
 
-  message("\npoll_main: Creating FIFO %s\n", FIFO_PATH1);
+  printf("\npoll_main: Creating FIFO %s\n", FIFO_PATH1);
   ret = mkfifo(FIFO_PATH1, 0666);
   if (ret < 0)
     {
-      message("poll_main: mkfifo failed: %d\n", errno);
+      printf("poll_main: mkfifo failed: %d\n", errno);
       exitcode = 1;
       goto errout;
     }
 
-  message("\npoll_main: Creating FIFO %s\n", FIFO_PATH2);
+  printf("\npoll_main: Creating FIFO %s\n", FIFO_PATH2);
   ret = mkfifo(FIFO_PATH2, 0666);
   if (ret < 0)
     {
-      message("poll_main: mkfifo failed: %d\n", errno);
+      printf("poll_main: mkfifo failed: %d\n", errno);
       exitcode = 2;
       goto errout;
     }
@@ -121,8 +121,8 @@ int poll_main(int argc, char *argv[])
   fd1 = open(FIFO_PATH1, O_WRONLY);
   if (fd1 < 0)
     {
-      message("poll_main: Failed to open FIFO %s for writing, errno=%d\n",
-              FIFO_PATH1, errno);
+      printf("poll_main: Failed to open FIFO %s for writing, errno=%d\n",
+             FIFO_PATH1, errno);
       exitcode = 3;
       goto errout;
     }
@@ -130,47 +130,47 @@ int poll_main(int argc, char *argv[])
   fd2 = open(FIFO_PATH2, O_WRONLY);
   if (fd2 < 0)
     {
-      message("poll_main: Failed to open FIFO %s for writing, errno=%d\n",
-              FIFO_PATH2, errno);
+      printf("poll_main: Failed to open FIFO %s for writing, errno=%d\n",
+            FIFO_PATH2, errno);
       exitcode = 4;
       goto errout;
     }
 
   /* Start the listeners */
 
-  message("poll_main: Starting poll_listener thread\n");
+  printf("poll_main: Starting poll_listener thread\n");
 
   ret = pthread_create(&tid1, NULL, poll_listener, NULL);
   if (ret != 0)
     {
-      message("poll_main: Failed to create poll_listener thread: %d\n", ret);
+      printf("poll_main: Failed to create poll_listener thread: %d\n", ret);
       exitcode = 5;
       goto errout;
     }
 
-  message("poll_main: Starting select_listener thread\n");
+  printf("poll_main: Starting select_listener thread\n");
 
   ret = pthread_create(&tid2, NULL, select_listener, NULL);
   if (ret != 0)
     {
-      message("poll_main: Failed to create select_listener thread: %d\n", ret);
+      printf("poll_main: Failed to create select_listener thread: %d\n", ret);
       exitcode = 6;
       goto errout;
     }
 
 #ifdef HAVE_NETPOLL
 #ifdef CONFIG_NET_TCPBACKLOG
-  message("poll_main: Starting net_listener thread\n");
+  printf("poll_main: Starting net_listener thread\n");
 
   ret = pthread_create(&tid3, NULL, net_listener, NULL);
 #else
-  message("poll_main: Starting net_reader thread\n");
+  printf("poll_main: Starting net_reader thread\n");
 
   ret = pthread_create(&tid3, NULL, net_reader, NULL);
 #endif
   if (ret != 0)
     {
-      message("poll_main: Failed to create net_listener thread: %d\n", ret);
+      printf("poll_main: Failed to create net_listener thread: %d\n", ret);
     }
 #endif
 
@@ -186,7 +186,7 @@ int poll_main(int argc, char *argv[])
       nbytes = write(fd1, buffer, strlen(buffer));
       if (nbytes < 0)
         {
-          message("poll_main: Write to fd1 failed: %d\n", errno);
+          printf("poll_main: Write to fd1 failed: %d\n", errno);
           exitcode = 7;
           goto errout;
         }
@@ -194,13 +194,13 @@ int poll_main(int argc, char *argv[])
       nbytes = write(fd2, buffer, strlen(buffer));
       if (nbytes < 0)
         {
-          message("poll_main: Write fd2 failed: %d\n", errno);
+          printf("poll_main: Write fd2 failed: %d\n", errno);
           exitcode = 8;
           goto errout;
         }
 
-      message("\npoll_main: Sent '%s' (%d bytes)\n", buffer, nbytes);
-      msgflush();
+      printf("\npoll_main: Sent '%s' (%d bytes)\n", buffer, nbytes);
+      fflush(stdout);
 
       /* Wait awhile.  This delay should be long enough that the
        * listener will timeout.
diff --git a/apps/examples/poll/select_listener.c b/apps/examples/poll/select_listener.c
index 12c4e4453..9e35f0864 100644
--- a/apps/examples/poll/select_listener.c
+++ b/apps/examples/poll/select_listener.c
@@ -90,12 +90,12 @@ void *select_listener(pthread_addr_t pvarg)
 
   /* Open the FIFO for non-blocking read */
 
-  message("select_listener: Opening %s for non-blocking read\n", FIFO_PATH2);
+  printf("select_listener: Opening %s for non-blocking read\n", FIFO_PATH2);
   fd = open(FIFO_PATH2, O_RDONLY|O_NONBLOCK);
   if (fd < 0)
     {
-      message("select_listener: ERROR Failed to open FIFO %s: %d\n",
-              FIFO_PATH2, errno);
+      printf("select_listener: ERROR Failed to open FIFO %s: %d\n",
+             FIFO_PATH2, errno);
       (void)close(fd);
       return (void*)-1;
     }
@@ -104,7 +104,7 @@ void *select_listener(pthread_addr_t pvarg)
 
   for (;;)
     {
-      message("select_listener: Calling select()\n");
+      printf("select_listener: Calling select()\n");
 
       FD_ZERO(&rfds);
       FD_SET(fd, &rfds);
@@ -116,22 +116,22 @@ void *select_listener(pthread_addr_t pvarg)
       ready      = false;
 
       ret = select(fd+1, (FAR fd_set*)&rfds, (FAR fd_set*)NULL, (FAR fd_set*)NULL, &tv);
-      message("\nselect_listener: select returned: %d\n", ret);
+      printf("\nselect_listener: select returned: %d\n", ret);
 
       if (ret < 0)
         {
-          message("select_listener: ERROR select failed: %d\n", errno);
+          printf("select_listener: ERROR select failed: %d\n", errno);
         }
       else if (ret == 0)
         {
-          message("select_listener: Timeout\n");
+          printf("select_listener: Timeout\n");
           timeout = true;
         }
       else
         {
           if (ret != 1)
             {
-              message("select_listener: ERROR poll reported: %d\n", ret);
+              printf("select_listener: ERROR poll reported: %d\n", ret);
             }
           else
             {
@@ -140,7 +140,7 @@ void *select_listener(pthread_addr_t pvarg)
 
           if (!FD_ISSET(fd, rfds))
             {
-              message("select_listener: ERROR fd=%d not in fd_set\n", fd);
+              printf("select_listener: ERROR fd=%d not in fd_set\n", fd);
             }
         }
 
@@ -155,12 +155,12 @@ void *select_listener(pthread_addr_t pvarg)
                 {
                   if (ready)
                     {
-                      message("select_listener: ERROR no read data\n");
+                      printf("select_listener: ERROR no read data\n");
                     }
                 }
               else if (errno != EINTR)
                 {
-                  message("select_listener: read failed: %d\n", errno);
+                  printf("select_listener: read failed: %d\n", errno);
                 }
               nbytes = 0;
             }
@@ -168,12 +168,12 @@ void *select_listener(pthread_addr_t pvarg)
             {
               if (timeout)
                 {
-                  message("select_listener: ERROR? Poll timeout, but data read\n");
-                  message("               (might just be a race condition)\n");
+                  printf("select_listener: ERROR? Poll timeout, but data read\n");
+                  printf("               (might just be a race condition)\n");
                 }
 
               buffer[nbytes] = '\0';
-              message("select_listener: Read '%s' (%d bytes)\n", buffer, nbytes);
+              printf("select_listener: Read '%s' (%d bytes)\n", buffer, nbytes);
             }
 
           timeout = false;
@@ -183,7 +183,7 @@ void *select_listener(pthread_addr_t pvarg)
 
       /* Make sure that everything is displayed */
 
-      msgflush();
+      fflush(stdout);
     }
 
   /* Won't get here */