Mercurial > hg > octave-shane > gnulib-hg

changeset 1444:8a70cc03ce0d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(read_filesystem_list) [MOUNTED_GETMNTINFO]: Use fsp_to_string. (fsp_to_string): Don't xmalloc return value (yet).
author Jim Meyering <jim@meyering.net>
date Sat, 25 Jul 1998 14:54:42 +0000
parents 13bcee72981f
children d59bd56497f1
files lib/mountlist.c
diffstat 1 files changed, 5 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/lib/mountlist.c
+++ b/lib/mountlist.c
@@ -256,7 +256,7 @@
 fsp_to_string (const struct statfs *fsp)
 {
 # if defined HAVE_F_FSTYPENAME_IN_STATFS
-  return xstrdup (fsp->f_fstypename);
+  return fsp->f_fstypename;
 # else
   return fstype_to_string (fsp->f_type);
 # endif
@@ -377,23 +377,14 @@
       return NULL;
     for (; entries-- > 0; fsp++)
       {
-	if (all_fs < 0)
-	  {
-# ifdef HAVE_F_FSTYPENAME_IN_STATFS
-	    if (REMOTE_FS_TYPE (fsp->f_fstypename))
-	      continue;
-# else
-#  ifdef MOUNT_NFS
-	    if (REMOTE_FS_TYPE (fstype_to_string (fsp->f_type)))
-	      continue;
-#  endif
-# endif
-	  }
+	char *fs_type = fsp_to_string (fsp);
+	if (all_fs < 0 && REMOTE_FS_TYPE (fs_type))
+	  continue;
 
 	me = (struct mount_entry *) xmalloc (sizeof (struct mount_entry));
 	me->me_devname = xstrdup (fsp->f_mntfromname);
 	me->me_mountdir = xstrdup (fsp->f_mntonname);
-	me->me_type = fsp_to_string (fsp);
+	me->me_type = fs_type;
 	me->me_dev = (dev_t) -1;	/* Magic; means not known yet. */
 
 	/* Add to the linked list. */