Skip to content

Commit 30891cc

Browse files
authored
Merge pull request #63098 from artemcm/LibSwiftScanDisposeString
[Dependency Scanning] Provide libSwiftScan API to dispose of a string result
2 parents 1756f97 + 5ac9d5b commit 30891cc

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

include/swift-c/DependencyScan/DependencyScan.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,9 @@ swiftscan_scan_invocation_get_argv(swiftscan_scan_invocation_t invocation);
272272
SWIFTSCAN_PUBLIC void
273273
swiftscan_string_set_dispose(swiftscan_string_set_t *set);
274274

275+
SWIFTSCAN_PUBLIC void
276+
swiftscan_string_dispose(swiftscan_string_ref_t string);
277+
275278
SWIFTSCAN_PUBLIC void
276279
swiftscan_dependency_graph_dispose(swiftscan_dependency_graph_t result);
277280

tools/libSwiftScan/libSwiftScan.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,6 @@ DEFINE_SIMPLE_CONVERSION_FUNCTIONS(DependencyScanningTool, swiftscan_scanner_t)
2727

2828
//=== Private Cleanup Functions -------------------------------------------===//
2929

30-
/// Free the given string.
31-
void swiftscan_string_dispose(swiftscan_string_ref_t string) {
32-
if (string.data)
33-
free(const_cast<void *>(string.data));
34-
}
35-
3630
void swiftscan_dependency_info_details_dispose(
3731
swiftscan_module_details_t details) {
3832
swiftscan_module_details_s *details_impl = details;
@@ -446,6 +440,11 @@ swiftscan_scan_invocation_get_argv(swiftscan_scan_invocation_t invocation) {
446440

447441
//=== Public Cleanup Functions --------------------------------------------===//
448442

443+
void swiftscan_string_dispose(swiftscan_string_ref_t string) {
444+
if (string.data)
445+
free(const_cast<void *>(string.data));
446+
}
447+
449448
void swiftscan_string_set_dispose(swiftscan_string_set_t *set) {
450449
for (unsigned SI = 0, SE = set->count; SI < SE; ++SI)
451450
swiftscan_string_dispose(set->strings[SI]);

tools/libSwiftScan/libSwiftScan.exports

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ swiftscan_dependency_graph_create
4646
swiftscan_batch_scan_result_create
4747
swiftscan_import_set_create
4848
swiftscan_scanner_create
49+
swiftscan_string_dispose
4950
swiftscan_string_set_dispose
5051
swiftscan_scan_invocation_dispose
5152
swiftscan_batch_scan_input_dispose

0 commit comments

Comments
 (0)