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 5f8b477a18c6bcdefdf2d0becd89b7421d7d2a1b..f842c8de9c7abcbba063b8ab79acd2cb77aa323d 100644 (file)
--- 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;
 {
 #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?
         */
 
        /* 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();
                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 013f96ed660635b757b9734e14985d1a0c77fa25..b926a5899b145d2d065122a525b16de50ed39c76 100644 (file)
--- 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;
        unsigned int max = 512;
        unsigned int flags = 0;
        gnutls_datum_t tmp;

-       struct stat s;
+       GStatBuf s;

        int r;
 
        *cert_list = NULL;
        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;
 {
        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");
        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;
 {
        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"),
        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 72c3fd4a79222044b39a2ee2919fc918ec220628..149eae99a10d0880036e05f552ea57de10995054 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -10064,7 +10064,7 @@ warn_err:
                compose_close(compose);
                return TRUE;
        } else {
                compose_close(compose);
                return TRUE;
        } else {

-               struct stat s;
+               GStatBuf s;

                gchar *path;
 
                path = folder_item_fetch_msg(draft, msgnum);
                gchar *path;
 
                path = folder_item_fetch_msg(draft, msgnum);

diff --git a/src/main.c b/src/main.c
index 9ce01bac42c1de43eea67c80906f0d6add38e185..3011800ae0caeff76b1b1dc02f0ab7b3ead23181 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -2140,7 +2140,7 @@ gchar *claws_get_socket_name(void)
        gchar md5sum[33];
 
        if (filename == NULL) {
        gchar md5sum[33];
 
        if (filename == NULL) {

-               struct stat st;
+               GStatBuf st;

                gint stat_ok;
 
                socket_dir = g_strdup_printf("%s%cclaws-mail-%d",
                gint stat_ok;
 
                socket_dir = g_strdup_printf("%s%cclaws-mail-%d",

diff --git a/src/msgcache.c b/src/msgcache.c
index 82480ed9c10b7d02babd720098ac9633860599e9..ac05167751612a26792e8cad753d64cf3cd6fe79 100644 (file)
--- 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;
        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);
 
        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;
        guint32 num;
        gint map_len = -1;
        char *cache_data = NULL;

-       struct stat st;
+       GStatBuf st;

        gboolean error = FALSE;
 
        swapping = TRUE;
        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;
        guint32 num;
        gint map_len = -1;
        char *cache_data = NULL;

-       struct stat st;
+       GStatBuf st;

        gboolean error = FALSE;
 
        swapping = TRUE;
        gboolean error = FALSE;
 
        swapping = TRUE;

diff --git a/src/plugins/archive/libarchive_archive.c b/src/plugins/archive/libarchive_archive.c
index 8266c002caa90f36e2a2d73f7c5ae5153e3a67c6..47fbd302a88d94ca97195524e81e4a55ab9295b5 100644 (file)
--- 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;
        char* buf = NULL;
        ssize_t len;
        int fd;

-       struct stat st;
+       GStatBuf st;

        struct file_info* file;
        gchar* filename = NULL;
        gchar* msg = NULL;
        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 7f72b0ed0f6dfd42d71d35e3f54c723337d6da27..04e1f60c77b664bc7c2654855dab5c7f37ce56a4 100644 (file)
--- 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)
 {
 
 static void cache_stat_item(gpointer filename, gpointer data)
 {

-       struct stat             s;
+       GStatBuf                s;

        const gchar             *fname = (const gchar *) filename;
        AvatarCacheStats        *stats = (AvatarCacheStats *) data;
 
        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 5197ab56142b874c32d15a07f49dbfe3f1e54406..4058c82e949b34ec7f446483b3b5c3474e8168fa 100644 (file)
--- 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;
         
        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;
                 char * data;
                 size_t len;
                 struct claws_mailmbox_msg_info * msg;