From 607af9ff4963db086b1233e195db45f7aeda68c1 Mon Sep 17 00:00:00 2001 From: rdb Date: Tue, 10 Apr 2018 15:29:43 +0200 Subject: [PATCH] flt: fix compile error on macOS 10.6 (which has no strnlen) --- pandatool/src/flt/fltBeadID.cxx | 4 ++-- pandatool/src/flt/fltRecord.cxx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pandatool/src/flt/fltBeadID.cxx b/pandatool/src/flt/fltBeadID.cxx index f55d3e88cc..32348d583e 100644 --- a/pandatool/src/flt/fltBeadID.cxx +++ b/pandatool/src/flt/fltBeadID.cxx @@ -78,8 +78,8 @@ extract_record(FltRecordReader &reader) { bool FltBeadID:: extract_ancillary(FltRecordReader &reader) { if (reader.get_opcode() == FO_long_id) { - vector_uchar s = reader.get_iterator().get_remaining_bytes(); - _id.assign((const char *)s.data(), strnlen((const char *)s.data(), s.size())); + DatagramIterator &di = reader.get_iterator(); + _id = di.get_fixed_string(di.get_remaining_size()); return true; } diff --git a/pandatool/src/flt/fltRecord.cxx b/pandatool/src/flt/fltRecord.cxx index a0af83e180..53844f0636 100644 --- a/pandatool/src/flt/fltRecord.cxx +++ b/pandatool/src/flt/fltRecord.cxx @@ -621,8 +621,8 @@ extract_record(FltRecordReader &) { bool FltRecord:: extract_ancillary(FltRecordReader &reader) { if (reader.get_opcode() == FO_comment) { - vector_uchar s = reader.get_iterator().get_remaining_bytes(); - _comment.assign((const char *)s.data(), strnlen((const char *)s.data(), s.size())); + DatagramIterator &di = reader.get_iterator(); + _comment = di.get_fixed_string(di.get_remaining_size()); return true; }