syslogtst.c: fix a bug of assert() is used wrong
PATCH 1/1 syslogtst.c: fix a bug of assert() is used wrong
Hi Garrett,
When executing "./syslogtst 1", the error message is follows:
syslogtst: syslogtst.c:93: main: Assertion `ch1 != -1' failed.
--- testcases/kernel/syscalls/syslog/syslogtst.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-)
testcases/kernel/syscalls/syslog/syslogtst.c +5 -3
@@ -90,8 +90,6 @@ int main(int argc, char *argv[]) ch1 =atoi (argv[2 ]); } -assert (ch1 !=-1 ); -/* * Send syslog messages according to the case number, which * we will know from command line.
@@ -101,6 +99,8 @@ int main(int argc, char *argv[])syslog (LOG_MAIL |LOG_INFO ,"syslogtst: mail info test." );break ;case 2 : +assert (ch1 !=-1 ); +switch (ch1) {case 0 : syslog(LOG_MAIL | LOG_EMERG,
@@ -254,6 +254,8 @@ int main(int argc, char *argv[])syslog (LOG_USER |LOG_DEBUG ,"syslogtst: debug log" );break ;case 8 : +assert (ch1 !=-1 ); +switch (ch1) {/* * Kernel messages cannot be send by user, so skipping the
@@ -343,4 +345,4 @@ void sig_handler(int signal) }exit (signal); -} +}
Signature · 17 lines
1.7.1 -- Best Regards, Peng Haitao ------------------------------------------------------------------------------ Free Software Download: Index, Search & Analyze Logs and other IT data in Real-Time with Splunk. Collect, index and harness all the fast moving IT data generated by your applications, servers and devices whether physical, virtual or in the cloud. Deliver compliance at lower cost and gain new business insights. http://p.sf.net/sfu/splunk-dev2dev _______________________________________________ Ltp-list mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ltp-list
Quoted 4 lines · Peng Haitao
Hi Garrett,
When executing "./syslogtst 1", the error message is follows:
syslogtst: syslogtst.c:93: main: Assertion `ch1 != -1' failed.
How about this instead?
Thanks,
-Garrett
testcases/kernel/syscalls/syslog/syslogtst.c +4 -3
@@ -73,7 +73,7 @@ int main(int argc, char *argv[])else if (argc ==2 ) { ch =atoi (argv[1 ]); -if (atoi (argv[1 ]) ==2 ||atoi (argv[1 ]) ==8 ) { +if (ch ==2 || ch ==8 ) {if (ch ==2 ) ch1 =random () %8 ;if (ch ==8 )
@@ -90,7 +90,8 @@ int main(int argc, char *argv[]) ch1 =atoi (argv[2 ]); } -assert (ch1 !=-1 ); +/* Ensure ch1 is properly allocated when ch == 2 or ch == 8. */ +assert (!((ch ==2 || ch ==8 ) && ch1 ==-1 ));/* * Send syslog messages according to the case number, which
@@ -343,4 +344,4 @@ void sig_handler(int signal) }exit (signal); -} +}
------------------------------------------------------------------------------
Free Software Download: Index, Search & Analyze Logs and other IT data in Real-Time with Splunk. Collect, index and harness all the fast moving IT data generated by your applications, servers and devices whether physical, virtual or in the cloud. Deliver compliance at lower cost and gain new business insights. http://p.sf.net/sfu/splunk-dev2dev
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list
Hi Garrett,
Garrett Cooper said the following on 2011-2-24 15:32:
Quoted 4 lines
Quoted 2 lines
When executing "./syslogtst 1", the error message is follows:
syslogtst: syslogtst.c:93: main: Assertion `ch1 != -1' failed.How about this instead?
The patch is OK, thanks.
Signature · 14 lines
Best Regards, Peng Haitao ------------------------------------------------------------------------------ Free Software Download: Index, Search & Analyze Logs and other IT data in Real-Time with Splunk. Collect, index and harness all the fast moving IT data generated by your applications, servers and devices whether physical, virtual or in the cloud. Deliver compliance at lower cost and gain new business insights. http://p.sf.net/sfu/splunk-dev2dev _______________________________________________ Ltp-list mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ltp-list
Quoted 9 lines · Peng Haitao
Hi Garrett,
Garrett Cooper said the following on 2011-2-24 15:32:
Quoted 4 lines
Quoted 2 lines
When executing "./syslogtst 1", the error message is follows:
syslogtst: syslogtst.c:93: main: Assertion `ch1 != -1' failed.How about this instead?
The patch is OK, thanks.
Committed -- thanks!
-Garrett
------------------------------------------------------------------------------
Free Software Download: Index, Search & Analyze Logs and other IT data in Real-Time with Splunk. Collect, index and harness all the fast moving IT data generated by your applications, servers and devices whether physical, virtual or in the cloud. Deliver compliance at lower cost and gain new business insights. http://p.sf.net/sfu/splunk-dev2dev
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list