cleanup

awslabs · Aug 5, 2024 · 6cf7247 · 6cf7247
1 parent ad8bb7a
commit 6cf7247
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/Source/AwsCommonRuntimeKit/crt/Utilities.swift b/Source/AwsCommonRuntimeKit/crt/Utilities.swift
@@ -274,16 +274,17 @@ func withByteCursorFromStrings<Result>(
 }
 
 extension Array where Element == String {
-  func withByteCursorArray<R>(
-    let cStrings = arg.map { strdup($0) } + [nil]
-    let cursors = cStrings.map { aws_byte_cursor_from_c_str($0) }
-    let len = cursors.count
+  func withByteCursorArray<R>(_ body: (UnsafePointer<aws_byte_cursor>, Int) -> R) -> R {
+        let cStrings = self.map { strdup($0) } + [nil]
+        let cursors = cStrings.map { aws_byte_cursor_from_c_str($0) }
+        let len = cursors.count
 
-    defer {
-        cStrings.forEach { free($0) }
-    }
+        defer {
+            cStrings.forEach { free($0) }
+        }
 
-    return cursors.withUnsafeBufferPointer { cursorsPtr in 
-        return body(cursorsPtr.baseAddress!, len)
+        return cursors.withUnsafeBufferPointer { cursorsPtr in 
+            return body(cursorsPtr.baseAddress!, len)
+        }
     }
 }
diff --git a/Source/AwsCommonRuntimeKit/sdkutils/endpoint/EndpointsRequestContext.swift b/Source/AwsCommonRuntimeKit/sdkutils/endpoint/EndpointsRequestContext.swift
@@ -57,7 +57,7 @@ public class EndpointsRequestContext {
             return
         }
         if (name.withByteCursor { nameCursor in
-            withByteCursorArrayFromStringArray(value) { ptr, len in        
+            value.withByteCursorArray { ptr, len in        
                 aws_endpoints_request_context_add_string_array(allocator.rawValue, rawValue, nameCursor, ptr, len)
             }
         }) != AWS_OP_SUCCESS {

diff --git a/Test/AwsCommonRuntimeKitTests/crt/Utilities.swift b/Test/AwsCommonRuntimeKitTests/crt/Utilities.swift
@@ -9,7 +9,7 @@ class UtilitiesTests: XCBaseTestCase {
 
     func testStringArrayToByteCursorArray() {
         let strings1 = ["a", "b"]
-        withByteCursorArrayFromStringArray(strings1) { cursors, len in
+        strings1.withByteCursorArray { cursors, len in
             XCTAssertEqual(len, 2)
             for i in 0..<len {
                 withUnsafePointer(to: cursors[i]) { pointer in
@@ -19,7 +19,7 @@ class UtilitiesTests: XCBaseTestCase {
         }
 
         let strings2: [String] = []
-        withByteCursorArrayFromStringArray(strings2) { cursors, len in
+        strings2.withByteCursorArray { cursors, len in
             XCTAssertEqual(len, 0)
         }
     }