[src/trunk]: src/usr.sbin/perfused Rename perfuse_mount to not conflict with ...

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7e383794f135
branches:  trunk
changeset: 772832:7e383794f135
user:      joerg <joerg%NetBSD.org@localhost>
date:      Tue Jan 17 17:58:36 2012 +0000

description:
Rename perfuse_mount to not conflict with libperfuse. Mark it and
perfuse_trace as static.

diffstat:

 usr.sbin/perfused/perfused.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (38 lines):

diff -r 9148b729efda -r 7e383794f135 usr.sbin/perfused/perfused.c
--- a/usr.sbin/perfused/perfused.c      Tue Jan 17 17:27:32 2012 +0000
+++ b/usr.sbin/perfused/perfused.c      Tue Jan 17 17:58:36 2012 +0000
@@ -1,4 +1,4 @@
-/*  $NetBSD: perfused.c,v 1.17 2011/12/28 17:33:53 manu Exp $ */
+/*  $NetBSD: perfused.c,v 1.18 2012/01/17 17:58:36 joerg Exp $ */
 
 /*-
  *  Copyright (c) 2010 Emmanuel Dreyfus. All rights reserved.
@@ -55,8 +55,8 @@
  * we ever mount multiple filesystems in a single perfused, 
  * but it is not sure we will ever want to do that.
  */
-struct puffs_usermount *perfuse_mount = NULL;
-FILE *perfuse_trace = NULL;
+static struct puffs_usermount *my_perfuse_mount = NULL;
+static FILE *perfuse_trace = NULL;
 
 static int access_mount(const char *, uid_t, int);
 static void new_mount(int, int);
@@ -278,7 +278,7 @@
        /*
         * Setup trace file facility
         */
-       perfuse_mount = pu;
+       my_perfuse_mount = pu;
 
        if ((perfuse_trace = fopen(_PATH_VAR_RUN_PERFUSE_TRACE, "w")) == NULL)
                DERR(EX_OSFILE, 
@@ -359,7 +359,7 @@
 static void
 sigusr1_handler(int sig)
 {
-       return perfuse_trace_dump(perfuse_mount, perfuse_trace);
+       return perfuse_trace_dump(my_perfuse_mount, perfuse_trace);
 }
 
 static int