src/tremashark/tremashark.c in trema-0.2.5 vs src/tremashark/tremashark.c in trema-0.2.6

@@ -1,8 +1,8 @@
 /*
  * tremashark: A bridge for printing various events on Wireshark
- * 
+ *
  * Author: Yasunobu Chiba, Yasunori Nakazawa
  *
  * Copyright (C) 2008-2012 NEC Corporation
  *
  * This program is free software; you can redistribute it and/or modify
@@ -95,11 +95,11 @@
   if ( ret < 0 ) {
     int err = errno;
     if ( err == EAGAIN || err == EWOULDBLOCK ) {
       return WRITE_BUSY;
     }
-    error( "write error ( errno = %s [%d] ).", strerror( err), err );
+    error( "write error ( errno = %s [%d] ).", strerror( err ), err );
     return WRITE_ERROR;
   }
 
   if ( ret != ( ssize_t ) packet->length ) {
     packet->data = ( char * ) packet->data + ret;
@@ -217,11 +217,11 @@
   buffer_length.tv_usec = MESSAGE_BUFFER_LENGTH;
   struct timeval threshold;
 
   timersub( &now, &buffer_length, &threshold );
 
-  for ( ; ; ) {
+  for ( ;; ) {
     buffer *packet;
     queue_status status = peek_pcap_packet( &packet );
     if ( status == QUEUE_EMPTY ) {
       break;
     }
@@ -249,12 +249,10 @@
       assert( 0 );
     }
   }
 
   fsync( outfile_fd );
-
-  return;
 }
 
 
 static void
 set_timer_event() {
@@ -272,11 +270,10 @@
   bool ret = add_timer_event_callback( &interval, write_pcap_packet, NULL );
   if ( !ret ) {
     critical( "failed in set timer event" );
     abort();
   }
-  return;
 }
 
 
 static void
 init_pcap() {
@@ -348,12 +345,10 @@
   sort_pcap_queue();
 
   foreach_pcap_queue( ( void * ) write_to_file );
 
   finalize_pcap();
-
-  return;
 }
 
 
 static void
 set_write_circular_buffer( void ) {
@@ -401,19 +396,21 @@
 void
 usage( void ) {
   printf(
     "Usage: tremashark [OPTION]...\n"
     "\n"
-    "  -t                          launch tshark instead of wireshark\n"
-    "  -w FILE_TO_SAVE             save messages to pcap file\n"
-    "  -p                          do not launch wireshark nor tshark\n"
-    "  -r                          do not trust remote clock\n"
-    "  -c NUMBER_OF_MESSAGES       save messages to circular buffer\n"
-    "  -s DUMP_SERVICE_NAME        dump service name\n"
-    "  -n, --name=SERVICE_NAME     service name\n"
-    "  -d, --daemonize             run in the background\n"
-    "  -l, --logging_level=LEVEL   set logging level\n"
-    "  -h, --help                  display this help and exit\n"
+    "  -t                              launch tshark instead of wireshark\n"
+    "  -w FILE_TO_SAVE                 save messages to pcap file\n"
+    "  -p                              do not launch wireshark nor tshark\n"
+    "  -r                              do not trust remote clock\n"
+    "  -c NUMBER_OF_MESSAGES           save messages to circular buffer\n"
+    "  -s DUMP_SERVICE_NAME            dump service name\n"
+    "  -n, --name=SERVICE_NAME         service name\n"
+    "  -d, --daemonize                 run in the background\n"
+    "  -l, --logging_level=LEVEL       set logging level\n"
+    "  -g, --syslog                    output log messages to syslog\n"
+    "  -f, --logging_facility=FACILITY set syslog facility\n"
+    "  -h, --help                      display this help and exit\n"
   );
 }
 
 
 static void