[SCM] GNU Mailutils branch, master, updated. rel-2_1-28-gc0e1fc8

[Sergey Poznyakoff]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=c0e1fc828e69eceb34fab770b888cce3843c6e7f

The branch, master has been updated
       via  c0e1fc828e69eceb34fab770b888cce3843c6e7f (commit)
      from  93b51f57127ffacae8bc15b4e0a7d86aa6338fba (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c0e1fc828e69eceb34fab770b888cce3843c6e7f
Author: Sergey Poznyakoff <address@hidden>
Date:   Thu Jan 14 16:04:31 2010 +0200

    More fixes in libmu_scm.
    
    * libmu_scm/mu_mailbox.c (mu-mailbox-get-port): Fix return value.
    * libmu_scm/mu_port.c (mu_port_flush): Avoid warnings on passing
    arg 2 to mu_stream_write.
    (mu_port_free): Return 0.
    * libmu_scm/mu_message.c (mu_scm_message_free): Return 0.

-----------------------------------------------------------------------

Summary of changes:
 libmu_scm/mu_mailbox.c |    5 +++--
 libmu_scm/mu_message.c |    2 +-
 libmu_scm/mu_port.c    |    4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/libmu_scm/mu_mailbox.c b/libmu_scm/mu_mailbox.c
index dbc56df..4d4eb55 100644
--- a/libmu_scm/mu_mailbox.c
+++ b/libmu_scm/mu_mailbox.c
@@ -304,6 +304,7 @@ SCM_DEFINE (scm_mu_mailbox_get_port, "mu-mailbox-get-port", 
2, 0, 0,
   mu_stream_t stream;
   int status;
   char *s;
+  SCM ret;
   
   SCM_ASSERT (mu_scm_is_mailbox (MBOX), MBOX, SCM_ARG1, FUNC_NAME);
   SCM_ASSERT (scm_is_string (MODE), MODE, SCM_ARG2, FUNC_NAME);
@@ -314,9 +315,9 @@ SCM_DEFINE (scm_mu_mailbox_get_port, "mu-mailbox-get-port", 
2, 0, 0,
                  "Cannot get mailbox stream",
                  scm_list_1 (MBOX));
   s = scm_to_locale_string (MODE);
-  status = mu_port_make_from_stream (MBOX, stream, scm_mode_bits (s));
+  ret = mu_port_make_from_stream (MBOX, stream, scm_mode_bits (s));
   free (s);
-  return status;
+  return ret;
 }
 #undef FUNC_NAME
 
diff --git a/libmu_scm/mu_message.c b/libmu_scm/mu_message.c
index 9e178cd..61d4c78 100644
--- a/libmu_scm/mu_message.c
+++ b/libmu_scm/mu_message.c
@@ -47,7 +47,7 @@ mu_scm_message_free (SCM message_smob)
   if (mum->needs_destroy)
     mu_message_destroy (&mum->msg, NULL);
   free (mum);
-  return sizeof (struct mu_message);
+  return 0;
 }
 
 static char *
diff --git a/libmu_scm/mu_port.c b/libmu_scm/mu_port.c
index 180fc60..8b2906c 100644
--- a/libmu_scm/mu_port.c
+++ b/libmu_scm/mu_port.c
@@ -121,7 +121,7 @@ mu_port_flush (SCM port)
   
   if (wrsize)
     {
-      if (mu_stream_write (mp->stream, (char*) pt->write_buf,
+      if (mu_stream_write (mp->stream, (const char*)pt->write_buf,
                           wrsize, mp->offset, &n))
        return;
       mp->offset += n;
@@ -152,7 +152,7 @@ static scm_sizet
 mu_port_free (SCM port)
 {
   mu_port_close (port);
-  return sizeof (struct mu_port); /*FIXME: approximate */
+  return 0;
 }
 
 static int


hooks/post-receive
-- 
GNU Mailutils