From 433eac7844481b8ceda0bae8bf08f6bb623185b0 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 1 Jun 2009 19:09:19 -0400 Subject: More code cleanup. --- em-format/em-format.c | 8 ++++---- em-format/em-format.h | 6 +++--- em-format/em-stripsig-filter.c | 20 ++++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) (limited to 'em-format') diff --git a/em-format/em-format.c b/em-format/em-format.c index bee5f0c9fa..8f2046c2ed 100644 --- a/em-format/em-format.c +++ b/em-format/em-format.c @@ -356,7 +356,7 @@ em_format_fallback_handler(EMFormat *emf, const gchar *mime_type) if (s == NULL) mime = (gchar *)mime_type; else { - size_t len = (s-mime_type)+1; + gsize len = (s-mime_type)+1; mime = alloca(len+2); strncpy(mime, mime_type, len); @@ -391,7 +391,7 @@ em_format_fallback_handler(EMFormat *emf, const gchar *mime_type) * are resolved by forgetting the old PURI in the global index. **/ EMFormatPURI * -em_format_add_puri(EMFormat *emf, size_t size, const gchar *cid, CamelMimePart *part, EMFormatPURIFunc func) +em_format_add_puri(EMFormat *emf, gsize size, const gchar *cid, CamelMimePart *part, EMFormatPURIFunc func) { EMFormatPURI *puri; const gchar *tmp; @@ -1204,8 +1204,8 @@ em_format_format_text(EMFormat *emf, CamelStream *stream, CamelDataWrapper *dw) const gchar *charset = NULL; CamelMimeFilterWindows *windows = NULL; CamelStream *mem_stream = NULL; - size_t size; - size_t max; + gsize size; + gsize max; GConfClient *gconf; if (emf->charset) { diff --git a/em-format/em-format.h b/em-format/em-format.h index 652ec33ae8..a92da57822 100644 --- a/em-format/em-format.h +++ b/em-format/em-format.h @@ -302,10 +302,10 @@ void em_format_add_header (EMFormat *emf, /* FIXME: Need a 'clone' api to copy details about the current view (inlines etc) Or maybe it should live with sub-classes? */ -int em_format_is_attachment (EMFormat *emf, +gint em_format_is_attachment (EMFormat *emf, CamelMimePart *part); -int em_format_is_inline (EMFormat *emf, +gint em_format_is_inline (EMFormat *emf, const gchar *partid, CamelMimePart *part, const EMFormatHandler *handle); @@ -332,7 +332,7 @@ const EMFormatHandler * /* puri is short for pending uri ... really */ EMFormatPURI * em_format_add_puri (EMFormat *emf, - size_t size, + gsize size, const gchar *uri, CamelMimePart *part, EMFormatPURIFunc func); diff --git a/em-format/em-stripsig-filter.c b/em-format/em-stripsig-filter.c index 1b977e975f..65400027ff 100644 --- a/em-format/em-stripsig-filter.c +++ b/em-format/em-stripsig-filter.c @@ -34,10 +34,10 @@ static void em_stripsig_filter_class_init (EMStripSigFilterClass *klass); static void em_stripsig_filter_init (EMStripSigFilter *filter, EMStripSigFilterClass *klass); -static void filter_filter (CamelMimeFilter *filter, gchar *in, size_t len, size_t prespace, - gchar **out, size_t *outlen, size_t *outprespace); -static void filter_complete (CamelMimeFilter *filter, gchar *in, size_t len, size_t prespace, - gchar **out, size_t *outlen, size_t *outprespace); +static void filter_filter (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace, + gchar **out, gsize *outlen, gsize *outprespace); +static void filter_complete (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace, + gchar **out, gsize *outlen, gsize *outprespace); static void filter_reset (CamelMimeFilter *filter); @@ -83,8 +83,8 @@ em_stripsig_filter_init (EMStripSigFilter *filter, EMStripSigFilterClass *klass) } static void -strip_signature (CamelMimeFilter *filter, gchar *in, size_t len, size_t prespace, - gchar **out, size_t *outlen, size_t *outprespace, gint flush) +strip_signature (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace, + gchar **out, gsize *outlen, gsize *outprespace, gint flush) { EMStripSigFilter *stripsig = (EMStripSigFilter *) filter; register const gchar *inptr = in; @@ -132,15 +132,15 @@ strip_signature (CamelMimeFilter *filter, gchar *in, size_t len, size_t prespace } static void -filter_filter (CamelMimeFilter *filter, gchar *in, size_t len, size_t prespace, - gchar **out, size_t *outlen, size_t *outprespace) +filter_filter (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace, + gchar **out, gsize *outlen, gsize *outprespace) { strip_signature (filter, in, len, prespace, out, outlen, outprespace, FALSE); } static void -filter_complete (CamelMimeFilter *filter, gchar *in, size_t len, size_t prespace, - gchar **out, size_t *outlen, size_t *outprespace) +filter_complete (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace, + gchar **out, gsize *outlen, gsize *outprespace) { strip_signature (filter, in, len, prespace, out, outlen, outprespace, TRUE); } -- cgit v1.2.3