Rewritten AnnounceList::getEventString()

3 files changed, 9 insertions, 21 deletions

diff --git a/src/AnnounceList.cc b/src/AnnounceList.cc
index 5b05d033..e41b278e 100644
--- a/src/AnnounceList.cc
+++ b/src/AnnounceList.cc
@@ -42,12 +42,6 @@
 
 namespace aria2 {
 
-const std::string AnnounceList::STARTED("started");
-
-const std::string AnnounceList::STOPPED("stopped");
-
-const std::string AnnounceList::COMPLETED("completed");
-
 AnnounceList::AnnounceList():currentTrackerInitialized_(false) {}
 
 AnnounceList::AnnounceList
@@ -146,21 +140,21 @@ void AnnounceList::setEvent(AnnounceTier::AnnounceEvent event) {
   }
 }
 
-std::string AnnounceList::getEventString() const {
+const char* AnnounceList::getEventString() const {
   if(currentTrackerInitialized_) {
     switch((*currentTier_)->event) {
     case AnnounceTier::STARTED:
     case AnnounceTier::STARTED_AFTER_COMPLETION:
-      return STARTED;
+      return "started";
     case AnnounceTier::STOPPED:
-      return STOPPED;
+      return "stopped";
     case AnnounceTier::COMPLETED:
-      return COMPLETED;
+      return "completed";
     default:
-      return A2STR::NIL;
+      return "";
     }
   } else {
-    return A2STR::NIL;
+    return "";
   }
 }
 
diff --git a/src/AnnounceList.h b/src/AnnounceList.h
index a4e064a1..61e26c93 100644
--- a/src/AnnounceList.h
+++ b/src/AnnounceList.h
@@ -81,7 +81,7 @@ public:
   /**
    * Returns announce event, such as started, stopped, completed, etc.
    */
-  std::string getEventString() const;
+  const char* getEventString() const;
 
   AnnounceTier::AnnounceEvent getEvent() const;
 
@@ -130,12 +130,6 @@ public:
   bool currentTierAcceptsStoppedEvent() const;
 
   bool currentTierAcceptsCompletedEvent() const;
-
-  static const std::string STARTED;
-
-  static const std::string STOPPED;
-
-  static const std::string COMPLETED;
 };
 
 } // namespace aria2
diff --git a/src/DefaultBtAnnounce.cc b/src/DefaultBtAnnounce.cc
index 1a76df15..16f197c7 100644
--- a/src/DefaultBtAnnounce.cc
+++ b/src/DefaultBtAnnounce.cc
@@ -172,8 +172,8 @@ std::string DefaultBtAnnounce::getAnnounceUrl() {
   if(tcpPort_) {
     uri += fmt("&port=%u", tcpPort_);
   }
-  std::string event = announceList_.getEventString();
-  if(!event.empty()) {
+  const char* event = announceList_.getEventString();
+  if(event[0]) {
     uri += "&event=";
     uri += event;
   }