[Commits] [SCM] claws branch, master, updated. 3.11.1-178-ga36b173

ticho at claws-mail.org ticho at claws-mail.org
Mon Jun 29 11:44:35 CEST 2015


The branch, master has been updated
       via  a36b1736604ff0b80c92eed0dbe484a0e32fea54 (commit)
      from  0faddd1e85965b10671c267f727d8be3aa791546 (commit)

Summary of changes:
 src/common/socket.c                       |    4 ++--
 src/common/ssl_certificate.c              |    6 +++---
 src/compose.c                             |    2 +-
 src/main.c                                |    2 +-
 src/msgcache.c                            |    6 +++---
 src/plugins/archive/libarchive_archive.c  |    2 +-
 src/plugins/libravatar/libravatar_cache.c |    2 +-
 src/plugins/mailmbox/mailmbox_folder.c    |    2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)


- Log -----------------------------------------------------------------
commit a36b1736604ff0b80c92eed0dbe484a0e32fea54
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Mon Jun 29 11:44:13 2015 +0200

    Get rid of last remaining "struct stat" variables.
    
    GStatBuf is used instead.

diff --git a/src/common/socket.c b/src/common/socket.c
index 5f8b477..f842c8d 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -218,14 +218,14 @@ void refresh_resolvers(void)
 {
 #ifdef G_OS_UNIX
 	static time_t resolv_conf_changed = (time_t)NULL;
-	struct stat s;
+	GStatBuf s;
 
 	/* This makes the glibc re-read resolv.conf, if it changed
 	 * since our startup. Maybe that should be #ifdef'ed, I don't
 	 * know if it'd work on BSDs.
 	 * Why doesn't the glibc do it by itself?
 	 */
-	if (stat("/etc/resolv.conf", &s) == 0) {
+	if (g_stat("/etc/resolv.conf", &s) == 0) {
 		if (s.st_mtime > resolv_conf_changed) {
 			resolv_conf_changed = s.st_mtime;
 			res_init();
diff --git a/src/common/ssl_certificate.c b/src/common/ssl_certificate.c
index 013f96e..b926a58 100644
--- a/src/common/ssl_certificate.c
+++ b/src/common/ssl_certificate.c
@@ -224,7 +224,7 @@ static int gnutls_import_X509_list_fp(FILE *fp, gnutls_x509_crt_fmt_t format,
 	unsigned int max = 512;
 	unsigned int flags = 0;
 	gnutls_datum_t tmp;
-	struct stat s;
+	GStatBuf s;
 	int r;
 
 	*cert_list = NULL;
@@ -292,7 +292,7 @@ static gnutls_x509_privkey_t gnutls_import_key_fp(FILE *fp, gnutls_x509_crt_fmt_
 {
 	gnutls_x509_privkey_t key = NULL;
 	gnutls_datum_t tmp;
-	struct stat s;
+	GStatBuf s;
 	int r;
 	if (fstat(fileno(fp), &s) < 0) {
 		perror("fstat");
@@ -322,7 +322,7 @@ static gnutls_pkcs12_t gnutls_import_PKCS12_fp(FILE *fp, gnutls_x509_crt_fmt_t f
 {
 	gnutls_pkcs12_t p12 = NULL;
 	gnutls_datum_t tmp;
-	struct stat s;
+	GStatBuf s;
 	int r;
 	if (fstat(fileno(fp), &s) < 0) {
 		log_error(LOG_PROTOCOL, _("Cannot stat P12 certificate file (%s)\n"),
diff --git a/src/compose.c b/src/compose.c
index 72c3fd4..149eae9 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -10064,7 +10064,7 @@ warn_err:
 		compose_close(compose);
 		return TRUE;
 	} else {
-		struct stat s;
+		GStatBuf s;
 		gchar *path;
 
 		path = folder_item_fetch_msg(draft, msgnum);
diff --git a/src/main.c b/src/main.c
index 9ce01ba..3011800 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2140,7 +2140,7 @@ gchar *claws_get_socket_name(void)
 	gchar md5sum[33];
 
 	if (filename == NULL) {
-		struct stat st;
+		GStatBuf st;
 		gint stat_ok;
 
 		socket_dir = g_strdup_printf("%s%cclaws-mail-%d",
diff --git a/src/msgcache.c b/src/msgcache.c
index 82480ed..ac05167 100644
--- a/src/msgcache.c
+++ b/src/msgcache.c
@@ -581,7 +581,7 @@ MsgCache *msgcache_read_cache(FolderItem *item, const gchar *cache_file)
 	guint memusage = 0;
 	gint tmp_len = 0, map_len = -1;
 	char *cache_data = NULL;
-	struct stat st;
+	GStatBuf st;
 
 	cm_return_val_if_fail(cache_file != NULL, NULL);
 	cm_return_val_if_fail(item != NULL, NULL);
@@ -804,7 +804,7 @@ void msgcache_read_mark(MsgCache *cache, const gchar *mark_file)
 	guint32 num;
 	gint map_len = -1;
 	char *cache_data = NULL;
-	struct stat st;
+	GStatBuf st;
 	gboolean error = FALSE;
 
 	swapping = TRUE;
@@ -898,7 +898,7 @@ void msgcache_read_tags(MsgCache *cache, const gchar *tags_file)
 	guint32 num;
 	gint map_len = -1;
 	char *cache_data = NULL;
-	struct stat st;
+	GStatBuf st;
 	gboolean error = FALSE;
 
 	swapping = TRUE;
diff --git a/src/plugins/archive/libarchive_archive.c b/src/plugins/archive/libarchive_archive.c
index 8266c00..47fbd30 100644
--- a/src/plugins/archive/libarchive_archive.c
+++ b/src/plugins/archive/libarchive_archive.c
@@ -470,7 +470,7 @@ const gchar* archive_create(const char* archive_name, GSList* files,
 	char* buf = NULL;
 	ssize_t len;
 	int fd;
-	struct stat st;
+	GStatBuf st;
 	struct file_info* file;
 	gchar* filename = NULL;
 	gchar* msg = NULL;
diff --git a/src/plugins/libravatar/libravatar_cache.c b/src/plugins/libravatar/libravatar_cache.c
index 7f72b0e..04e1f60 100644
--- a/src/plugins/libravatar/libravatar_cache.c
+++ b/src/plugins/libravatar/libravatar_cache.c
@@ -54,7 +54,7 @@ gchar *libravatar_cache_init(const char *dirs[], gint start, gint end)
 
 static void cache_stat_item(gpointer filename, gpointer data)
 {
-	struct stat		s;
+	GStatBuf		s;
 	const gchar		*fname = (const gchar *) filename;
 	AvatarCacheStats	*stats = (AvatarCacheStats *) data;
 
diff --git a/src/plugins/mailmbox/mailmbox_folder.c b/src/plugins/mailmbox/mailmbox_folder.c
index 5197ab5..4058c82 100644
--- a/src/plugins/mailmbox/mailmbox_folder.c
+++ b/src/plugins/mailmbox/mailmbox_folder.c
@@ -683,7 +683,7 @@ static gint claws_mailmbox_add_msgs(Folder *folder, FolderItem *dest,
         
 	for (cur = file_list; cur != NULL; cur = cur->next) {
                 int fd;
-                struct stat stat_info;
+                GStatBuf stat_info;
                 char * data;
                 size_t len;
                 struct claws_mailmbox_msg_info * msg;

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


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list