parse json with GetCharBuffer (#461)

mjansen4857 · Nov 10, 2023 · 116341a · 116341a
1 parent 023aa80
commit 116341a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 26 deletions.
diff --git a/pathplannerlib/src/main/native/cpp/pathplanner/lib/auto/AutoBuilder.cpp b/pathplannerlib/src/main/native/cpp/pathplanner/lib/auto/AutoBuilder.cpp
@@ -273,19 +273,7 @@ frc2::CommandPtr AutoBuilder::buildAuto(std::string autoName) {
 		throw std::runtime_error("Cannot open file: " + filePath);
 	}
 
-	// Workaround to trim trailing \0 bytes
-	std::span<const uint8_t> buffer = fileBuffer->GetBuffer();
-	size_t trimSize = buffer.size();
-	for (size_t i = trimSize - 1; i != 0; i--) {
-		if (buffer[i] == 0) {
-			trimSize = i;
-		} else {
-			break;
-		}
-	}
-	std::span<const uint8_t> trimmed = buffer.first(trimSize);
-
-	wpi::json json = wpi::json::parse(trimmed.begin(), trimmed.end());
+	wpi::json json = wpi::json::parse(fileBuffer->GetCharBuffer());
 
 	return getAutoCommandFromJson(json);
 }

diff --git a/pathplannerlib/src/main/native/cpp/pathplanner/lib/path/PathPlannerPath.cpp b/pathplannerlib/src/main/native/cpp/pathplanner/lib/path/PathPlannerPath.cpp
@@ -112,19 +112,7 @@ std::shared_ptr<PathPlannerPath> PathPlannerPath::fromPathFile(
 		throw std::runtime_error("Cannot open file: " + filePath);
 	}
 
-	// Workaround to trim trailing \0 bytes
-	std::span<const uint8_t> buffer = fileBuffer->GetBuffer();
-	size_t trimSize = buffer.size();
-	for (size_t i = trimSize - 1; i != 0; i--) {
-		if (buffer[i] == 0) {
-			trimSize = i;
-		} else {
-			break;
-		}
-	}
-	std::span<const uint8_t> trimmed = buffer.first(trimSize);
-
-	wpi::json json = wpi::json::parse(trimmed.begin(), trimmed.end());
+	wpi::json json = wpi::json::parse(fileBuffer->GetCharBuffer());
 
 	std::shared_ptr < PathPlannerPath > path = std::make_shared
 			< PathPlannerPath > (PathPlannerPath::fromJson(json));