summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Arapov <aarapov@redhat.com>2009-08-11 00:00:48 +0200
committerAnton Arapov <aarapov@redhat.com>2009-08-11 00:00:48 +0200
commit15d7f01d092d4757e91d1d25dd320971c4ecbc21 (patch)
treeed2d5636b224b664907b052f26edbb608befb1f6
parentd4353d69f177b7a0e023cb7a90c3493d2b9efca8 (diff)
downloadabrt-15d7f01d092d4757e91d1d25dd320971c4ecbc21.tar.gz
abrt-15d7f01d092d4757e91d1d25dd320971c4ecbc21.tar.xz
abrt-15d7f01d092d4757e91d1d25dd320971c4ecbc21.zip
kerneloops eliminate commented code, related to type distinguishing...
it seems stable, proved by the stress tests. :)
-rw-r--r--lib/Plugins/KerneloopsScanner.cpp4
-rw-r--r--lib/Plugins/KerneloopsSysLog.cpp6
-rw-r--r--lib/Plugins/KerneloopsSysLog.h4
3 files changed, 7 insertions, 7 deletions
diff --git a/lib/Plugins/KerneloopsScanner.cpp b/lib/Plugins/KerneloopsScanner.cpp
index aa9fa040..22c16de3 100644
--- a/lib/Plugins/KerneloopsScanner.cpp
+++ b/lib/Plugins/KerneloopsScanner.cpp
@@ -92,7 +92,7 @@ int CKerneloopsScanner::ScanDmesg()
buffer = (char*)xzalloc(pagesz + 1);
syscall(__NR_syslog, 3, buffer, pagesz);
- cnt_FoundOopses = m_pSysLog.ExtractOops(buffer, strlen(buffer) /*, 0*/);
+ cnt_FoundOopses = m_pSysLog.ExtractOops(buffer, strlen(buffer));
free(buffer);
return cnt_FoundOopses;
@@ -137,7 +137,7 @@ int CKerneloopsScanner::ScanSysLogFile(const char *filename)
cnt_FoundOopses = 0;
if (sz > 0)
- cnt_FoundOopses = m_pSysLog.ExtractOops(buffer, sz /*, 1*/);
+ cnt_FoundOopses = m_pSysLog.ExtractOops(buffer, sz);
free(buffer);
return cnt_FoundOopses;
diff --git a/lib/Plugins/KerneloopsSysLog.cpp b/lib/Plugins/KerneloopsSysLog.cpp
index 60c08d71..4f720d2e 100644
--- a/lib/Plugins/KerneloopsSysLog.cpp
+++ b/lib/Plugins/KerneloopsSysLog.cpp
@@ -97,7 +97,7 @@ const std::list<COops>& CSysLog::GetOopsList()
* This function splits the dmesg buffer data into lines
* (null terminated).
*/
-int CSysLog::FillLinePointers(char *buffer, size_t buflen /*, int remove_syslog*/)
+int CSysLog::FillLinePointers(char *buffer, size_t buflen)
{
char *c, *linepointer, linelevel;
enum { maybe, no, yes } syslog_format = maybe;
@@ -228,7 +228,7 @@ int CSysLog::ExtractVersion(char *linepointer, char *version)
/*
* extract_oops tries to find oops signatures in a log
*/
-int CSysLog::ExtractOops(char *buffer, size_t buflen /*, int remove_syslog*/)
+int CSysLog::ExtractOops(char *buffer, size_t buflen)
{
int i;
char prevlevel = 0;
@@ -240,7 +240,7 @@ int CSysLog::ExtractOops(char *buffer, size_t buflen /*, int remove_syslog*/)
lines_info = NULL;
lines_info_alloc = 0;
- if (FillLinePointers(buffer, buflen /*, remove_syslog*/) < 0)
+ if (FillLinePointers(buffer, buflen) < 0)
goto fail;
oopsend = linecount;
diff --git a/lib/Plugins/KerneloopsSysLog.h b/lib/Plugins/KerneloopsSysLog.h
index a0e2f538..c2e8c2d0 100644
--- a/lib/Plugins/KerneloopsSysLog.h
+++ b/lib/Plugins/KerneloopsSysLog.h
@@ -42,7 +42,7 @@ class CSysLog
private:
void QueueOops(char *data, char *version);
int ExtractVersion(char *linepointer, char *version);
- int FillLinePointers(char *buffer, size_t buflen /*, int remove_syslog*/);
+ int FillLinePointers(char *buffer, size_t buflen);
std::list<COops> m_OopsQueue;
int m_nFoundOopses;
@@ -50,7 +50,7 @@ class CSysLog
CSysLog();
const std::list<COops>& GetOopsList();
void ClearOopsList();
- int ExtractOops(char *buffer, size_t buflen /*, int remove_syslog*/);
+ int ExtractOops(char *buffer, size_t buflen);
};
#endif