diff options
| author | Andreas Baumann <abaumann@yahoo.com> | 2009-03-28 13:51:47 +0100 |
|---|---|---|
| committer | Andreas Baumann <abaumann@yahoo.com> | 2009-03-28 13:51:47 +0100 |
| commit | 3bae72114ecaf9d2d463da9e5c18513344f7af8b (patch) | |
| tree | 64b74b0d638fa619583697556cd2083332433cb6 /src/log | |
| parent | 8c44b81b9f943ff0e87034ab16527f60c1830524 (diff) | |
| download | wolfbones-3bae72114ecaf9d2d463da9e5c18513344f7af8b.tar.gz wolfbones-3bae72114ecaf9d2d463da9e5c18513344f7af8b.tar.bz2 | |
more fixes in the direction of merging separatly generated MC files
Diffstat (limited to 'src/log')
| -rwxr-xr-x | src/log/create_wolfmsg.pl | 16 | ||||
| -rw-r--r-- | src/log/wolfmsg.mc | 8 |
2 files changed, 13 insertions, 11 deletions
diff --git a/src/log/create_wolfmsg.pl b/src/log/create_wolfmsg.pl index 674f342..cbe6585 100755 --- a/src/log/create_wolfmsg.pl +++ b/src/log/create_wolfmsg.pl @@ -55,7 +55,7 @@ foreach $lang ( keys %gettext_lang ) { print <<EOF; -MessageId = 0x1 +MessageId = 1 SymbolicName = WOLF_CATEGORY_LOGGER Language = English Logger @@ -64,7 +64,7 @@ Language = German Logger . -MessageId = 0x2 +MessageId = 2 SymbolicName = WOLF_CATEGORY_DAEMON Language = English Daemon @@ -73,13 +73,13 @@ Language = German Unix-Prozess . -MessageId = 0x3 +MessageId = 3 SymbolicName = WOLF_CATEGORY_SERVICE Language = English Service . Language = German -Service +Dienst . EOF @@ -129,7 +129,9 @@ for( ;; ) { $code = $'; AGAIN: - $expanded_code =~ /wolf_log\s*\(([^\;]*)/s; + if( !( $expanded_code =~ /wolf_log\s*\(([^\;]*)/s ) ) { + exit 1; + } my $expanded_func = $1; $expanded_code = $'; @@ -156,13 +158,13 @@ AGAIN: # fetch expanded message id from the CPP output my $messageid_number = 9999999; - if( $expanded_func =~ /\s*(WOLF_LOG_[^\, ]+)\,\s*(\d+)\,\s*([^\,]+)/ ) { + if( $expanded_func =~ /\s*(WOLF_LOG_[^\, ]+)\,\s*([\d\s\+]+)\,\s*([^\,]+)/ ) { my $expanded_messageid = $3; $messageid_number = eval $expanded_messageid; } else { goto AGAIN; } - + if( defined( $message_ids{$messageid} ) ) { next; } diff --git a/src/log/wolfmsg.mc b/src/log/wolfmsg.mc index f3e65cc..f4b87ed 100644 --- a/src/log/wolfmsg.mc +++ b/src/log/wolfmsg.mc @@ -16,7 +16,7 @@ LanguageNames = ( ;// sure they are not longer than 10 characters, the event viewer ;// field is quite small. -MessageId = 0x1 +MessageId = 1 SymbolicName = WOLF_CATEGORY_LOGGER Language = English Logger @@ -25,7 +25,7 @@ Language = German Logger . -MessageId = 0x2 +MessageId = 2 SymbolicName = WOLF_CATEGORY_DAEMON Language = English Daemon @@ -34,13 +34,13 @@ Language = German Unix-Prozess . -MessageId = 0x3 +MessageId = 3 SymbolicName = WOLF_CATEGORY_SERVICE Language = English Service . Language = German -Service +Dienst . ;// event log severity levels (severity bits) |