mime: use CURL_ZERO_TERMINATED in examples

and some minor whitespace fixes

diff --git a/docs/examples/multi-post.c b/docs/examples/multi-post.c
index 3777f521ad7e4eb619e52cb1c02817126375c6a8..f3e592e55c4d4355fbbf9000b3f1674836126b8e 100644 (file)
--- a/docs/examples/multi-post.c
+++ b/docs/examples/multi-post.c
@@ -51,18 +51,18 @@ int main(void)
 
     /* Fill in the file upload field */
     field = curl_mime_addpart(form);
-    curl_mime_name(field, "sendfile", -1);
+    curl_mime_name(field, "sendfile", CURL_ZERO_TERMINATED);
     curl_mime_filedata(field, "multi-post.c");
 
     /* Fill in the filename field */
     field = curl_mime_addpart(form);
-    curl_mime_name(field, "filename", -1);
-    curl_mime_data(field, "multi-post.c", -1);
+    curl_mime_name(field, "filename", CURL_ZERO_TERMINATED);
+    curl_mime_data(field, "multi-post.c", CURL_ZERO_TERMINATED);
 
     /* Fill in the submit field too, even if this is rarely needed */
     field = curl_mime_addpart(form);
-    curl_mime_name(field, "submit", -1);
-    curl_mime_data(field, "send", -1);
+    curl_mime_name(field, "submit", CURL_ZERO_TERMINATED);
+    curl_mime_data(field, "send", CURL_ZERO_TERMINATED);
 
     /* initialize custom header list (stating that Expect: 100-continue is not
        wanted */

diff --git a/docs/examples/postit2.c b/docs/examples/postit2.c
index f4c0a8f32aa201453ba85cc1da553856911e4e83..ca5c77dc416d0688dc99ba405157788ca4137844 100644 (file)
--- a/docs/examples/postit2.c
+++ b/docs/examples/postit2.c
@@ -61,18 +61,18 @@ int main(int argc, char *argv[])
 
     /* Fill in the file upload field */
     field = curl_mime_addpart(form);
-    curl_mime_name(field, "sendfile", -1);
+    curl_mime_name(field, "sendfile", CURL_ZERO_TERMINATED);
     curl_mime_filedata(field, "postit2.c");
 
     /* Fill in the filename field */
     field = curl_mime_addpart(form);
-    curl_mime_name(field, "filename", -1);
-    curl_mime_data(field, "postit2.c", -1);
+    curl_mime_name(field, "filename", CURL_ZERO_TERMINATED);
+    curl_mime_data(field, "postit2.c", CURL_ZERO_TERMINATED);
 
     /* Fill in the submit field too, even if this is rarely needed */
     field = curl_mime_addpart(form);
-    curl_mime_name(field, "submit", -1);
-    curl_mime_data(field, "send", -1);
+    curl_mime_name(field, "submit", CURL_ZERO_TERMINATED);
+    curl_mime_data(field, "send", CURL_ZERO_TERMINATED);
 
     /* initialize custom header list (stating that Expect: 100-continue is not
        wanted */

diff --git a/docs/examples/smtp-mime.c b/docs/examples/smtp-mime.c
index 2895dbc31b97d3ddba2278eb1814a501736417f6..c611ac437a04806270ae5e6d24330a8068ea9852 100644 (file)
--- a/docs/examples/smtp-mime.c
+++ b/docs/examples/smtp-mime.c
@@ -113,12 +113,12 @@ int main(void)
 
     /* HTML message. */
     part = curl_mime_addpart(alt);
-    curl_mime_data(part, inline_html, -1);
+    curl_mime_data(part, inline_html, CURL_ZERO_TERMINATED);
     curl_mime_type(part, "text/html");
 
     /* Text message. */
     part = curl_mime_addpart(alt);
-    curl_mime_data(part, inline_text, -1);
+    curl_mime_data(part, inline_text, CURL_ZERO_TERMINATED);
 
     /* Create the inline part. */
     part = curl_mime_addpart(mime);

diff --git a/docs/libcurl/curl_mime_data_cb.3 b/docs/libcurl/curl_mime_data_cb.3
index d0a0c14b1442a4facd537ad4556fd7da2fb70e30..9fc9753414820741d7a8a3e6af88076609be116b 100644 (file)
--- a/docs/libcurl/curl_mime_data_cb.3
+++ b/docs/libcurl/curl_mime_data_cb.3
@@ -142,7 +142,7 @@ int seek_callback(void *arg, curl_off_t offset, int origin)
   p->position = offset;
   return CURL_SEEKFUNC_OK;
 }
- 
+
  CURL *easy = curl_easy_init();
  curl_mime *mime = curl_mime_init(easy);
  curl_mimepart *part = curl_mime_addpart(mime);

diff --git a/docs/libcurl/curl_mime_init.3 b/docs/libcurl/curl_mime_init.3
index 031c62b6557edb86e9e3243c8924f909600c319f..cc21468e4a574b1c397d8297638975b9af20cb60 100644 (file)
--- a/docs/libcurl/curl_mime_init.3
+++ b/docs/libcurl/curl_mime_init.3
@@ -34,7 +34,7 @@ subsequently filled using the mime API, then attached to \fIeasy_handle\fP
 using option \fICURLOPT_MIMEPOST(3)\fP within a \fIcurl_easy_setopt(3)\fP
 call.
 
-Using a mime handle is the recommended way to post an HTTP form, format and 
+Using a mime handle is the recommended way to post an HTTP form, format and
 send a multi-part e-mail with SMTP or upload such an e-mail to an IMAP server.
 
 .SH AVAILABILITY
@@ -51,8 +51,8 @@ A mime struct handle, or NULL upon failure.
  /* Build an HTTP form with a single field named "data", */
  mime = curl_mime_init(easy);
  part = curl_mime_addpart(mime);
- curl_mime_data(part, "This is the field data", -1);
- curl_mime_name(part, "data", -1);
+ curl_mime_data(part, "This is the field data", CURL_ZERO_TERMINATED);
+ curl_mime_name(part, "data", CURL_ZERO_TERMINATED);
 
  /* Post and send it. */
  curl_easy_setopt(easy, CURLOPT_MIMEPOST, mime);

diff --git a/lib/mime.c b/lib/mime.c
index ef2eedae2927fbb021881bd5f6c854b747d90b9e..2fb0716b34d85ccc2fe625046eec808873c679c7 100644 (file)
--- a/lib/mime.c
+++ b/lib/mime.c
@@ -771,9 +771,9 @@ struct Curl_mime *curl_mime_init(struct Curl_easy *easy)
 /* Initialize a mime part. */
 void Curl_mime_initpart(struct Curl_mimepart *part, struct Curl_easy *easy)
 {
-    memset((char *) part, 0, sizeof *part);
-    part->easy = easy;
-    mimesetstate(&part->state, MIMESTATE_BEGIN, NULL);
+  memset((char *) part, 0, sizeof *part);
+  part->easy = easy;
+  mimesetstate(&part->state, MIMESTATE_BEGIN, NULL);
 }
 
 /* Create a mime part and append it to a mime handle's part list. */