GNOME.org
 

[balsa] Build with clang (Albrecht Dreß)

commit 4ee3e0e4b91864c24da395319c9e2942493a346d
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Mon Feb 23 18:14:22 2015 -0500

    Build with clang (Albrecht Dreß)
    
        * configure.in:
        * libbalsa/files.c (libbalsa_icon_finder):
        * libbalsa/imap/auth-cram.c (imap_auth_cram):
        * libbalsa/imap/imap-commands.c (imap_mbox_handle_can_do):
        * libbalsa/imap/imap-handle.c (imap_get_address):
        * libbalsa/imap/imap_compress.c (imap_compress_init):
        * libbalsa/imap/imap_tst.c (main):
        * libbalsa/libbalsa.c (libbalsa_init):
        * libbalsa/mailbox_imap.c (libbalsa_mailbox_imap_noop),
        (lbmi_get_imap_sort_key):
        * libbalsa/mailbox_mbox.c (libbalsa_mailbox_mbox_sync):
        * libbalsa/mailbox_mh.c (lbm_mh_get_info), (lbm_mh_parse_mailbox),
        (lbm_mh_flag_line), (libbalsa_mailbox_mh_sync):
        * libbalsa/message.h:
        * libbalsa/send.c (lbs_process_queue):
        * libbalsa/smtp-server.c (smtp_server_tls_widget),
        (smtp_server_response):
        * libbalsa/url.c:

 ChangeLog                     |   23 +++++++++++++++++++++++
 configure.in                  |    2 +-
 libbalsa/files.c              |    2 +-
 libbalsa/imap/auth-cram.c     |    2 +-
 libbalsa/imap/imap-commands.c |    2 +-
 libbalsa/imap/imap-handle.c   |    6 ++++--
 libbalsa/imap/imap_compress.c |    2 +-
 libbalsa/imap/imap_tst.c      |    4 +++-
 libbalsa/libbalsa.c           |    2 ++
 libbalsa/mailbox_imap.c       |    6 +++---
 libbalsa/mailbox_mbox.c       |    2 +-
 libbalsa/mailbox_mh.c         |   14 ++++++--------
 libbalsa/message.h            |    3 ++-
 libbalsa/send.c               |    4 ++--
 libbalsa/smtp-server.c        |   12 ++++++------
 libbalsa/url.c                |    2 +-
 16 files changed, 58 insertions(+), 30 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 2b388be..452dc74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2015-02-23  Albrecht Dreß
+
+       Build with clang
+
+       * configure.in:
+       * libbalsa/files.c (libbalsa_icon_finder):
+       * libbalsa/imap/auth-cram.c (imap_auth_cram):
+       * libbalsa/imap/imap-commands.c (imap_mbox_handle_can_do):
+       * libbalsa/imap/imap-handle.c (imap_get_address):
+       * libbalsa/imap/imap_compress.c (imap_compress_init):
+       * libbalsa/imap/imap_tst.c (main):
+       * libbalsa/libbalsa.c (libbalsa_init):
+       * libbalsa/mailbox_imap.c (libbalsa_mailbox_imap_noop),
+       (lbmi_get_imap_sort_key):
+       * libbalsa/mailbox_mbox.c (libbalsa_mailbox_mbox_sync):
+       * libbalsa/mailbox_mh.c (lbm_mh_get_info), (lbm_mh_parse_mailbox),
+       (lbm_mh_flag_line), (libbalsa_mailbox_mh_sync):
+       * libbalsa/message.h:
+       * libbalsa/send.c (lbs_process_queue):
+       * libbalsa/smtp-server.c (smtp_server_tls_widget),
+       (smtp_server_response):
+       * libbalsa/url.c:
+
 2015-02-16  Albrecht Dreß
 
        * libbalsa/imap/imap-tls.c (imap_create_ssl): disable SSLv3,
diff --git a/configure.in b/configure.in
index d188dbe..5a2da83 100644
--- a/configure.in
+++ b/configure.in
@@ -869,7 +869,7 @@ dnl #####################################################################
 AC_C_CONST
 AC_STDC_HEADERS
 
