From c536a979f5a213188ac54f5669ddf4b4ff48c218 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周六, 07 9月 2019 22:13:32 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/open-license-manager/open-license-manager.git
---
src/library/base/EventRegistry.cpp | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/library/base/EventRegistry.cpp b/src/library/base/EventRegistry.cpp
index 12a7ab2..cd3c58f 100644
--- a/src/library/base/EventRegistry.cpp
+++ b/src/library/base/EventRegistry.cpp
@@ -2,13 +2,15 @@
* EventRegistry.cpp
*
* Created on: Mar 30, 2014
- * Author: devel
+ *
*/
#include "EventRegistry.h"
#include <cstddef>
#include <string.h>
#include <algorithm>
+
+using namespace std;
namespace license {
EventRegistry::EventRegistry() {
@@ -33,7 +35,7 @@
void EventRegistry::turnLastEventIntoError() {
if (logs.size() > 0) {
- logs.back().severity = SEVERITY_ERROR;
+ logs.back().severity = SVRT_ERROR;
}
}
@@ -41,7 +43,7 @@
bool eventFound = false;
for (auto it = logs.begin(); it != logs.end(); ++it) {
if (it->event_type == event) {
- it->severity = SEVERITY_ERROR;
+ it->severity = SVRT_ERROR;
eventFound = true;
}
}
@@ -49,14 +51,14 @@
}
AuditEvent const * EventRegistry::getLastFailure() const {
- const AuditEvent* result = NULL;
+ const AuditEvent* result = nullptr;
if (logs.size() == 0) {
return result;
}
auto it = logs.end();
do {
--it;
- if (it->severity == SEVERITY_ERROR) {
+ if (it->severity == SVRT_ERROR) {
result = &(*it);
break;
}
@@ -68,7 +70,7 @@
bool EventRegistry::isGood() const {
bool isGood = true;
for (auto it = logs.begin(); it != logs.end(); ++it) {
- if (it->severity == SEVERITY_ERROR) {
+ if (it->severity == SVRT_ERROR) {
isGood = false;
break;
}
@@ -77,7 +79,7 @@
}
void EventRegistry::addError(EVENT_TYPE event) {
- addEvent(event, SEVERITY_ERROR);
+ this->addEvent(event, SVRT_ERROR);
}
void EventRegistry::addEvent(EVENT_TYPE event, SEVERITY severity) {
@@ -102,8 +104,8 @@
bool EventRegistry::turnErrosIntoWarnings() {
bool eventFound = false;
for (auto it = logs.begin(); it != logs.end(); ++it) {
- if (it->severity == SEVERITY_ERROR) {
- it->severity = SEVERITY_WARN;
+ if (it->severity == SVRT_ERROR) {
+ it->severity = SVRT_WARN;
eventFound = true;
}
}
@@ -111,7 +113,7 @@
}
void EventRegistry::exportLastEvents(AuditEvent* auditEvents, int nlogs) {
- int sizeToCopy = std::min(nlogs, (int) logs.size());
+ const int sizeToCopy = min(nlogs, (int) logs.size());
std::copy(logs.begin(), logs.begin() + sizeToCopy, auditEvents);
}
}
--
Gitblit v1.9.1