More work on replace deprecated readdir_r()

[citadel.git] / citadel / modules / image / serv_image.c

diff --git a/citadel/modules/image/serv_image.c b/citadel/modules/image/serv_image.c
index a7960b10097ebb0697e8c350baa62d1dbb573856..b8215ca6c5595d0fcfc4543c510dc55251a470e3 100644 (file)
--- a/citadel/modules/image/serv_image.c
+++ b/citadel/modules/image/serv_image.c
@@ -277,7 +277,6 @@ void import_old_userpic_files(void)
 {
        DIR *filedir = NULL;
        struct dirent *filedir_entry;
-       struct dirent *d;
        size_t d_namelen;
        struct ctdluser usbuf;
        long usernum = 0;
@@ -287,14 +286,8 @@ void import_old_userpic_files(void)
 
 
        syslog(LOG_DEBUG, "Importing old style userpic files into the message base");
-       d = (struct dirent *)malloc(offsetof(struct dirent, d_name) + PATH_MAX + 2);
-       if (d == NULL) {
-               return;
-       }
-
        filedir = opendir (ctdl_usrpic_dir);
        if (filedir == NULL) {
-               free(d);
                return;
        }
        while ( (filedir_entry = readdir(filedir)) , (filedir_entry != NULL))
@@ -348,7 +341,6 @@ void import_old_userpic_files(void)
                        }
                }
        }
-       free(d);
        closedir(filedir);
        rmdir(ctdl_usrpic_dir);
 }