-AC_DEFINE([_XOPEN_SOURCE],[500],[We strive for XOPEN compliance])
+# AC_DEFINE([_XOPEN_SOURCE],[500],[We strive for XOPEN compliance])
 AC_CHECK_DECLS([localtime_r, gmtime_r, ctime_r], [], [], [[#include <time.h>]])
 AC_CHECK_FUNCS([localtime_r gmtime_r ctime_r])
 AC_CHECK_HEADER([zlib.h],,AC_MSG_ERROR([zlib library required]))
diff --git a/libbalsa/files.c b/libbalsa/files.c
index 68bc880..dcf703e 100644
--- a/libbalsa/files.c
+++ b/libbalsa/files.c
@@ -136,7 +136,7 @@ libbalsa_icon_finder(const char *mime_type, const LibbalsaVfs * for_file,
     GtkIconTheme *icon_theme;
 
     if (!gtk_icon_size_lookup(size, &width, &height))
-       width = height = 16;
+       width = 16;
     
     if (mime_type)
         content_type = mime_type;
diff --git a/libbalsa/imap/auth-cram.c b/libbalsa/imap/auth-cram.c
index 459d99d..9e9c2ee 100644
--- a/libbalsa/imap/auth-cram.c
+++ b/libbalsa/imap/auth-cram.c
@@ -114,7 +114,7 @@ imap_auth_cram(ImapMboxHandle* handle)
    */
   
   lit_conv_to_base64(ibuf, obuf, strlen (obuf), sizeof(ibuf)-2);
-  strncat (ibuf, "\r\n", sizeof (ibuf));
+  strncat (ibuf, "\r\n", sizeof(ibuf) - strlen(ibuf) - 1);
   imap_handle_write(handle, ibuf, strlen(ibuf));
   imap_handle_flush(handle);
   g_free(user); g_free(pass); /* FIXME: clean passwd first */
diff --git a/libbalsa/imap/imap-commands.c b/libbalsa/imap/imap-commands.c
index 10c8886..41010e7 100644
--- a/libbalsa/imap/imap-commands.c
+++ b/libbalsa/imap/imap-commands.c
@@ -138,7 +138,7 @@ imap_mbox_handle_can_do(ImapMboxHandle* handle, ImapCapability cap)
   if(!handle->has_capabilities)
     imap_check_capability(handle);
 
-  if(cap>=0 && cap<IMCAP_MAX)
+  if(cap<IMCAP_MAX)
     return handle->capabilities[cap];
   else return 0;
 }
diff --git a/libbalsa/imap/imap-handle.c b/libbalsa/imap/imap-handle.c
index 4890d43..8caad34 100644
--- a/libbalsa/imap/imap-handle.c
+++ b/libbalsa/imap/imap-handle.c
@@ -18,7 +18,7 @@
 
 #define _POSIX_C_SOURCE 199506L
 #define _XOPEN_SOURCE 500
-#define _BSD_SOURCE     1
+#define _DEFAULT_SOURCE 1
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -3253,7 +3253,9 @@ imap_get_address(struct siobuf* sio)
   
   for(i=0; i<4; i++) {
     addr[i] = imap_get_nstring(sio);
-    if( (c=sio_getc(sio)) != ' '); /* error if i < 3 but do nothing */
+    if( (c=sio_getc(sio)) != ' ') {
+       /* error if i < 3 but do nothing */
+    }
   }
 
   if (addr[0] && (p = strchr(addr[0], '\r'))) {
diff --git a/libbalsa/imap/imap_compress.c b/libbalsa/imap/imap_compress.c
index 65716e6..0a78f38 100644
--- a/libbalsa/imap/imap_compress.c
+++ b/libbalsa/imap/imap_compress.c
@@ -150,7 +150,7 @@ imap_compress(ImapMboxHandle *handle)
 void
 imap_compress_init(struct ImapCompressContext *buf)
 {
-  memset(buf, 0, sizeof(buf));
+  memset(buf, 0, sizeof(struct ImapCompressContext));
 }
 
 /** releases any data that might have been allocated by compression routines. */
diff --git a/libbalsa/imap/imap_tst.c b/libbalsa/imap/imap_tst.c
index ad3be4c..d444062 100644
--- a/libbalsa/imap/imap_tst.c
+++ b/libbalsa/imap/imap_tst.c
@@ -645,7 +645,9 @@ process_options(int argc, char *argv[])
 
 int
 main(int argc, char *argv[]) {
-  g_type_init();
+#if (GLIB_MINOR_VERSION < 36)
+  g_type_init(); /* not required since glib 2.36 */
+#endif
 
   if(argc<=1) {
     test_envelope_strings();
diff --git a/libbalsa/libbalsa.c b/libbalsa/libbalsa.c
index 26f6f19..90705b4 100644
--- a/libbalsa/libbalsa.c
+++ b/libbalsa/libbalsa.c
@@ -93,9 +93,11 @@ libbalsa_init(LibBalsaInformationFunc information_callback)
 #endif
 
 #ifdef BALSA_USE_THREADS
+#if (GLIB_MINOR_VERSION < 31)
     if (!g_thread_supported()) {
        g_error("Threads have not been initialised.");
     }
+#endif
     main_thread_id = pthread_self();
 #endif
 
diff --git a/libbalsa/mailbox_imap.c b/libbalsa/mailbox_imap.c
index daee24d..549970b 100644
--- a/libbalsa/mailbox_imap.c
+++ b/libbalsa/mailbox_imap.c
@@ -1725,9 +1725,9 @@ libbalsa_mailbox_imap_noop(LibBalsaMailboxImap* mimap)
     g_return_if_fail(mimap != NULL);
 
     if (mimap->handle) /* we do not attempt to reconnect here */
-       if (imap_mbox_handle_noop(mimap->handle) != IMR_OK)
+       if (imap_mbox_handle_noop(mimap->handle) != IMR_OK) {
            /* FIXME: report error... */
-           ;
+       }
 }
 
 void
@@ -3153,7 +3153,7 @@ libbalsa_mailbox_imap_can_do(LibBalsaMailbox* mbox,
 static ImapSortKey
 lbmi_get_imap_sort_key(LibBalsaMailbox *mbox)
 {
-    ImapSortKey key = LB_MBOX_FROM_COL;
+    ImapSortKey key = (ImapSortKey) LB_MBOX_FROM_COL;
 
     switch (mbox->view->sort_field) {
     default:
diff --git a/libbalsa/mailbox_mbox.c b/libbalsa/mailbox_mbox.c
index 5f3928c..a097a75 100644
--- a/libbalsa/mailbox_mbox.c
+++ b/libbalsa/mailbox_mbox.c
@@ -1515,7 +1515,7 @@ libbalsa_mailbox_mbox_sync(LibBalsaMailbox * mailbox, gboolean expunge)
     temp_stream = g_mime_stream_fs_new(i);
 
     for (i = first; i < messages; i++) {
-       guint status_len, x_status_len;
+       gint status_len, x_status_len;
 
        msg_info = message_info_from_msgno(mbox, i + 1);
        if (expunge && (msg_info->local_info.flags & LIBBALSA_MESSAGE_FLAG_DELETED))
diff --git a/libbalsa/mailbox_mh.c b/libbalsa/mailbox_mh.c
index cfd3379..dc864e2 100644
--- a/libbalsa/mailbox_mh.c
+++ b/libbalsa/mailbox_mh.c
@@ -301,8 +301,6 @@ lbm_mh_remove_files(LibBalsaMailboxLocal *mailbox)
     LIBBALSA_MAILBOX_LOCAL_CLASS(parent_class)->remove_files(mailbox);
 }
 
-#define INVALID_FLAG ((unsigned) -1)
-
 static LibBalsaMailboxLocalMessageInfo *
 lbm_mh_get_info(LibBalsaMailboxLocal * local, guint msgno)
 {
@@ -310,7 +308,7 @@ lbm_mh_get_info(LibBalsaMailboxLocal * local, guint msgno)
 
     msg_info = lbm_mh_message_info_from_msgno(LIBBALSA_MAILBOX_MH(local),
                                              msgno);
-    if (msg_info->local_info.flags == INVALID_FLAG)
+    if (msg_info->local_info.flags == LIBBALSA_MESSAGE_FLAG_INVALID)
         msg_info->local_info.flags = msg_info->orig_flags;
 
     return &msg_info->local_info;
@@ -371,7 +369,7 @@ lbm_mh_parse_mailbox(LibBalsaMailboxMh * mh, gboolean add_msg_info)
                                    GINT_TO_POINTER(fileno));
            if (!msg_info) {
                msg_info = g_new0(struct message_info, 1);
-               msg_info->local_info.flags = INVALID_FLAG;
+               msg_info->local_info.flags = LIBBALSA_MESSAGE_FLAG_INVALID;
                g_hash_table_insert(mh->messages_info,
                                    GINT_TO_POINTER(fileno), msg_info);
                g_ptr_array_add(mh->msgno_2_msg_info, msg_info);
@@ -757,7 +755,7 @@ static void
 lbm_mh_flag_line(struct message_info *msg_info, LibBalsaMessageFlag flag,
                 struct line_info *li)
 {
-    if (msg_info->local_info.flags == INVALID_FLAG)
+    if (msg_info->local_info.flags == LIBBALSA_MESSAGE_FLAG_INVALID)
        msg_info->local_info.flags = msg_info->orig_flags;
     if (!(msg_info->local_info.flags & flag))
        return;
@@ -830,7 +828,7 @@ libbalsa_mailbox_mh_sync(LibBalsaMailbox * mailbox, gboolean expunge)
     msgno = 1;
     while (msgno <= mh->msgno_2_msg_info->len) {
        msg_info = lbm_mh_message_info_from_msgno(mh, msgno);
-       if (msg_info->local_info.flags == INVALID_FLAG)
+       if (msg_info->local_info.flags == LIBBALSA_MESSAGE_FLAG_INVALID)
            msg_info->local_info.flags = msg_info->orig_flags;
        if (mailbox->state == LB_MAILBOX_STATE_CLOSING)
            msg_info->local_info.flags &= ~LIBBALSA_MESSAGE_FLAG_RECENT;
@@ -872,9 +870,9 @@ libbalsa_mailbox_mh_sync(LibBalsaMailbox * mailbox, gboolean expunge)
                new_file = g_build_filename(path, tmp, NULL);
                g_free(tmp);
 
-               if (libbalsa_safe_rename(old_file, new_file) == -1)
+               if (libbalsa_safe_rename(old_file, new_file) == -1) {
                    /* FIXME: report error ... */
-                   ;
+               }
 
                g_free(old_file);
                g_free(new_file);
diff --git a/libbalsa/message.h b/libbalsa/message.h
index d8a19d5..86f26b2 100644
--- a/libbalsa/message.h
+++ b/libbalsa/message.h
@@ -61,7 +61,8 @@ enum _LibBalsaMessageFlag {
     LIBBALSA_MESSAGE_FLAG_REPLIED = 1 << 2,
     LIBBALSA_MESSAGE_FLAG_FLAGGED = 1 << 3,
     LIBBALSA_MESSAGE_FLAG_RECENT  = 1 << 4,
-    LIBBALSA_MESSAGE_FLAG_SELECTED= 1 << 5     /* pseudo flag */
+    LIBBALSA_MESSAGE_FLAG_SELECTED= 1 << 5,    /* pseudo flag */
+    LIBBALSA_MESSAGE_FLAG_INVALID = 1 << 6     /* pseudo flag */
 };
 
 #define LIBBALSA_MESSAGE_FLAGS_REAL \
diff --git a/libbalsa/send.c b/libbalsa/send.c
index 413184b..fb303d2 100644
--- a/libbalsa/send.c
+++ b/libbalsa/send.c
@@ -22,7 +22,7 @@
 # include "config.h"
 #endif                          /* HAVE_CONFIG_H */
 
-#define _BSD_SOURCE     1 
+#define _DEFAULT_SOURCE 1 
 #define _POSIX_C_SOURCE 199309L
 #include "send.h"
 
@@ -667,7 +667,7 @@ lbs_process_queue(LibBalsaMailbox * outbox, LibBalsaFccboxFinder finder,
     g_free(host_with_port);
 
     /* Tell libESMTP how to use the SMTP STARTTLS extension.  */
-    smtp_starttls_enable (session, server->tls_mode);
+    smtp_starttls_enable (session, (enum starttls_option) server->tls_mode);
 
     /* Now tell libESMTP it can use the SMTP AUTH extension.  */
     smtp_auth_set_context(session,
diff --git a/libbalsa/smtp-server.c b/libbalsa/smtp-server.c
index 4ccaa99..da37969 100644
--- a/libbalsa/smtp-server.c
+++ b/libbalsa/smtp-server.c
@@ -395,13 +395,13 @@ smtp_server_tls_widget(LibBalsaSmtpServer * smtp_server)
 #endif                          /* GTK_CHECK_VERSION(2, 24, 0) */
 
     switch (server->tls_mode) {
-    case Starttls_DISABLED:
+    case LIBBALSA_TLS_DISABLED:
         gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box), 0);
         break;
-    case Starttls_ENABLED:
+    case LIBBALSA_TLS_ENABLED:
         gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box), 1);
         break;
-    case Starttls_REQUIRED:
+    case LIBBALSA_TLS_REQUIRED:
         gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box), 2);
         break;
     default:
@@ -446,13 +446,13 @@ smtp_server_response(GtkDialog * dialog, gint response,
 #if HAVE_SMTP_TLS_CLIENT_CERTIFICATE
         switch (gtk_combo_box_get_active(GTK_COMBO_BOX(sdi->tlsm))) {
         case 0:
-            server->tls_mode = Starttls_DISABLED;
+            server->tls_mode = LIBBALSA_TLS_DISABLED;
             break;
         case 1:
-            server->tls_mode = Starttls_ENABLED;
+            server->tls_mode = LIBBALSA_TLS_ENABLED;
             break;
         case 2:
-            server->tls_mode = Starttls_REQUIRED;
+            server->tls_mode = LIBBALSA_TLS_REQUIRED;
             break;
         default:
             break;
diff --git a/libbalsa/url.c b/libbalsa/url.c
index 156883f..76ce560 100644
--- a/libbalsa/url.c
+++ b/libbalsa/url.c
@@ -19,7 +19,7 @@
  * A simple URL parser.
  */
 
-#define _BSD_SOURCE 1
+#define _DEFAULT_SOURCE 1
 
 #include <stdio.h>
 #include <ctype.h>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]