From 346ace4c2f5e020ca654541ff4b34d86faf88a4d Mon Sep 17 00:00:00 2001
From: Justus Winter <4winter@informatik.uni-hamburg.de>
Date: Sat, 18 Apr 2015 01:34:40 +0200
Subject: libdiskfs: rename `error' variable

* libdiskfs/dir-lookup.c (diskfs_S_dir_lookup): Rename `error' to `err'.
* libdiskfs/file-getcontrol.c (diskfs_S_file_getcontrol): Likewise.
* libdiskfs/file-syncfs.c (diskfs_S_file_syncfs): Likewise.
---
 libdiskfs/file-getcontrol.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'libdiskfs/file-getcontrol.c')

diff --git a/libdiskfs/file-getcontrol.c b/libdiskfs/file-getcontrol.c
index fc6f777e..8f98f4b3 100644
--- a/libdiskfs/file-getcontrol.c
+++ b/libdiskfs/file-getcontrol.c
@@ -25,20 +25,20 @@ diskfs_S_file_getcontrol (struct protid *cred,
 			  mach_port_t *control,
 			  mach_msg_type_name_t *controltype)
 {
-  int error;
+  error_t err;
   struct port_info *newpi;
   
   if (!cred)
     return EOPNOTSUPP;
   
-  error = fshelp_iscontroller (&diskfs_root_node->dn_stat, cred->user);
-  if (error)
-    return error;
+  err = fshelp_iscontroller (&diskfs_root_node->dn_stat, cred->user);
+  if (err)
+    return err;
 
-  error = ports_create_port (diskfs_control_class, diskfs_port_bucket,
+  err = ports_create_port (diskfs_control_class, diskfs_port_bucket,
 			     sizeof (struct port_info), &newpi);
-  if (error)
-    return error;
+  if (err)
+    return err;
 
   pthread_spin_lock (&_diskfs_control_lock);
   _diskfs_ncontrol_ports++;
-- 
cgit v1.2.3