hurdextras-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

unionfs lib.c options.c ulfs.c ulfs.h


From: Manuel Menal
Subject: unionfs lib.c options.c ulfs.c ulfs.h
Date: Thu, 13 Apr 2006 11:06:02 +0000

CVSROOT:        /sources/hurdextras
Module name:    unionfs
Branch:         
Changes by:     Manuel Menal <address@hidden>   06/04/13 11:06:02

Modified files:
        .              : lib.c options.c ulfs.c ulfs.h 

Log message:
        Cleanup patch by Ben Asselstine (remove unused variables, make some 
functions static) (Manuel)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/hurdextras/unionfs/lib.c.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/hurdextras/unionfs/options.c.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/hurdextras/unionfs/ulfs.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/hurdextras/unionfs/ulfs.h.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: unionfs/lib.c
diff -u unionfs/lib.c:1.7 unionfs/lib.c:1.8
--- unionfs/lib.c:1.7   Mon May 30 12:53:20 2005
+++ unionfs/lib.c       Thu Apr 13 11:06:02 2006
@@ -174,9 +174,6 @@
 
   for (dirent = dirent_list; (! err) && (*dirent); dirent++)
     {
-      char *name;
-      struct stat filestat;
-
       if ((!strcmp ((*dirent)->d_name, "."))
          || (!strcmp ((*dirent)->d_name, "..")))
        continue;
Index: unionfs/options.c
diff -u unionfs/options.c:1.6 unionfs/options.c:1.7
--- unionfs/options.c:1.6       Thu Jun 30 18:49:55 2005
+++ unionfs/options.c   Thu Apr 13 11:06:02 2006
@@ -38,10 +38,10 @@
    startup options.  Whenever the argument parser is later called to
    modify the underlying filesystems of the root node, the root node
    is initialized accordingly directly by the parser.  */
-int parsing_startup_options_finished;
+static int parsing_startup_options_finished;
 
 /* Argp options common to the runtime and startup parser.  */
-const struct argp_option argp_common_options[] =
+static const struct argp_option argp_common_options[] =
   {
     { OPT_LONG_UNDERLYING, OPT_UNDERLYING, 0, 0,
       "add the underlying node to the unionfs" },
@@ -66,13 +66,13 @@
   };
 
 /* Argp options only meaningful for startup parsing.  */
-const struct argp_option argp_startup_options[] =
+static const struct argp_option argp_startup_options[] =
   {
     { 0 }
   };
 
 /* Argp parser function for the common options.  */
-error_t
+static error_t
 argp_parse_common_options (int key, char *arg, struct argp_state *state)
 {
   static int ulfs_flags = 0, ulfs_mode = 0, ulfs_modified = 0,
@@ -169,7 +169,7 @@
 }
 
 /* Argp parser function for the startup oprtions.  */
-error_t
+static error_t
 argp_parse_startup_options (int key, char *arg, struct argp_state *state)
 {
   error_t err = 0;
@@ -185,15 +185,15 @@
 }
 
 /* Argp parser for only the common options.  */
-const struct argp argp_parser_common_options =
+static const struct argp argp_parser_common_options =
   { argp_common_options, argp_parse_common_options, 0, 0, 0 };
 
 /* Argp parser for only the startup options.  */
-struct argp argp_parser_startup_options =
+static struct argp argp_parser_startup_options =
   { argp_startup_options, argp_parse_startup_options, 0, 0, 0 };
 
 /* The children parser for runtime arguments.  */
-const struct argp_child argp_children_runtime[] =
+static const struct argp_child argp_children_runtime[] =
   {
     { &argp_parser_common_options },
     { &netfs_std_runtime_argp },
Index: unionfs/ulfs.c
diff -u unionfs/ulfs.c:1.4 unionfs/ulfs.c:1.5
--- unionfs/ulfs.c:1.4  Thu Jun 30 18:49:55 2005
+++ unionfs/ulfs.c      Thu Apr 13 11:06:02 2006
@@ -46,7 +46,7 @@
 struct mutex ulfs_lock = MUTEX_INITIALIZER;
 
 /* Create a new ulfs element.  */
-error_t
+static error_t
 ulfs_create (char *path, ulfs_t **ulfs)
 {
   ulfs_t *ulfs_new = malloc (sizeof (ulfs_t));
@@ -76,7 +76,7 @@
 }
 
 /* Destroy an ulfs element.  */
-void
+static void
 ulfs_destroy (ulfs_t *ulfs)
 {
   free (ulfs->path);
@@ -85,7 +85,7 @@
 
 /* Install ULFS into the linked list of registered filesystems in
  * priority order.  */
-void
+static void
 ulfs_install (ulfs_t *ulfs)
 {
   ulfs_t *u = ulfs_chain_start;
@@ -134,7 +134,7 @@
 }
 
 /* Remove ULFS from the linked list of registered filesystems.  */
-void
+static void
 ulfs_uninstall (ulfs_t *ulfs)
 {
   if (ulfs == ulfs_chain_start)
@@ -168,7 +168,7 @@
 }
 
 /* Get an ulfs element by the associated path.  */
-error_t
+static error_t
 ulfs_get_path (char *path, ulfs_t **ulfs)
 {
   error_t err = ENOENT;
Index: unionfs/ulfs.h
diff -u unionfs/ulfs.h:1.3 unionfs/ulfs.h:1.4
--- unionfs/ulfs.h:1.3  Thu Jun 30 18:49:55 2005
+++ unionfs/ulfs.h      Thu Apr 13 11:06:02 2006
@@ -58,9 +58,6 @@
 /* Get an ULFS element by it's index.  */
 error_t ulfs_get_num (int num, ulfs_t **ulfs);
 
-/* Get an ulfs element by the associated path.  */
-error_t ulfs_get_path (char *path, ulfs_t **ulfs);
-
 /* Removes invalid ulfs entries.  */
 void ulfs_check (void);
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]