Remove non-portable references to syslog from apps/examples

1 files changed, 33 insertions, 51 deletions

diff --git a/apps/examples/usbserial/usbserial_main.c b/apps/examples/usbserial/usbserial_main.c
index 33d6904fe..11dda6abc 100644
--- a/apps/examples/usbserial/usbserial_main.c
+++ b/apps/examples/usbserial/usbserial_main.c
@@ -107,24 +107,6 @@
 
 #define TRACE_BITSET            (TRACE_INIT_BITS|TRACE_ERROR_BITS|TRACE_CLASS_BITS|\
                                  TRACE_TRANSFER_BITS|TRACE_CONTROLLER_BITS|TRACE_INTERRUPT_BITS)
-#ifdef CONFIG_CPP_HAVE_VARARGS
-#  ifdef CONFIG_DEBUG
-#    define message(...) lowsyslog(__VA_ARGS__)
-#    define trmessage    lowsyslog
-#  else
-#    define message(...) printf(__VA_ARGS__)
-#    define trmessage    printf
-#  endif
-#else
-#  ifdef CONFIG_DEBUG
-#    define message      lowsyslog
-#    define trmessage    lowsyslog
-#  else
-#    define message      printf
-#    define trmessage    printf
-#  endif
-#endif
-
 #ifdef CONFIG_CDCACM
 #  define USBSER_DEVNAME "/dev/ttyACM0"
 #else
@@ -181,7 +163,7 @@ static char g_iobuffer[IOBUFFER_SIZE];
 #ifdef CONFIG_USBDEV_TRACE
 static int trace_callback(struct usbtrace_s *trace, void *arg)
 {
-  usbtrace_trprintf((trprintf_t)trmessage, trace->event, trace->value);
+  usbtrace_trprintf((trprintf_t)printf, trace->event, trace->value);
   return 0;
 }
 
@@ -224,7 +206,7 @@ int usbserial_main(int argc, char *argv[])
 
   /* Initialize the USB serial driver */
 
-  message("usbserial_main: Registering USB serial driver\n");
+  printf("usbserial_main: Registering USB serial driver\n");
 #ifdef CONFIG_CDCACM
   ret = cdcacm_initialize(0, NULL);
 #else
@@ -232,10 +214,10 @@ int usbserial_main(int argc, char *argv[])
 #endif
   if (ret < 0)
     {
-      message("usbserial_main: ERROR: Failed to create the USB serial device: %d\n", -ret);
+      printf("usbserial_main: ERROR: Failed to create the USB serial device: %d\n", -ret);
       return 1;
     }
-  message("usbserial_main: Successfully registered the serial driver\n");
+  printf("usbserial_main: Successfully registered the serial driver\n");
 
 #if CONFIG_USBDEV_TRACE && CONFIG_USBDEV_TRACE_INITIALIDSET != 0
   /* If USB tracing is enabled and tracing of initial USB events is specified,
@@ -255,25 +237,25 @@ int usbserial_main(int argc, char *argv[])
 #ifndef CONFIG_EXAMPLES_USBSERIAL_OUTONLY
   do
     {
-      message("usbserial_main: Opening USB serial driver\n");
+      printf("usbserial_main: Opening USB serial driver\n");
       outfd = open(USBSER_DEVNAME, O_WRONLY);
       if (outfd < 0)
         {
           int errcode = errno;
-          message("usbserial_main: ERROR: Failed to open " USBSER_DEVNAME " for writing: %d\n", errcode);
+          printf("usbserial_main: ERROR: Failed to open " USBSER_DEVNAME " for writing: %d\n", errcode);
 
           /* ENOTCONN means that the USB device is not yet connected */
 
           if (errcode == ENOTCONN)
             {
-              message("usbserial_main:        Not connected. Wait and try again.\n");
+              printf("usbserial_main:        Not connected. Wait and try again.\n");
               sleep(5);
             }
           else
             {
               /* Give up on other errors */
 
-              message("usbserial_main:        Aborting\n");
+              printf("usbserial_main:        Aborting\n");
               return 2;
             }
         }
@@ -292,7 +274,7 @@ int usbserial_main(int argc, char *argv[])
   infd = open(USBSER_DEVNAME, O_RDONLY|O_NONBLOCK);
   if (infd < 0)
     {
-      message("usbserial_main: ERROR: Failed to open " USBSER_DEVNAME " for reading: %d\n", errno);
+      printf("usbserial_main: ERROR: Failed to open " USBSER_DEVNAME " for reading: %d\n", errno);
       close(outfd);
       return 3;
     }
@@ -303,20 +285,20 @@ int usbserial_main(int argc, char *argv[])
       if (infd < 0)
         {
           int errcode = errno;
-          message("usbserial_main: ERROR: Failed to open " USBSER_DEVNAME " for reading: %d\n", errno);
+          printf("usbserial_main: ERROR: Failed to open " USBSER_DEVNAME " for reading: %d\n", errno);
 
           /* ENOTCONN means that the USB device is not yet connected */
 
           if (errcode == ENOTCONN)
             {
-              message("usbserial_main:        Not connected. Wait and try again.\n");
+              printf("usbserial_main:        Not connected. Wait and try again.\n");
               sleep(5);
             }
           else
             {
               /* Give up on other errors */
 
-              message("usbserial_main:        Aborting\n");
+              printf("usbserial_main:        Aborting\n");
               return 3;
             }
         }
