[poppler] Branch 'poppler-0.26' - goo/gfile.cc

[Albert Astals Cid]

 goo/gfile.cc |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 42315c28809e62da7872add917e82853cf8c7e33
Author: Albert Astals Cid <aacid at kde.org>
Date:   Thu Aug 21 19:58:35 2014 +0200

    Make sure e is always initialized

diff --git a/goo/gfile.cc b/goo/gfile.cc
index 6fd4cba..3528bb3 100644
--- a/goo/gfile.cc
+++ b/goo/gfile.cc
@@ -748,7 +748,7 @@ GDir::~GDir() {
 }
 
 GDirEntry *GDir::getNextEntry() {
-  GDirEntry *e;
+  GDirEntry *e = NULL;
 
 #if defined(_WIN32)
   if (hnd != INVALID_HANDLE_VALUE) {
@@ -757,14 +757,11 @@ GDirEntry *GDir::getNextEntry() {
       FindClose(hnd);
       hnd = INVALID_HANDLE_VALUE;
     }
-  } else {
-    e = NULL;
   }
 #elif defined(ACORN)
 #elif defined(MACOS)
 #elif defined(VMS)
   struct dirent *ent;
-  e = NULL;
   if (dir) {
     if (needParent) {
       e = new GDirEntry(path->getCString(), "-", doStat);
@@ -778,7 +775,6 @@ GDirEntry *GDir::getNextEntry() {
   }
 #else
   struct dirent *ent;
-  e = NULL;
   if (dir) {
     do {
       ent = readdir(dir);