aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--camel/ChangeLog12
-rw-r--r--camel/camel-data-wrapper.c6
-rw-r--r--camel/camel-data-wrapper.h4
-rw-r--r--camel/camel-mime-message.c4
-rw-r--r--camel/camel-mime-part.c8
-rw-r--r--camel/camel-multipart-signed.c23
-rw-r--r--camel/camel-multipart.c8
7 files changed, 39 insertions, 26 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 8c1c475996..def25b1598 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,15 @@
+2003-07-30 Jeffrey Stedfast <fejj@ximian.com>
+
+ * camel-mime-message.c (write_to_stream): Also updated.
+
+ * camel-data-wrapper.c (write_to_stream): This should return ssize_t
+
+ * camel-multipart-signed.c (write_to_stream): Updated.
+
+ * camel-multipart.c (write_to_stream): Same.
+
+ * camel-mime-part.c (write_to_stream): Here too.
+
2003-07-11 Suresh Chandrasekharan <suresh.chandrasekharan@sun.com>
* camel-iconv.c: Fix for #46168 'some additional locale aliases
diff --git a/camel/camel-data-wrapper.c b/camel/camel-data-wrapper.c
index de4d1bf5bf..1f2066aa7a 100644
--- a/camel/camel-data-wrapper.c
+++ b/camel/camel-data-wrapper.c
@@ -41,7 +41,7 @@ static CamelObjectClass *parent_class = NULL;
#define CDW_CLASS(so) CAMEL_DATA_WRAPPER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
static int construct_from_stream (CamelDataWrapper *, CamelStream *);
-static int write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream);
+static ssize_t write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream);
static void set_mime_type (CamelDataWrapper *data_wrapper, const char *mime_type);
static gchar *get_mime_type (CamelDataWrapper *data_wrapper);
static CamelContentType *get_mime_type_field (CamelDataWrapper *data_wrapper);
@@ -111,10 +111,10 @@ camel_data_wrapper_get_type (void)
return type;
}
-static int
+static ssize_t
write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
{
- int ret;
+ ssize_t ret;
if (data_wrapper->stream == NULL) {
return -1;
diff --git a/camel/camel-data-wrapper.h b/camel/camel-data-wrapper.h
index ca6f7a8452..1ca3754207 100644
--- a/camel/camel-data-wrapper.h
+++ b/camel/camel-data-wrapper.h
@@ -61,7 +61,7 @@ typedef struct {
void (*set_mime_type_field) (CamelDataWrapper *data_wrapper,
CamelContentType *mime_type_field);
- int (*write_to_stream) (CamelDataWrapper *data_wrapper,
+ ssize_t (*write_to_stream) (CamelDataWrapper *data_wrapper,
CamelStream *stream);
int (*construct_from_stream) (CamelDataWrapper *data_wrapper,
@@ -75,7 +75,7 @@ CamelType camel_data_wrapper_get_type (void);
/* public methods */
CamelDataWrapper *camel_data_wrapper_new(void);
-int camel_data_wrapper_write_to_stream (CamelDataWrapper *data_wrapper,
+ssize_t camel_data_wrapper_write_to_stream (CamelDataWrapper *data_wrapper,
CamelStream *stream);
void camel_data_wrapper_set_mime_type (CamelDataWrapper *data_wrapper,
const char *mime_type);
diff --git a/camel/camel-mime-message.c b/camel/camel-mime-message.c
index 88ab643720..f9e9373a8f 100644
--- a/camel/camel-mime-message.c
+++ b/camel/camel-mime-message.c
@@ -79,7 +79,7 @@ static char *recipient_names[] = {
"To", "Cc", "Bcc", "Resent-To", "Resent-Cc", "Resent-Bcc", NULL
};
-static int write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream);
+static ssize_t write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream);
static void add_header (CamelMedium *medium, const char *header_name, const void *header_value);
static void set_header (CamelMedium *medium, const char *header_name, const void *header_value);
static void remove_header (CamelMedium *medium, const char *header_name);
@@ -487,7 +487,7 @@ construct_from_parser (CamelMimePart *dw, CamelMimeParser *mp)
return ret;
}
-static int
+static ssize_t
write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
{
CamelMimeMessage *mm = CAMEL_MIME_MESSAGE (data_wrapper);
diff --git a/camel/camel-mime-part.c b/camel/camel-mime-part.c
index 343248715b..1c85efb3e4 100644
--- a/camel/camel-mime-part.c
+++ b/camel/camel-mime-part.c
@@ -72,7 +72,7 @@ static CamelMediumClass *parent_class=NULL;
#define CMD_CLASS(so) CAMEL_MEDIUM_CLASS (CAMEL_OBJECT_GET_CLASS(so))
/* from CamelDataWrapper */
-static int write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream);
+static ssize_t write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream);
static int construct_from_stream (CamelDataWrapper *dw, CamelStream *s);
/* from CamelMedia */
@@ -621,15 +621,15 @@ write_raw(CamelStream *stream, struct _header_raw *h)
return camel_stream_printf(stream, "%s%s%s\n", h->name, isspace(val[0]) ? ":" : ": ", val);
}
-static int
+static ssize_t
write_to_stream(CamelDataWrapper *data_wrapper, CamelStream *stream)
{
CamelMimePart *mp = CAMEL_MIME_PART(data_wrapper);
CamelMedium *medium = CAMEL_MEDIUM(data_wrapper);
CamelStream *ostream = stream;
CamelDataWrapper *content;
- int total = 0;
- int count;
+ ssize_t total = 0;
+ ssize_t count;
d(printf("mime_part::write_to_stream\n"));
diff --git a/camel/camel-multipart-signed.c b/camel/camel-multipart-signed.c
index a089cb0cc3..557209f44a 100644
--- a/camel/camel-multipart-signed.c
+++ b/camel/camel-multipart-signed.c
@@ -53,17 +53,17 @@
#define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))
#include <stdio.h>;*/
-static void signed_add_part(CamelMultipart *multipart, CamelMimePart *part);
-static void signed_add_part_at(CamelMultipart *multipart, CamelMimePart *part, guint index);
-static void signed_remove_part(CamelMultipart *multipart, CamelMimePart *part);
+static void signed_add_part (CamelMultipart *multipart, CamelMimePart *part);
+static void signed_add_part_at (CamelMultipart *multipart, CamelMimePart *part, guint index);
+static void signed_remove_part (CamelMultipart *multipart, CamelMimePart *part);
static CamelMimePart *signed_remove_part_at (CamelMultipart *multipart, guint index);
-static CamelMimePart *signed_get_part(CamelMultipart *multipart, guint index);
-static guint signed_get_number(CamelMultipart *multipart);
+static CamelMimePart *signed_get_part (CamelMultipart *multipart, guint index);
+static guint signed_get_number (CamelMultipart *multipart);
-static int write_to_stream(CamelDataWrapper *data_wrapper, CamelStream *stream);
-static void set_mime_type_field(CamelDataWrapper *data_wrapper, CamelContentType *mime_type);
-static int construct_from_stream(CamelDataWrapper *data_wrapper, CamelStream *stream);
-static int signed_construct_from_parser(CamelMultipart *multipart, struct _CamelMimeParser *mp);
+static ssize_t write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream);
+static void set_mime_type_field (CamelDataWrapper *data_wrapper, CamelContentType *mime_type);
+static int construct_from_stream (CamelDataWrapper *data_wrapper, CamelStream *stream);
+static int signed_construct_from_parser (CamelMultipart *multipart, struct _CamelMimeParser *mp);
static CamelMultipartClass *parent_class = NULL;
@@ -459,13 +459,14 @@ signed_construct_from_parser(CamelMultipart *multipart, struct _CamelMimeParser
return 0;
}
-static int
+static ssize_t
write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
{
CamelMultipartSigned *mps = (CamelMultipartSigned *)data_wrapper;
CamelMultipart *mp = (CamelMultipart *)mps;
const char *boundary;
- int count, total=0;
+ ssize_t total = 0;
+ ssize_t count;
/* we have 3 basic cases:
1. constructed, we write out the data wrapper stream we got
diff --git a/camel/camel-multipart.c b/camel/camel-multipart.c
index 9366bf0e95..9c41050677 100644
--- a/camel/camel-multipart.c
+++ b/camel/camel-multipart.c
@@ -57,7 +57,7 @@ static guint get_number (CamelMultipart *multipart);
static void set_boundary (CamelMultipart *multipart,
const char *boundary);
static const gchar * get_boundary (CamelMultipart *multipart);
-static int write_to_stream (CamelDataWrapper *data_wrapper,
+static ssize_t write_to_stream (CamelDataWrapper *data_wrapper,
CamelStream *stream);
static void unref_part (gpointer data, gpointer user_data);
@@ -435,13 +435,13 @@ is_offline (CamelDataWrapper *data_wrapper)
}
/* this is MIME specific, doesn't belong here really */
-static int
+static ssize_t
write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
{
CamelMultipart *multipart = CAMEL_MULTIPART (data_wrapper);
const gchar *boundary;
- int total = 0;
- int count;
+ ssize_t total = 0;
+ ssize_t count;
GList *node;
/* get the bundary text */
generated by cgit (git 2.34.1) at 2024-11-17 23:15:16 +0800