Browse Source

flt: fix compile error on macOS 10.6 (which has no strnlen)

rdb 7 years ago
parent
commit
607af9ff49
2 changed files with 4 additions and 4 deletions
  1. 2 2
      pandatool/src/flt/fltBeadID.cxx
  2. 2 2
      pandatool/src/flt/fltRecord.cxx

+ 2 - 2
pandatool/src/flt/fltBeadID.cxx

@@ -78,8 +78,8 @@ extract_record(FltRecordReader &reader) {
 bool FltBeadID::
 bool FltBeadID::
 extract_ancillary(FltRecordReader &reader) {
 extract_ancillary(FltRecordReader &reader) {
   if (reader.get_opcode() == FO_long_id) {
   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;
     return true;
   }
   }
 
 

+ 2 - 2
pandatool/src/flt/fltRecord.cxx

@@ -621,8 +621,8 @@ extract_record(FltRecordReader &) {
 bool FltRecord::
 bool FltRecord::
 extract_ancillary(FltRecordReader &reader) {
 extract_ancillary(FltRecordReader &reader) {
   if (reader.get_opcode() == FO_comment) {
   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;
     return true;
   }
   }