From a8791404f5005e48df006c9adc4e099d3f179708 Mon Sep 17 00:00:00 2001
From: szaka <szaka>
Date: Wed, 23 Jan 2008 21:15:00 +0000
Subject: [PATCH] rename variables with names as a standard library function
 (Alon Bar-Lev)

---
 libfuse-lite/fuse.c          |  4 ++--
 libfuse-lite/fuse_lowlevel.c |  4 ++--
 libfuse-lite/helper.c        | 14 +++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/libfuse-lite/fuse.c b/libfuse-lite/fuse.c
index 6c5deced..7671b5f3 100644
--- a/libfuse-lite/fuse.c
+++ b/libfuse-lite/fuse.c
@@ -2415,9 +2415,9 @@ static void fuse_lib_getlk(fuse_req_t req, fuse_ino_t ino,
 
 static void fuse_lib_setlk(fuse_req_t req, fuse_ino_t ino,
                            struct fuse_file_info *fi, struct flock *lock,
-                           int sleep)
+                           int should_sleep)
 {
-    int err = fuse_lock_common(req, ino, fi, lock, sleep ? F_SETLKW : F_SETLK);
+    int err = fuse_lock_common(req, ino, fi, lock, should_sleep ? F_SETLKW : F_SETLK);
     if (!err) {
         struct fuse *f = req_fuse(req);
         struct lock l;
diff --git a/libfuse-lite/fuse_lowlevel.c b/libfuse-lite/fuse_lowlevel.c
index 81287e2c..8b0adac7 100644
--- a/libfuse-lite/fuse_lowlevel.c
+++ b/libfuse-lite/fuse_lowlevel.c
@@ -841,7 +841,7 @@ static void do_getlk(fuse_req_t req, fuse_ino_t nodeid, const void *inarg)
 }
 
 static void do_setlk_common(fuse_req_t req, fuse_ino_t nodeid,
-                            const void *inarg, int sleep)
+                            const void *inarg, int should_sleep)
 {
     struct fuse_lk_in *arg = (struct fuse_lk_in *) inarg;
     struct fuse_file_info fi;
@@ -853,7 +853,7 @@ static void do_setlk_common(fuse_req_t req, fuse_ino_t nodeid,
 
     convert_fuse_file_lock(&arg->lk, &flock);
     if (req->f->op.setlk)
-        req->f->op.setlk(req, nodeid, &fi, &flock, sleep);
+        req->f->op.setlk(req, nodeid, &fi, &flock, should_sleep);
     else
         fuse_reply_err(req, ENOSYS);
 }
diff --git a/libfuse-lite/helper.c b/libfuse-lite/helper.c
index b3f67e07..b0b6775c 100644
--- a/libfuse-lite/helper.c
+++ b/libfuse-lite/helper.c
@@ -122,18 +122,18 @@ static int add_default_subtype(const char *progname, struct fuse_args *args)
 {
     int res;
     char *subtype_opt;
-    const char *basename = strrchr(progname, '/');
-    if (basename == NULL)
-        basename = progname;
-    else if (basename[1] != '\0')
-        basename++;
+    const char *prog_basename = strrchr(progname, '/');
+    if (prog_basename == NULL)
+        prog_basename = progname;
+    else if (prog_basename[1] != '\0')
+        prog_basename++;
 
-    subtype_opt = (char *) malloc(strlen(basename) + 64);
+    subtype_opt = (char *) malloc(strlen(prog_basename) + 64);
     if (subtype_opt == NULL) {
         fprintf(stderr, "fuse: memory allocation failed\n");
         return -1;
     }
-    sprintf(subtype_opt, "-osubtype=%s", basename);
+    sprintf(subtype_opt, "-osubtype=%s", prog_basename);
     res = fuse_opt_add_arg(args, subtype_opt);
     free(subtype_opt);
     return res;