x

Author: soburi

cores/arduino/zephyr/api/String.h

@@ -192,7 +192,7 @@ bool arduino_string_replace_bytes(
 	unsigned int find_len,
 	const char *replace,
 	unsigned int replace_len);
-void arduino_string_remove(char *buffer, unsigned int *len, unsigned int index, unsigned int count);
+unsigned int arduino_string_remove(char *buffer, unsigned int len, unsigned int index, unsigned int count);
 void arduino_string_reverse(char *buffer, unsigned int len);
 void arduino_string_get_bytes(
 	const char *buffer,

cores/arduino/zephyr/api/String.inl

@@ -400,11 +400,11 @@ inline void String::replace(const String &find, const String &replace) {
 }
 
 inline void String::remove(unsigned int index) {
-	arduino_string_remove(buffer, &len, index, static_cast<unsigned int>(-1));
+	len = arduino_string_remove(buffer, len, index, static_cast<unsigned int>(-1));
 }
 
 inline void String::remove(unsigned int index, unsigned int count) {
-	arduino_string_remove(buffer, &len, index, count);
+	len = arduino_string_remove(buffer, len, index, count);
 }
 
 inline void String::toLowerCase(void) {

rust/src/string.rs

@@ -1203,18 +1203,17 @@ pub extern "C" fn arduino_string_replace_bytes(
 #[unsafe(no_mangle)]
 pub extern "C" fn arduino_string_remove(
     buffer: *mut c_char,
-    len: *mut c_uint,
+    len: c_uint,
     index: c_uint,
     count: c_uint,
-) {
-    if buffer.is_null() || len.is_null() || count == 0 {
-        return;
+) -> c_uint {
+    if buffer.is_null() || count == 0 {
+        return len;
     }
 
-    // SAFETY: len is non-null and writable.
-    let current_len = unsafe { *len };
+    let current_len = len;
     if index >= current_len {
-        return;
+        return current_len;
     }
 
     let remaining = current_len - index;
@@ -1225,13 +1224,14 @@ pub extern "C" fn arduino_string_remove(
     let tail = (current_len - index - remove_count) as usize;
     let new_len = current_len - remove_count;
 
-    // SAFETY: `buffer`/`len` are non-null. Copy ranges are within the same allocation and may
-    // overlap. Writing the terminating NUL at `new_len` is within bounds.
+    // SAFETY: `buffer` is non-null. Copy ranges are within the same allocation and may overlap.
+    // Writing the terminating NUL at `new_len` is within bounds.
     unsafe {
         ptr::copy(buffer.add(src), buffer.add(dst), tail);
-        *len = new_len;
         *buffer.add(new_len as usize) = 0;
     }
+
+    new_len
 }
 
 #[unsafe(no_mangle)]