Merge branch 'develop'

* develop:
  Avoiding duplicating symbols with Vapor
  Renamed dependency

Author: givip

Package.swift

@@ -11,7 +11,7 @@ let package = Package(
     products: [
         .library(name: "Telegrammer", targets: ["Telegrammer"]),
         .library(name: "TelegrammerMultipart", targets: ["TelegrammerMultipart"]),
-        .library(name: "CMultipartParser", targets: ["CMultipartParser"]),
+        .library(name: "TelegrammerCMultipartParser", targets: ["TelegrammerCMultipartParser"]),
         .executable(name: "EchoBot", targets: ["DemoEchoBot"]),
         .executable(name: "HelloBot", targets: ["DemoHelloBot"]),
         .executable(name: "SchedulerBot", targets: ["DemoSchedulerBot"]),
@@ -32,13 +32,13 @@ let package = Package(
                 .target(name: "TelegrammerMultipart")
             ]
         ),
-        .target(name: "CMultipartParser"),
+        .target(name: "TelegrammerCMultipartParser"),
         .target(
             name: "TelegrammerMultipart",
             dependencies: [
                 .product(name: "NIO", package: "swift-nio"),
                 .product(name: "NIOHTTP1", package: "swift-nio"),
-                .target(name: "CMultipartParser")
+                .target(name: "TelegrammerCMultipartParser")
             ]
         ),
         .target(name: "DemoEchoBot", dependencies: ["Telegrammer"]),
@@ -47,6 +47,6 @@ let package = Package(
         .target(name: "DemoSpellCheckerBot", dependencies: ["Telegrammer"]),
         .target(name: "DemoWebhooksLocally", dependencies: ["Telegrammer"]),
         .testTarget(name: "TelegrammerTests", dependencies: ["Telegrammer"]),
-        .testTarget(name: "TelegrammerMultipartTests", dependencies: ["CMultipartParser"])
+        .testTarget(name: "TelegrammerMultipartTests", dependencies: ["TelegrammerCMultipartParser"])
     ]
 )

Sources/CMultipartParser/include/multipartparser.h renamed to Sources/TelegrammerCMultipartParser/include/multipartparser.h

@@ -57,11 +57,11 @@ struct multipartparser_callbacks {
     multipart_cb      on_body_end;
 };
 
-void multipartparser_init(multipartparser* parser, const char* boundary);
+void t_multipartparser_init(multipartparser* parser, const char* boundary);
 
-void multipartparser_callbacks_init(multipartparser_callbacks* callbacks);
+void t_multipartparser_callbacks_init(multipartparser_callbacks* callbacks);
 
-size_t multipartparser_execute(multipartparser* parser,
+size_t t_multipartparser_execute(multipartparser* parser,
                                multipartparser_callbacks* callbacks,
                                const char* data,
                                size_t size);

Sources/CMultipartParser/multipartparser.c renamed to Sources/TelegrammerCMultipartParser/multipartparser.c

@@ -110,7 +110,7 @@ static const char header_field_chars[256] = {
     'x',    'y',    'z',    0,      '|',     0,     '~',    0
 };
 
-void multipartparser_init(multipartparser* parser, const char* boundary)
+void t_multipartparser_init(multipartparser* parser, const char* boundary)
 {
     memset(parser, 0, sizeof(*parser));
 
@@ -120,12 +120,12 @@ void multipartparser_init(multipartparser* parser, const char* boundary)
     parser->state = s_preamble;
 }
 
-void multipartparser_callbacks_init(multipartparser_callbacks* callbacks)
+void t_multipartparser_callbacks_init(multipartparser_callbacks* callbacks)
 {
     memset(callbacks, 0, sizeof(*callbacks));
 }
 
-size_t multipartparser_execute(multipartparser* parser,
+size_t t_multipartparser_execute(multipartparser* parser,
                                multipartparser_callbacks* callbacks,
                                const char* data,
                                size_t size)

Sources/TelegrammerMultipart/MultipartParser.swift

@@ -1,5 +1,5 @@
 import struct NIO.ByteBufferAllocator
-import CMultipartParser
+import TelegrammerCMultipartParser
 
 /// Parses multipart-encoded `Data` into `MultipartPart`s. Multipart encoding is a widely-used format for encoding/// web-form data that includes rich content like files. It allows for arbitrary data to be encoded
 /// in each part thanks to a unique delimiter "boundary" that is defined separately. This
@@ -35,9 +35,9 @@ public final class MultipartParser {
         self.onPartComplete = { }
 
         var parser = multipartparser()
-        multipartparser_init(&parser, boundary)
+        t_multipartparser_init(&parser, boundary)
         var callbacks = multipartparser_callbacks()
-        multipartparser_callbacks_init(&callbacks)
+        t_multipartparser_callbacks_init(&callbacks)
         self.callbacks = callbacks
         self.parser = parser
         self.headerState = .ready
@@ -145,7 +145,7 @@ public final class MultipartParser {
             var context = Context(parser: self, unsafeBuffer: unsafeBuffer, buffer: buffer)
             return withUnsafeMutablePointer(to: &context) { (contextPointer: UnsafeMutablePointer<Context>) -> Int in
                 self.parser.data = .init(contextPointer)
-                return multipartparser_execute(&self.parser, &self.callbacks, unsafeBuffer.baseAddress?.assumingMemoryBound(to: Int8.self), unsafeBuffer.count)
+                return t_multipartparser_execute(&self.parser, &self.callbacks, unsafeBuffer.baseAddress?.assumingMemoryBound(to: Int8.self), unsafeBuffer.count)
             }
         }
         guard result == buffer.readableBytes else {