Changeset 1467

Timestamp:

01/25/07 12:34:22

Author:

pvanhoof

Message:

Several little changes

Files:

• trunk/libtinymail-camel/camel-lite/camel/camel-stream-gzip.c (modified) (11 diffs)
• trunk/libtinymail-camel/camel-lite/camel/camel-stream-gzip.h (modified) (2 diffs)
• trunk/tests/functional/anything.c (modified) (1 diff)
• trunk/tinymail (modified) (1 prop)
• trunk/tinymail/.svnignore (modified) (1 diff)
• trunk/tinymail/Makefile.am (modified) (1 diff)

trunk/libtinymail-camel/camel-lite/camel/camel-stream-gzip.c

@@ -33 +33 @@
-static ssize_t z_stream_read (CamelStream *stream, char *buffer, size_t n) 
-{
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                haveread = camel_stream_read (self->real, mem, n);
-                c_stream.next_in = (Bytef *) mem;
@@ -48 +47 @@
-                deflate (&c_stream, Z_FINISH);
-                retval = n - c_stream.avail_out;
+                g_free (mem);
-        } else
-        {
-
-
-
-
+
+
-
-                haveread = block_size;
-                mem = g_malloc0 (block_size);
-
-                c_stream.next_out = (Bytef *) buffer;
-                c_stream.avail_out = n;
@@ -67 +63 @@
-                        c_stream.avail_in = haveread;
-                        inflate (&c_stream, Z_FINISH);
-                        retval += haveread - c_stream.avail_out;
-                }
-
-
-
-
+
+
+
-
-        return retval; 
@@ -81 +75 @@
-{ 
-        CamelStreamGZip *self = (CamelStreamGZip *) stream;
-
-
+
-        ssize_t retval = 0;
-
-
-
-
-
-
-
+
+
+
-
-                c_stream.next_in  = (Bytef *) buffer;
-                c_stream.avail_in = n;
-
+(Bytef *) 
-                c_stream.avail_out = n;
-
@@ -102 +92 @@
-
-                retval = n;
+                g_free (mem);
-
-        } else 
-        {
-
+char *
-
-                c_stream.next_in = (Bytef *) buffer;
@@ -122 +113 @@
-                        c_stream.avail_out = n;
-                }
-
-
-
+
+
-
-        return retval; 
@@ -132 +122 @@
-{ 
-        CamelStreamGZip *self = (CamelStreamGZip *) stream;
-        char mem[1024];
-        z_stream c_stream = * (self->stream);
-
-
-        if (self->mode != CAMEL_STREAM_GZIP_ZIP)
-        {
-                c_stream.next_out = (Bytef *) mem;
-                c_stream.avail_out = 1024;
-
-                while (c_stream.avail_in > 0)
-                {
-                        inflate (&c_stream, Z_NO_FLUSH);
-                        camel_stream_write (self->real, mem, 1024 - c_stream.avail_out);
-                        c_stream.next_out = (Bytef *) mem;
-                        c_stream.avail_out = 1024;
-                }
-                inflateReset (self->stream);
-        } else
-                deflateReset (self->stream);
-
-        return camel_stream_flush (self->real); 
-}
@@ -158 +128 @@
-{ 
-        CamelStreamGZip *self = (CamelStreamGZip *) stream;
-
-        z_stream_flush (stream);
-
-        return camel_stream_close (self->real); 
-}
@@ -174 +142 @@
-        CamelStreamGZip *self = (CamelStreamGZip *) stream;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-        return 0; 
@@ -205 +180 @@
-        camel_object_unref (CAMEL_OBJECT (self->real));
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        return;
@@ -236 +218 @@
-}
-
+static int
+set_mode (z_stream *stream, int level, int mode)
+{
+        int retval;
+        if (mode == CAMEL_STREAM_GZIP_ZIP)
+                retval = deflateInit2 (stream, level, Z_DEFLATED, -MAX_WBITS, 
+                        MAX_MEM_LEVEL, Z_DEFAULT_STRATEGY);
+        else
+                retval = inflateInit2 (stream, -MAX_WBITS);
+        return retval;
+}
+
-CamelStream *
-
+read_mode, int write_
-{
-        CamelStreamGZip *self = (CamelStreamGZip *) camel_object_new (camel_stream_gzip_get_type ());
-        int retval;
-
-        self->stream = g_new0 (z_stream, 1);
-        self->level = level;
-        self->mode = mode;
-
-        if (self->mode == CAMEL_STREAM_GZIP_ZIP)
-        {
-                retval = deflateInit2 (self->stream, self->level, Z_DEFLATED, -MAX_WBITS, 
-                        MAX_MEM_LEVEL, Z_DEFAULT_STRATEGY);
-
-                        if (retval != Z_OK)
-                {
-                        camel_object_unref (self);
-                        return NULL;
-                }
-        } else {
-                retval = inflateInit2 (self->stream, -MAX_WBITS);
-                if (retval != Z_OK)
-                {
-                        camel_object_unref (self);
-                        return NULL;
-                }
-        }
-
-        camel_object_ref (CAMEL_OBJECT (real));
-        self->real = real;
-
+        self->r_stream = g_new0 (z_stream, 1);
+        self->w_stream = g_new0 (z_stream, 1);
+        self->level = level;
+        self->read_mode = read_mode;
+        self->write_mode = write_mode;
+
+        retval = set_mode (self->r_stream, level, read_mode);
+        if (retval != Z_OK)
+        {
+                camel_object_unref (self);
+                return NULL;
+        }
+
+
+        retval = set_mode (self->w_stream, level, write_mode);
+        if (retval != Z_OK)
+        {
+                camel_object_unref (self);
+                return NULL;
+        }
+
+
-        return CAMEL_STREAM (self);
-}

trunk/libtinymail-camel/camel-lite/camel/camel-stream-gzip.h

@@ -49 +49 @@
-
-        CamelStream *real;
-
-
+r_stream, *w_
+read_mode, write_
-};
-
@@ -59 +59 @@
-CamelType camel_stream_gzip_get_type (void);
-
-
+read_mode, int write_
-
-#ifdef __cplusplus

trunk/tests/functional/anything.c

@@ -17 +17 @@
-        in = camel_stream_mem_new_with_buffer (TEST, strlen (TEST));
-
-
-
+, CAMEL_STREAM_GZIP_ZIP
+, CAMEL_STREAM_GZIP_UNZIP
-
-        camel_stream_write_to_stream (com, de);

trunk/tinymail/.svnignore

@@ +1 @@
+tny-demoui
-tags
-Makefile.in

trunk/tinymail/Makefile.am

@@ -17 +17 @@
-endif
-
-inymail
+ny-demoui
-
-inymail
+ny_demoui
-        tny-main.c                              \
-        tny-demoui-summary-view.c               \
-        tny-demoui-summary-view.h
-
-inymail
+ny_demoui
-        $(TINYMAIL_LIBS)                                                        \
-        $(LIBTINYMAIL_GNOME_DESKTOP_LIBS)                                       \