Changeset 666

Show
Ignore:
Timestamp:
07/31/06 11:59:07
Author:
pvanhoof
Message:

size_t to gsize

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/libtinymail-camel/tny-camel-stream.c

    r477 r666  
    3535 * error along with setting errno. 
    3636 **/ 
    37 ssize_t  
     37gssize  
    3838tny_camel_stream_write_to_stream (TnyCamelStream *self, TnyStreamIface *output) 
    3939{ 
    4040        CamelStream *stream = CAMEL_STREAM (self); 
    4141        char tmp_buf[4096]; 
    42         ssize_t total = 0; 
    43         ssize_t nb_read; 
    44         ssize_t nb_written; 
     42        gssize total = 0; 
     43        gssize nb_read; 
     44        gssize nb_written; 
    4545        g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1); 
    4646        g_return_val_if_fail (TNY_IS_STREAM_IFACE (output), -1); 
    …… 
    5757                        while (G_LIKELY (nb_written < nb_read)) 
    5858                        { 
    59                                 ssize_t len = tny_stream_iface_write (output, tmp_buf + nb_written, 
     59                                gssize len = tny_stream_iface_write (output, tmp_buf + nb_written, 
    6060                                                                  nb_read - nb_written); 
    6161                                if (G_UNLIKELY (len < 0)) 
    …… 
    7070 
    7171 
    72 static ssize_t 
    73 tny_camel_stream_read (CamelStream *stream, char *buffer, size_t n) 
     72static gssize 
     73tny_camel_stream_read (CamelStream *stream, char *buffer, gsize n) 
    7474{ 
    7575        TnyCamelStream *self = (TnyCamelStream *)stream; 
    …… 
    7777} 
    7878 
    79 static ssize_t 
    80 tny_camel_stream_write (CamelStream *stream, const char *buffer, size_t n) 
     79static gssize 
     80tny_camel_stream_write (CamelStream *stream, const char *buffer, gsize n) 
    8181{ 
    8282        TnyCamelStream *self = (TnyCamelStream *)stream; 

  • trunk/libtinymail-camel/tny-camel-stream.h

    r385 r666  
    5353void             tny_camel_stream_set_stream      (TnyCamelStream *self, TnyStreamIface *stream); 
    5454 
    55 ssize_t          tny_camel_stream_write_to_stream (TnyCamelStream *self, TnyStreamIface *output); 
     55gssize           tny_camel_stream_write_to_stream (TnyCamelStream *self, TnyStreamIface *output); 
    5656 
    5757G_END_DECLS 

  • trunk/libtinymail-camel/tny-stream-camel.c

    r477 r666  
    5454        (G_TYPE_INSTANCE_GET_PRIVATE ((o), TNY_TYPE_STREAM_CAMEL, TnyStreamCamelPriv)) 
    5555 
    56 static ssize_t 
     56static gssize 
    5757tny_stream_camel_write_to_stream (TnyStreamIface *self, TnyStreamIface *output) 
    5858{ 
    …… 
    6060        CamelStream *stream = priv->stream; 
    6161        char tmp_buf[4096]; 
    62         ssize_t total = 0; 
    63         ssize_t nb_read; 
    64         ssize_t nb_written; 
     62        gssize total = 0; 
     63        gssize nb_read; 
     64        gssize nb_written; 
    6565 
    6666        g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1); 
    …… 
    7878                        while (G_UNLIKELY (nb_written < nb_read))  
    7979                        { 
    80                                 ssize_t len = tny_stream_iface_write (output, tmp_buf + nb_written, 
     80                                gssize len = tny_stream_iface_write (output, tmp_buf + nb_written, 
    8181                                                                  nb_read - nb_written); 
    8282                                if (G_UNLIKELY (len < 0)) 
    …… 
    9090} 
    9191 
    92 static ssize_t 
    93 tny_stream_camel_read  (TnyStreamIface *self, char *buffer, size_t n) 
     92static gssize 
     93tny_stream_camel_read  (TnyStreamIface *self, char *buffer, gsize n) 
    9494{ 
    9595        TnyStreamCamelPriv *priv = TNY_STREAM_CAMEL_GET_PRIVATE (self); 
    …… 
    9898} 
    9999 
    100 static ssize_t 
    101 tny_stream_camel_write (TnyStreamIface *self, const char *buffer, size_t n) 
     100static gssize 
     101tny_stream_camel_write (TnyStreamIface *self, const char *buffer, gsize n) 
    102102{ 
    103103        TnyStreamCamelPriv *priv = TNY_STREAM_CAMEL_GET_PRIVATE (self); 

  • trunk/libtinymail-gnomevfs/tny-vfs-stream.c

    r316 r666  
    153153} 
    154154 
    155 static ssize_t 
     155static gssize 
    156156tny_vfs_stream_write_to_stream (TnyStreamIface *self, TnyStreamIface *output) 
    157157{ 
    158158        char tmp_buf[4096]; 
    159         ssize_t total = 0; 
    160         ssize_t nb_read; 
    161         ssize_t nb_written; 
     159        gssize total = 0; 
     160        gssize nb_read; 
     161        gssize nb_written; 
    162162         
    163163        while (G_UNLIKELY (!tny_stream_iface_eos (self))) { 
    …… 
    170170                        while (G_LIKELY (nb_written < nb_read)) 
    171171                        { 
    172                                 ssize_t len = tny_stream_iface_write (output, tmp_buf + nb_written, 
     172                                gssize len = tny_stream_iface_write (output, tmp_buf + nb_written, 
    173173                                                                  nb_read - nb_written); 
    174174                                if (G_UNLIKELY (len < 0)) 
    …… 
    182182} 
    183183 
    184 static ssize_t 
    185 tny_vfs_stream_read  (TnyStreamIface *self, char *buffer, size_t n) 
     184static gssize 
     185tny_vfs_stream_read  (TnyStreamIface *self, char *buffer, gsize n) 
    186186{ 
    187187        TnyVfsStreamPriv *priv = TNY_VFS_STREAM_GET_PRIVATE (self); 
    …… 
    213213} 
    214214 
    215 static ssize_t 
    216 tny_vfs_stream_write (TnyStreamIface *self, const char *buffer, size_t n) 
     215static gssize 
     216tny_vfs_stream_write (TnyStreamIface *self, const char *buffer, gsize n) 
    217217{ 
    218218        TnyVfsStreamPriv *priv = TNY_VFS_STREAM_GET_PRIVATE (self); 

  • trunk/libtinymail/tny-fs-stream.c

    r398 r666  
    6464 
    6565 
    66 static ssize_t 
     66static gssize 
    6767tny_fs_stream_write_to_stream (TnyStreamIface *self, TnyStreamIface *output) 
    6868{ 
    6969        char tmp_buf[4096]; 
    70         ssize_t total = 0; 
    71         ssize_t nb_read; 
    72         ssize_t nb_written; 
     70        gssize total = 0; 
     71        gssize nb_read; 
     72        gssize nb_written; 
    7373         
    7474        while (G_UNLIKELY (!tny_stream_iface_eos (self))) { 
    …… 
    8181                        while (G_LIKELY (nb_written < nb_read)) 
    8282                        { 
    83                                 ssize_t len = tny_stream_iface_write (output, tmp_buf + nb_written, 
     83                                gssize len = tny_stream_iface_write (output, tmp_buf + nb_written, 
    8484                                                                  nb_read - nb_written); 
    8585                                if (G_UNLIKELY (len < 0)) 
    …… 
    9393} 
    9494 
    95 static ssize_t 
    96 tny_fs_stream_read  (TnyStreamIface *self, char *buffer, size_t n) 
    97 { 
    98         TnyFsStreamPriv *priv = TNY_FS_STREAM_GET_PRIVATE (self); 
    99         ssize_t nread; 
     95static gssize 
     96tny_fs_stream_read  (TnyStreamIface *self, char *buffer, gsize n) 
     97{ 
     98        TnyFsStreamPriv *priv = TNY_FS_STREAM_GET_PRIVATE (self); 
     99        gssize nread; 
    100100         
    101101        if ((nread = read (priv->fd, buffer, n)) > 0) 
    …… 
    108108} 
    109109 
    110 static ssize_t 
    111 tny_fs_stream_write (TnyStreamIface *self, const char *buffer, size_t n) 
    112 { 
    113         TnyFsStreamPriv *priv = TNY_FS_STREAM_GET_PRIVATE (self); 
    114         ssize_t nwritten; 
     110static gssize 
     111tny_fs_stream_write (TnyStreamIface *self, const char *buffer, gsize n) 
     112{ 
     113        TnyFsStreamPriv *priv = TNY_FS_STREAM_GET_PRIVATE (self); 
     114        gssize nwritten; 
    115115                 
    116116        if ((nwritten = write (priv->fd, buffer, n)) > 0) 

  • trunk/libtinymail/tny-stream-iface.c

    r522 r666  
    3333 * error along with setting errno. 
    3434 **/ 
    35 ssize_t 
     35gssize 
    3636tny_stream_iface_write_to_stream (TnyStreamIface *self, TnyStreamIface *output) 
    3737{ 
    …… 
    5555 * set errno. 
    5656 **/ 
    57 ssize_t 
    58 tny_stream_iface_read  (TnyStreamIface *self, char *buffer, size_t n) 
     57gssize 
     58tny_stream_iface_read  (TnyStreamIface *self, char *buffer, gsize n) 
    5959{ 
    6060#ifdef DEBUG 
    …… 
    7777 * along with setting errno. 
    7878 **/ 
    79 ssize_t 
    80 tny_stream_iface_write (TnyStreamIface *self, const char *buffer, size_t n) 
     79gssize 
     80tny_stream_iface_write (TnyStreamIface *self, const char *buffer, gsize n) 
    8181{ 
    8282#ifdef DEBUG 

  • trunk/libtinymail/tny-stream-iface.h

    r637 r666  
    4040        GTypeInterface parent; 
    4141 
    42         ssize_t   (*read_func)            (TnyStreamIface *self, char *buffer, size_t n); 
    43         ssize_t   (*write_func)           (TnyStreamIface *self, const char *buffer, size_t n); 
     42        gssize    (*read_func)            (TnyStreamIface *self, char *buffer, gsize n); 
     43        gssize    (*write_func)           (TnyStreamIface *self, const char *buffer, gsize n); 
    4444        gint      (*flush_func)           (TnyStreamIface *self); 
    4545        gint      (*close_func)           (TnyStreamIface *self); 
    4646        gboolean  (*eos_func)             (TnyStreamIface *self); 
    4747        gint      (*reset_func)           (TnyStreamIface *self); 
    48         ssize_t   (*write_to_stream_func) (TnyStreamIface *self, TnyStreamIface *output); 
     48        gssize    (*write_to_stream_func) (TnyStreamIface *self, TnyStreamIface *output); 
    4949}; 
    5050 
    5151GType     tny_stream_iface_get_type        (void); 
    5252 
    53 ssize_t   tny_stream_iface_read            (TnyStreamIface *self, char *buffer, size_t n); 
    54 ssize_t   tny_stream_iface_write           (TnyStreamIface *self, const char *buffer, size_t n); 
     53gssize    tny_stream_iface_read            (TnyStreamIface *self, char *buffer, gsize n); 
     54gssize    tny_stream_iface_write           (TnyStreamIface *self, const char *buffer, gsize n); 
    5555gint      tny_stream_iface_flush           (TnyStreamIface *self); 
    5656gint      tny_stream_iface_close           (TnyStreamIface *self); 
    5757gboolean  tny_stream_iface_eos             (TnyStreamIface *self); 
    5858gint      tny_stream_iface_reset           (TnyStreamIface *self); 
    59 ssize_t   tny_stream_iface_write_to_stream (TnyStreamIface *self, TnyStreamIface *output); 
     59gssize    tny_stream_iface_write_to_stream (TnyStreamIface *self, TnyStreamIface *output); 
    6060 
    6161G_END_DECLS 

  • trunk/libtinymailui-gtk/tny-text-buffer-stream.c

    r478 r666  
    4242 
    4343 
    44 static ssize_t 
     44static gssize 
    4545tny_text_buffer_write_to_stream (TnyStreamIface *self, TnyStreamIface *output) 
    4646{ 
    4747        char tmp_buf[4096]; 
    48         ssize_t total = 0; 
    49         ssize_t nb_read; 
    50         ssize_t nb_written; 
     48        gssize total = 0; 
     49        gssize nb_read; 
     50        gssize nb_written; 
    5151         
    5252        while (G_LIKELY (!tny_stream_iface_eos (self)))  
    …… 
    6060                        while (G_LIKELY (nb_written < nb_read)) 
    6161                        { 
    62                                 ssize_t len = tny_stream_iface_write (output, tmp_buf + nb_written, 
     62                                gssize len = tny_stream_iface_write (output, tmp_buf + nb_written, 
    6363                                                                  nb_read - nb_written); 
    6464                                if (G_UNLIKELY (len < 0)) 
    …… 
    7272} 
    7373 
    74 static ssize_t 
    75 tny_text_buffer_stream_read  (TnyStreamIface *self, char *buffer, size_t n) 
     74static gssize 
     75tny_text_buffer_stream_read  (TnyStreamIface *self, char *buffer, gsize n) 
    7676{ 
    7777        TnyTextBufferStreamPriv *priv = TNY_TEXT_BUFFER_STREAM_GET_PRIVATE (self); 
    …… 
    9292        buffer = gtk_text_buffer_get_text (priv->buffer, &(priv->cur), &dest, TRUE); 
    9393 
    94         return (ssize_t) rlength; 
    95 } 
    96  
    97 static ssize_t 
    98 tny_text_buffer_stream_write (TnyStreamIface *self, const char *buffer, size_t n) 
     94        return (gssize) rlength; 
     95} 
     96 
     97static gssize 
     98tny_text_buffer_stream_write (TnyStreamIface *self, const char *buffer, gsize n) 
    9999{ 
    100100        TnyTextBufferStreamPriv *priv = TNY_TEXT_BUFFER_STREAM_GET_PRIVATE (self); 
    …… 
    102102        gtk_text_buffer_insert (priv->buffer, &(priv->cur), buffer, (gint)n); 
    103103 
    104         return (ssize_t) n; 
     104        return (gssize) n; 
    105105} 
    106106