gnue/geas/src/classdef read-gcd.c

[Reinhard Mueller]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Reinhard Mueller <address@hidden>       01/11/20 15:07:07

Modified files:
        geas/src/classdef: read-gcd.c 

Log message:
        Slightly restructured _pass_1 function to use less indentation levels. 
Thanks to Bjorn Augestad for pointing this out.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/geas/src/classdef/read-gcd.c.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: gnue/geas/src/classdef/read-gcd.c
diff -u gnue/geas/src/classdef/read-gcd.c:1.7 
gnue/geas/src/classdef/read-gcd.c:1.8
--- gnue/geas/src/classdef/read-gcd.c:1.7       Mon Sep 24 11:24:36 2001
+++ gnue/geas/src/classdef/read-gcd.c   Tue Nov 20 15:07:07 2001
@@ -19,7 +19,7 @@
    along with GEAS; if not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   $Id: read-gcd.c,v 1.7 2001/09/24 15:24:36 reinhard Exp $
+   $Id: read-gcd.c,v 1.8 2001/11/20 20:07:07 reinhard Exp $
 */
 
 #include "config.h"
@@ -60,28 +60,27 @@
     }
   while ((entry = readdir (dir)))
     {
-      if (strcmp (entry->d_name, ".") && strcmp (entry->d_name, ".."))
+      if (!strcmp (entry->d_name, ".") || !strcmp (entry->d_name, ".."))
         {
-          filename = g_strconcat (directory, G_DIR_SEPARATOR_S, entry->d_name,
-                                  NULL);
-          if (stat (filename, &info))
-            {
-              perror (filename);
-            }
-          else
+          continue;                     /* Skip "." and ".." */
+        }
+      filename = g_strconcat (directory, G_DIR_SEPARATOR_S, entry->d_name,
+                              NULL);
+      if (stat (filename, &info))
+        {
+          perror (filename);
+          continue;
+        }
+      if (S_ISDIR (info.st_mode))
+        {
+          _pass_1 (filename);
+        }
+      else if (S_ISREG (info.st_mode))
+        {
+          if ((strlen (filename) > 4) &&
+              !g_strcasecmp (&filename[strlen (filename) - 4], ".gcd"))
             {
-              if (S_ISDIR (info.st_mode))
-                {
-                  _pass_1 (filename);
-                }
-              else if (S_ISREG (info.st_mode))
-                {
-                  if ((strlen (filename) > 4) &&
-                      !g_strcasecmp (&filename[strlen (filename) - 4], ".gcd"))
-                    {
-                      _geas_cd_parse (filename, 1);
-                    }
-                }
+              _geas_cd_parse (filename, 1);
             }
         }
     }