From 15b5ca2c2031671069c4248eb706600db0491423 Mon Sep 17 00:00:00 2001
From: Steve Nogar <stephen.m.nogar.civ@mail.mil>
Date: Sun, 24 Oct 2021 19:22:00 -0400
Subject: [PATCH 1/4] hide canTransform console output

---
 tf2/src/buffer_core.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tf2/src/buffer_core.cpp b/tf2/src/buffer_core.cpp
index 0ecc350b0..7b983f09c 100644
--- a/tf2/src/buffer_core.cpp
+++ b/tf2/src/buffer_core.cpp
@@ -177,7 +177,7 @@ CompactFrameID BufferCore::validateFrameId(
   }
 
   CompactFrameID id = lookupFrameNumber(frame_id);
-  if (id == 0) {
+  if (id == 0 && std::strstr(function_name_arg, "canTransform") == NULL) {
     fillOrWarnMessageForInvalidFrame(
       function_name_arg, frame_id, error_msg, "frame does not exist");
   }

From 67737e472a616541b65b304e63ff98dbfb493933 Mon Sep 17 00:00:00 2001
From: Steve Nogar <stephen.m.nogar.civ@mail.mil>
Date: Sun, 24 Oct 2021 19:40:34 -0400
Subject: [PATCH 2/4] add missing header

---
 tf2/src/buffer_core.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tf2/src/buffer_core.cpp b/tf2/src/buffer_core.cpp
index 7b983f09c..5a7741c54 100644
--- a/tf2/src/buffer_core.cpp
+++ b/tf2/src/buffer_core.cpp
@@ -35,6 +35,7 @@
 #include <string>
 #include <utility>
 #include <vector>
+#include <string.h>
 
 #include "tf2/buffer_core.h"
 #include "tf2/time_cache.h"

From f45a35c61a9d4012133962bdd86a16caea859ad8 Mon Sep 17 00:00:00 2001
From: Steve Nogar <stephen.m.nogar.civ@mail.mil>
Date: Sun, 24 Oct 2021 19:46:05 -0400
Subject: [PATCH 3/4] fix strstr call

---
 tf2/src/buffer_core.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tf2/src/buffer_core.cpp b/tf2/src/buffer_core.cpp
index 5a7741c54..69e0ed31d 100644
--- a/tf2/src/buffer_core.cpp
+++ b/tf2/src/buffer_core.cpp
@@ -178,7 +178,7 @@ CompactFrameID BufferCore::validateFrameId(
   }
 
   CompactFrameID id = lookupFrameNumber(frame_id);
-  if (id == 0 && std::strstr(function_name_arg, "canTransform") == NULL) {
+  if (id == 0 && strstr(function_name_arg, "canTransform") == NULL) {
     fillOrWarnMessageForInvalidFrame(
       function_name_arg, frame_id, error_msg, "frame does not exist");
   }

From 194fba3052d13f9f66ea614c06f2533f0a81d0f9 Mon Sep 17 00:00:00 2001
From: Steve Nogar <stephen.m.nogar.civ@mail.mil>
Date: Mon, 25 Oct 2021 13:39:59 -0400
Subject: [PATCH 4/4] minor tweaks

---
 tf2/src/buffer_core.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tf2/src/buffer_core.cpp b/tf2/src/buffer_core.cpp
index 69e0ed31d..7bf26e60d 100644
--- a/tf2/src/buffer_core.cpp
+++ b/tf2/src/buffer_core.cpp
@@ -30,12 +30,12 @@
 
 #include <algorithm>
 #include <cassert>
+#include <cstring>
 #include <map>
 #include <mutex>
 #include <string>
 #include <utility>
 #include <vector>
-#include <string.h>
 
 #include "tf2/buffer_core.h"
 #include "tf2/time_cache.h"
@@ -178,7 +178,7 @@ CompactFrameID BufferCore::validateFrameId(
   }
 
   CompactFrameID id = lookupFrameNumber(frame_id);
-  if (id == 0 && strstr(function_name_arg, "canTransform") == NULL) {
+  if (id == 0 && strstr(function_name_arg, "canTransform") == nullptr) {
     fillOrWarnMessageForInvalidFrame(
       function_name_arg, frame_id, error_msg, "frame does not exist");
   }