Parcourir la source

[master] use std:: before memcpy/memmove

Jelte Jansen il y a 12 ans
Parent
commit
c0f1785cf7
1 fichiers modifiés avec 3 ajouts et 3 suppressions
  1. 3 3
      src/lib/dns/labelsequence.cc

+ 3 - 3
src/lib/dns/labelsequence.cc

@@ -60,7 +60,7 @@ LabelSequence::LabelSequence(const LabelSequence& src,
 {
 {
     size_t data_len;
     size_t data_len;
     const uint8_t *data = src.getData(&data_len);
     const uint8_t *data = src.getData(&data_len);
-    memcpy(buf, data, data_len);
+    std::memcpy(buf, data, data_len);
 
 
     for (size_t i = 0; i < src.getLabelCount(); ++i) {
     for (size_t i = 0; i < src.getLabelCount(); ++i) {
         buf[Name::MAX_WIRE + i] = src.offsets_[i + src.first_label_] -
         buf[Name::MAX_WIRE + i] = src.offsets_[i + src.first_label_] -
@@ -371,11 +371,11 @@ LabelSequence::extend(const LabelSequence& labels,
     }
     }
 
 
     // All seems to be reasonably ok, let's proceed.
     // All seems to be reasonably ok, let's proceed.
-    memmove(&buf[data_pos], data, data_len);
+    std::memmove(&buf[data_pos], data, data_len);
 
 
     for (size_t i = 0; i < append_label_count; ++i) {
     for (size_t i = 0; i < append_label_count; ++i) {
         buf[Name::MAX_WIRE + label_count + i] =
         buf[Name::MAX_WIRE + label_count + i] =
-            offsets_[label_count] +
+            data_pos +
             labels.offsets_[i + labels.first_label_] -
             labels.offsets_[i + labels.first_label_] -
             labels.offsets_[labels.first_label_];
             labels.offsets_[labels.first_label_];
     }
     }