commit 358414d82fd967a719b6f3b33817748ac2621cce
author Eric Newberry <enewberry@cs.ucla.edu> Sun Mar 21 20:56:42 2021 -0700
committer Eric Newberry <enewberry@cs.ucla.edu> Thu Mar 25 21:10:38 2021 -0700
tree 183574dfe432d54ca2bda798ee44b8f1cac24a61
parent 22085365d2be3d6a4286dc1fd607afd036eee527

fw: remove reliance upon marker name components

refs #5044

Change-Id: Iea6c98e03dbd3e4463f7bb6fca0be4953a2cdc40

daemon/fw/access-strategy.cpp

diff --git a/daemon/fw/access-strategy.cpp b/daemon/fw/access-strategy.cpp
index e906d12..8dfcba2 100644
--- a/daemon/fw/access-strategy.cpp
+++ b/daemon/fw/access-strategy.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2020,  Regents of the University of California,
+ * Copyright (c) 2014-2021,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -52,7 +52,7 @@
 const Name&
 AccessStrategy::getStrategyName()
 {
-  static Name strategyName("/localhost/nfd/strategy/access/%FD%01");
+  static const auto strategyName = Name("/localhost/nfd/strategy/access").appendVersion(1);
   return strategyName;
 }
 

daemon/fw/asf-strategy.cpp

diff --git a/daemon/fw/asf-strategy.cpp b/daemon/fw/asf-strategy.cpp
index b9b088a..d8959af 100644
--- a/daemon/fw/asf-strategy.cpp
+++ b/daemon/fw/asf-strategy.cpp
@@ -64,7 +64,7 @@
 const Name&
 AsfStrategy::getStrategyName()
 {
-  static Name strategyName("/localhost/nfd/strategy/asf/%FD%04");
+  static const auto strategyName = Name("/localhost/nfd/strategy/asf").appendVersion(4);
   return strategyName;
 }
 

daemon/fw/best-route-strategy.cpp

diff --git a/daemon/fw/best-route-strategy.cpp b/daemon/fw/best-route-strategy.cpp
index 11ae600..e684250 100644
--- a/daemon/fw/best-route-strategy.cpp
+++ b/daemon/fw/best-route-strategy.cpp
@@ -57,7 +57,7 @@
 const Name&
 BestRouteStrategy::getStrategyName()
 {
-  static Name strategyName("/localhost/nfd/strategy/best-route/%FD%05");
+  static const auto strategyName = Name("/localhost/nfd/strategy/best-route").appendVersion(5);
   return strategyName;
 }
 

daemon/fw/multicast-strategy.cpp

diff --git a/daemon/fw/multicast-strategy.cpp b/daemon/fw/multicast-strategy.cpp
index 1b36e16..866b8ae 100644
--- a/daemon/fw/multicast-strategy.cpp
+++ b/daemon/fw/multicast-strategy.cpp
@@ -57,7 +57,7 @@
 const Name&
 MulticastStrategy::getStrategyName()
 {
-  static Name strategyName("/localhost/nfd/strategy/multicast/%FD%04");
+  static const auto strategyName = Name("/localhost/nfd/strategy/multicast").appendVersion(4);
   return strategyName;
 }
 

daemon/fw/random-strategy.cpp

diff --git a/daemon/fw/random-strategy.cpp b/daemon/fw/random-strategy.cpp
index 44e7b35..96b2ae7 100644
--- a/daemon/fw/random-strategy.cpp
+++ b/daemon/fw/random-strategy.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2020,  Regents of the University of California,
+ * Copyright (c) 2014-2021,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -52,7 +52,7 @@
 const Name&
 RandomStrategy::getStrategyName()
 {
-  static Name strategyName("/localhost/nfd/strategy/random/%FD%01");
+  static const auto strategyName = Name("/localhost/nfd/strategy/random").appendVersion(1);
   return strategyName;
 }
 

daemon/fw/self-learning-strategy.cpp

diff --git a/daemon/fw/self-learning-strategy.cpp b/daemon/fw/self-learning-strategy.cpp
index 59a3f8f..3a4fcbb 100644
--- a/daemon/fw/self-learning-strategy.cpp
+++ b/daemon/fw/self-learning-strategy.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2020,  Regents of the University of California,
+ * Copyright (c) 2014-2021,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -61,7 +61,7 @@
 const Name&
 SelfLearningStrategy::getStrategyName()
 {
-  static Name strategyName("/localhost/nfd/strategy/self-learning/%FD%01");
+  static const auto strategyName = Name("/localhost/nfd/strategy/self-learning").appendVersion(1);
   return strategyName;
 }