From: Rémi Denis-Courmont <remi@remlab.net>
Date: Fri, 10 Sep 2010 01:43:44 +0000 (+0300)
Subject: Revert "skins: use readdir_r() instead of readdir()"
X-Git-Tag: 1.2.0-pre1~5286
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=11d4295550ce6496001c34d90e8ad9c9fbeaadf4;p=vlc

Revert "skins: use readdir_r() instead of readdir()"

This reverts commit 4bf419574b51ced5dea893f9e247fe38a2a0d163.

This is not needed. readdir() uses one dirent buffer per DIR pointer,
not per process. In other words, as long as a given DIR pointer is used
in a single thread, readdir() is thread-safe.
---

diff --git a/modules/gui/skins2/x11/x11_factory.cpp b/modules/gui/skins2/x11/x11_factory.cpp
index a916cfa69a..0a07681618 100644
--- a/modules/gui/skins2/x11/x11_factory.cpp
+++ b/modules/gui/skins2/x11/x11_factory.cpp
@@ -208,11 +208,6 @@ void X11Factory::getMousePos( int &rXPos, int &rYPos ) const
 
 void X11Factory::rmDir( const string &rPath )
 {
-    struct
-    {
-        struct dirent ent;
-        char buf[NAME_MAX + 1];
-    } buf;
     struct dirent *file;
     DIR *dir;
 
@@ -220,7 +215,7 @@ void X11Factory::rmDir( const string &rPath )
     if( !dir ) return;
 
     // Parse the directory and remove everything it contains
-    while( readdir_r( dir, &buf.ent, &file ) == 0 && file != NULL )
+    while( (file = readdir( dir )) )
     {
         struct stat statbuf;
         string filename = file->d_name;
@@ -233,7 +228,7 @@ void X11Factory::rmDir( const string &rPath )
 
         filename = rPath + "/" + filename;
 
-        if( !stat( filename.c_str(), &statbuf ) && S_ISDIR(statbuf.st_mode) )
+        if( !stat( filename.c_str(), &statbuf ) && statbuf.st_mode & S_IFDIR )
         {
             rmDir( filename );
         }