xmlfs ChangeLog Makefile netfs.c

[Samuel Thibault]

CVSROOT:        /cvsroot/hurdextras
Module name:    xmlfs
Changes by:     Samuel Thibault <sthibaul>      13/02/10 11:14:00

Modified files:
        .              : ChangeLog Makefile netfs.c 

Log message:
        2013-02-10  Samuel Thibault  <address@hidden>
        
                * Makefile (LDFLAGS): Add -lshouldbeinlibc.
                * netfs.c: Use pthread_mutex_lock/unlock instead of 
mutex_lock/unlock.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/xmlfs/ChangeLog?cvsroot=hurdextras&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/xmlfs/Makefile?cvsroot=hurdextras&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/xmlfs/netfs.c?cvsroot=hurdextras&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/hurdextras/xmlfs/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ChangeLog   12 Apr 2006 17:00:30 -0000      1.1
+++ ChangeLog   10 Feb 2013 11:14:00 -0000      1.2
@@ -1,3 +1,8 @@
+2013-02-10  Samuel Thibault  <address@hidden>
+
+       * Makefile (LDFLAGS): Add -lshouldbeinlibc.
+       * netfs.c: Use pthread_mutex_lock/unlock instead of mutex_lock/unlock.
+
 2005-02-14  Manuel Menal  <address@hidden>
 
        * xmlfs: 0.0.1 released.

Index: Makefile
===================================================================
RCS file: /cvsroot/hurdextras/xmlfs/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Makefile    12 Apr 2006 17:00:30 -0000      1.1
+++ Makefile    10 Feb 2013 11:14:00 -0000      1.2
@@ -1,7 +1,7 @@
 CC = gcc
 CFLAGS = `pkg-config libxml-2.0 --cflags` -Wall -ggdb3 -O0 -std=c99 
-D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
 COMPILE=$(CC) $(CFLAGS)
-LDFLAGS = `pkg-config libxml-2.0 --libs` -lnetfs -liohelp -lfshelp -lports
+LDFLAGS = `pkg-config libxml-2.0 --libs` -lnetfs -liohelp -lfshelp -lports 
-lshouldbeinlibc
 OBJS = fs.o xmlfs.o xml.o netfs.o fsutils.o
 BINARY = xmlfs
 

Index: netfs.c
===================================================================
RCS file: /cvsroot/hurdextras/xmlfs/netfs.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- netfs.c     12 Apr 2006 17:00:30 -0000      1.1
+++ netfs.c     10 Feb 2013 11:14:00 -0000      1.2
@@ -158,39 +158,39 @@
   if (!dir || dir->nn->type == CONTENT)
     {
       DEBUG ("ERROR: attempted to lookup() in a content node!");
-      mutex_unlock (&dir->lock);
+      pthread_mutex_unlock (&dir->lock);
       return ENOTDIR;
     }
 
-  mutex_unlock (&dir->lock); 
+  pthread_mutex_unlock (&dir->lock); 
 
   /* Handle special cases without too much overhead. */
   if (*name == '\0' || strcmp (name, ".") == 0) 
     {
       *np = dir;
-      mutex_lock (&dir->lock);
+      pthread_mutex_lock (&dir->lock);
       netfs_nref (dir);
-      mutex_unlock (&dir->lock);
+      pthread_mutex_unlock (&dir->lock);
       return 0;
     }
   else if (strcmp (name , "..") == 0)
     {
       *np = dir->nn->dir;
-      mutex_lock (&dir->lock);
+      pthread_mutex_lock (&dir->lock);
       netfs_nref (*np);
-      mutex_unlock (&dir->lock);
+      pthread_mutex_unlock (&dir->lock);
       return 0;
     }
 
   if (!dir->nn->filled)
     {
-      mutex_lock (&dir->lock); 
+      pthread_mutex_lock (&dir->lock); 
 
       err = fill_dirnode (dir);
       if (err)
          return err;
 
-      mutex_unlock (&dir->lock);
+      pthread_mutex_unlock (&dir->lock);
     }
 
   /* Make nd point to the entry we should begin at, according to FIRST_ENTRY. 
*/
@@ -199,10 +199,10 @@
   
   if (nd) 
     {
-      mutex_lock (&dir->lock);
+      pthread_mutex_lock (&dir->lock);
       *np = nd;
       netfs_nref (*np);
-      mutex_unlock (&dir->lock);
+      pthread_mutex_unlock (&dir->lock);
       err = 0;
     } 
   else 
@@ -453,16 +453,16 @@
   if (dir->nn->type != NODE)
     return ENOTDIR;
 
-  mutex_unlock (&dir->lock); 
+  pthread_mutex_unlock (&dir->lock); 
 
   if (!dir->nn->filled)
     {
-      mutex_lock (&dir->lock);
+      pthread_mutex_lock (&dir->lock);
       err = fill_dirnode (dir);
       if (err)
          return err;
 
-      mutex_unlock (&dir->lock); 
+      pthread_mutex_unlock (&dir->lock); 
     }
 
   /* Set nd to the entry we should begin at,