@@ -329,7 +311,7 @@ int usbserial_main(int argc, char *argv[])
 #endif
 #endif
 
-  message("usbserial_main: Successfully opened the serial driver\n");
+  printf("usbserial_main: Successfully opened the serial driver\n");
 
   /* Send messages and get responses -- forever */
 
@@ -341,21 +323,21 @@ int usbserial_main(int argc, char *argv[])
 #if !defined(CONFIG_EXAMPLES_USBSERIAL_ONLYBIG) && !defined(CONFIG_EXAMPLES_USBSERIAL_ONLYSMALL)
       if (count < 8)
         {
-          message("usbserial_main: Saying hello\n");
+          printf("usbserial_main: Saying hello\n");
           nbytes = write(outfd, g_shortmsg, sizeof(g_shortmsg));
           count++;
         }
       else
         {
-          message("usbserial_main: Reciting QEI's speech of 1588\n");
+          printf("usbserial_main: Reciting QEI's speech of 1588\n");
           nbytes = write(outfd, g_longmsg, sizeof(g_longmsg));
           count = 0;
         }
 #elif !defined(CONFIG_EXAMPLES_USBSERIAL_ONLYSMALL)
-      message("usbserial_main: Reciting QEI's speech of 1588\n");
+      printf("usbserial_main: Reciting QEI's speech of 1588\n");
       nbytes = write(outfd, g_longmsg, sizeof(g_longmsg));
 #else /* !defined(CONFIG_EXAMPLES_USBSERIAL_ONLYBIG) */
-      message("usbserial_main: Saying hello\n");
+      printf("usbserial_main: Saying hello\n");
       nbytes = write(outfd, g_shortmsg, sizeof(g_shortmsg));
 #endif
 
@@ -363,14 +345,14 @@ int usbserial_main(int argc, char *argv[])
 
       if (nbytes < 0)
         {
-          message("usbserial_main: ERROR: write failed: %d\n", errno);
+          printf("usbserial_main: ERROR: write failed: %d\n", errno);
 #ifndef CONFIG_EXAMPLES_USBSERIAL_INONLY
           close(infd);
 #endif
           close(outfd);
           return 4;
         }
-      message("usbserial_main: %d bytes sent\n", nbytes);
+      printf("usbserial_main: %d bytes sent\n", nbytes);
 #endif /* CONFIG_EXAMPLES_USBSERIAL_OUTONLY */
 
       /* Test OUT (host-to-device) messages */
@@ -378,7 +360,7 @@ int usbserial_main(int argc, char *argv[])
 #ifndef CONFIG_EXAMPLES_USBSERIAL_INONLY
       /* Poll for incoming messages */
 
-      message("usbserial_main: Polling for OUT messages\n");
+      printf("usbserial_main: Polling for OUT messages\n");
       for (i = 0; i < 5; i++)
         {
           memset(g_iobuffer, 'X', IOBUFFER_SIZE);
@@ -388,7 +370,7 @@ int usbserial_main(int argc, char *argv[])
               int errorcode = errno;
               if (errorcode != EAGAIN)
                 {
-                  message("usbserial_main: ERROR: read failed: %d\n", errno);
+                  printf("usbserial_main: ERROR: read failed: %d\n", errno);
                   close(infd);
 #ifndef CONFIG_EXAMPLES_USBSERIAL_OUTONLY
                   close(outfd);
@@ -398,58 +380,58 @@ int usbserial_main(int argc, char *argv[])
             }
           else
             {
-              message("usbserial_main: Received %d bytes:\n", nbytes);
+              printf("usbserial_main: Received %d bytes:\n", nbytes);
               if (nbytes > 0)
                 {
                   for (j = 0; j < nbytes; j += 16)
                     {
-                      message("usbserial_main: %03x: ", j);
+                      printf("usbserial_main: %03x: ", j);
                       for (k = 0; k < 16; k++)
                         {
                           if (k == 8)
                             {
-                              message(" ");
+                              printf(" ");
                             }
                           if (j+k < nbytes)
                             {
-                              message("%02x", g_iobuffer[j+k]);
+                              printf("%02x", g_iobuffer[j+k]);
                             }
                           else
                             {
-                              message("  ");
+                              printf("  ");
                             }
                         }
-                      message(" ");
+                      printf(" ");
                       for (k = 0; k < 16; k++)
                         {
                           if (k == 8)
                             {
-                              message(" ");
+                              printf(" ");
                             }
                           if (j+k < nbytes)
                             {
                               if (g_iobuffer[j+k] >= 0x20 && g_iobuffer[j+k] < 0x7f)
                                 {
-                                  message("%c", g_iobuffer[j+k]);
+                                  printf("%c", g_iobuffer[j+k]);
                                 }
                               else
                                 {
-                                  message(".");
+                                  printf(".");
                                 }
                             }
                            else
                             {
-                              message(" ");
+                              printf(" ");
                             }
                         }
-                      message("\n");
+                      printf("\n");
                     }
                 }
             }
           sleep(1);
         }
 #else /* CONFIG_EXAMPLES_USBSERIAL_INONLY */
-      message("usbserial_main: Waiting\n");
+      printf("usbserial_main: Waiting\n");
       sleep(5);
 #endif /* CONFIG_EXAMPLES_USBSERIAL_INONLY */