fixed id parser

2 files changed, 17 insertions, 23 deletions

diff --git a/src/log/create_wolfmsg.pl b/src/log/create_wolfmsg.pl
index b6e92e0..6a4d8e7 100755
--- a/src/log/create_wolfmsg.pl
+++ b/src/log/create_wolfmsg.pl
@@ -115,7 +115,7 @@ for( ;; ) {
 
 		# fetch expanded message id from the CPP output
 		my $messageid_number;
-		if( $expanded_func =~ /\s*(WOLF_LOG_[^\, ]+)\,\s*([^\,]+)\,\s*([^\,]+)/ ) {
+		if( $expanded_func =~ /\s*(WOLF_LOG_[^\, ]+)\,\s*(\d+)\,\s*([^\,]+)/ ) {
 			my $expanded_messageid = $3;
 			$messageid_number = eval $expanded_messageid;
 		}
@@ -146,26 +146,4 @@ EOF
 			}
 		}
 	}
-# WOLF_LOG_EMERG, WOLF_CATEGORY_DAEMON, WOLF_MSG_DAEMON_PIPE_ATOMIC_WRITE_WRONG_OCTETS,
-#                        _( "Unexpected number of octets %zd in atomar write to fd %d (expected %zd)" ),
-#                        res, fd, data_len )
-
 }
-
-#MessageId = 0x100
-#Severity = Error
-#Facility = Application
-#SymbolicName = WOLF_TEST_NO_PARAMS
-#Language = English
-#This is a test message without any parameters
-#It can be two lines though
-#.
-
-#MessageId = 0x101
-#Severity = Error
-#Facility = Application
-#SymbolicName = WOLF_TEST_PARAMS
-#Language = English
-#This is a message with parameter %1 and parameter %2
-#.
-#EOF
diff --git a/src/log/wolfmsg.mc b/src/log/wolfmsg.mc
index 18c6876..f0a5dfd 100644
--- a/src/log/wolfmsg.mc
+++ b/src/log/wolfmsg.mc
@@ -53,6 +53,22 @@ FacilityNames = (
 
 MessageIdTypedef = DWORD
 
+<stdin>:1:31: error: port/sys_internal.h: No such file or directory
+<stdin>:4:45: error: port/limits.h: No such file or directory
+<stdin>:5:47: error: port/noreturn.h: No such file or directory
+<stdin>:14:36: error: daemon/daemon_internal.h: No such file or directory
+<stdin>:16:28: error: daemon/pidfile.h: No such file or directory
+<stdin>:932:25: error: port/unistd.h: No such file or directory
+<stdin>:1214:25: error: port/unused.h: No such file or directory
+<stdin>:1524:29: error: port/time.h: No such file or directory
+<stdin>:2325:27: error: port/snprintf.h: No such file or directory
+In file included from <stdin>:2458:
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.3/include/varargs.h:4:2: error: #error "GCC no longer implements <varargs.h>."
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.3/include/varargs.h:5:2: error: #error "Revise your code to use <stdarg.h>."
+<stdin>:3701:21: error: macro "va_start" requires 2 arguments, but only 1 given
+<stdin>:4309:27: error: port/snprintf.c: No such file or directory
+<stdin>:4502:2: error: #error no pthreads, port localtime_r differently!
+Use of uninitialized value $messageid_number in concatenation (.) or string at ./create_wolfmsg.pl line 123.
 MessageId = 
 Severity = Error
 Facility = Application