Merge remote-tracking branch 'origin/master'

Conflicts: src/lib/log.h src/switch/switch/parse-options.c src/switch/switch/switch-init.c
trema · Jan 22, 2014 · 6335949 · 6335949
2 parents 84d9924 + c100e60
commit 6335949
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/Gemfile b/Gemfile
@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 
 gem "gli", "~> 2.5.5"
-gem "paper_house", "~> 0.4.0"
+gem "paper_house", "~> 0.5.0"
 
 
 group :development do

diff --git a/Rakefile b/Rakefile
@@ -74,7 +74,7 @@ end
 desc "Build Trema Ruby library."
 task :libruby => :libtrema
 
-PaperHouse::RubyLibraryTask.new :libruby do | task |
+PaperHouse::RubyExtensionTask.new :libruby do | task |
   task.library_name = "trema"
   task.target_directory = Trema.ruby
   task.sources = [

diff --git a/src/lib/log.h b/src/lib/log.h
@@ -40,8 +40,7 @@
 
 
 typedef enum {
-  LOGGING_TYPE_UNKNOWN = 0xffffffff,
-
+  LOGGING_TYPE_UNSET = -1,
   LOGGING_TYPE_FILE = 0x1,
   LOGGING_TYPE_SYSLOG = 0x2,
   LOGGING_TYPE_STDOUT = 0x4,

diff --git a/src/switch/switch/parse-options.c b/src/switch/switch/parse-options.c
@@ -53,7 +53,7 @@ print_usage( const struct switch_arguments *args, int exit_code ) {
 static void
 set_default_opts( struct switch_arguments *args, const struct option long_options[] ) {
   args->progname = "switch",
-  args->log_type = LOGGING_TYPE_UNKNOWN,
+  args->log_type = LOGGING_TYPE_UNSET,
   args->log_level = "info",
   args->datapath_ports = "",
   args->datapath_id = 1,

diff --git a/src/switch/switch/switch-init.c b/src/switch/switch/switch-init.c
@@ -93,7 +93,7 @@ init_parse_args( int argc, char **argv ) {
   char *switch_log = get_switch_log();
   logging_type log_output_type = 0;
 
-  if ( args->log_type == LOGGING_TYPE_UNKNOWN ) {
+  if ( args->log_type == LOGGING_TYPE_UNSET ) {
     log_output_type = LOGGING_TYPE_FILE;
     if ( args->run_as_daemon == false ) {
       log_output_type |= LOGGING_TYPE_STDOUT;