Using the new ylog.h everywhere, and fixing what that breaks!

[idzebra-moved-to-github.git] / index / dir.c

diff --git a/index/dir.c b/index/dir.c
index 3019221..a987b07 100644 (file)
--- a/index/dir.c
+++ b/index/dir.c
@@ -1,4 +1,4 @@
-/* $Id: dir.c,v 1.25 2002-09-03 12:22:21 adam Exp $
+/* $Id: dir.c,v 1.29 2004-11-19 10:26:56 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
@@ -52,7 +52,7 @@ struct dir_entry *dir_open (const char *rep, const char *base,
     char path[1024];
     char full_rep[1024];
     size_t pathpos;
-    struct dirent *dent;
+    struct dirent dent_s, *dent = &dent_s;
     size_t entry_max = 500;
     size_t idx = 0;
     struct dir_entry *entry;
@@ -66,10 +66,10 @@ struct dir_entry *dir_open (const char *rep, const char *base,
         *full_rep = '\0';
     strcat (full_rep, rep);
 
-    logf (LOG_LOG, "dir_open %s", full_rep);
+    yaz_log (YLOG_DEBUG, "dir_open %s", full_rep);
     if (!(dir = opendir(full_rep)))
     {
-        logf (LOG_WARN|LOG_ERRNO, "opendir %s", rep);
+        yaz_log (YLOG_WARN|YLOG_ERRNO, "opendir %s", rep);
         if (errno != ENOENT && errno != EACCES)
             exit (1);
         return NULL;
@@ -79,7 +79,7 @@ struct dir_entry *dir_open (const char *rep, const char *base,
     pathpos = strlen(path);
     if (!pathpos || path[pathpos-1] != '/')
         path[pathpos++] = '/';
-    while ((dent = readdir (dir)))
+    while ( (dent = readdir (dir)) )
     {
         struct stat finfo;
         if (strcmp (dent->d_name, ".") == 0 ||
@@ -127,7 +127,7 @@ struct dir_entry *dir_open (const char *rep, const char *base,
     }
     entry[idx].name = NULL;
     closedir (dir);
-    logf (LOG_DEBUG, "dir_close");
+    yaz_log (YLOG_DEBUG, "dir_close");
     return entry;
 }