- coding style

diff --git a/testsuite-real/Makefile.am b/testsuite-real/Makefile.am
index 717313a4373d65d51bea880b1e56b89c41cf9fd7..f72080f5b6e86f4c11b0ba457f6d54105230432f 100644 (file)
--- a/testsuite-real/Makefile.am
+++ b/testsuite-real/Makefile.am
@@ -42,10 +42,10 @@ error1_SOURCES = error1.cc common.h common.cc
 error2_SOURCES = error2.cc common.h common.cc
 error4_SOURCES = error4.cc common.h common.cc
 
-xattrs1_SOURCES = xattrs1.cc xattrs_utils.cc xattrs_utils.h common.h common.cc
-xattrs2_SOURCES = xattrs2.cc xattrs_utils.cc xattrs_utils.h common.h common.cc
-xattrs3_SOURCES = xattrs3.cc xattrs_utils.cc xattrs_utils.h common.h common.cc
-xattrs4_SOURCES = xattrs4.cc xattrs_utils.cc xattrs_utils.h common.h common.cc
+xattrs1_SOURCES = xattrs1.cc xattrs-utils.cc xattrs-utils.h common.h common.cc
+xattrs2_SOURCES = xattrs2.cc xattrs-utils.cc xattrs-utils.h common.h common.cc
+xattrs3_SOURCES = xattrs3.cc xattrs-utils.cc xattrs-utils.h common.h common.cc
+xattrs4_SOURCES = xattrs4.cc xattrs-utils.cc xattrs-utils.h common.h common.cc
 
 test_btrfsutils_SOURCES = test-btrfsutils.cc
 

diff --git a/testsuite-real/xattrs_utils.cc b/testsuite-real/xattrs-utils.cc
similarity index 54%
rename from testsuite-real/xattrs_utils.cc
rename to testsuite-real/xattrs-utils.cc
index ad0f9cd1a682386757ddaabbfd90cd2c0a8a49d4..a5d2432db1757cb668adfde030f7fab409c3c676 100644 (file)
--- a/testsuite-real/xattrs_utils.cc
+++ b/testsuite-real/xattrs-utils.cc
@@ -2,26 +2,32 @@
 #include <string.h>
 #include <sys/xattr.h>
 
-#include "xattrs_utils.h"
+#include "xattrs-utils.h"
 #include "common.h"
 
-void xattr_create(const char *name, const char *value, const char *path)
+
+void
+xattr_create(const char* name, const char* value, const char* path)
 {
     std::cout << "xa create: file:" << path << "," << name << "=" << value << "... ";
-    check_zero(lsetxattr(path, name, (void *) value, strlen(value), XATTR_CREATE));
+    check_zero(lsetxattr(path, name, (void*) value, strlen(value), XATTR_CREATE));
     std::cout << "done" << std::endl;
 }
 
-void xattr_remove(const char *name, const char *path)
+
+void
+xattr_remove(const char* name, const char* path)
 {
     std::cout << "xa remove: file:" << path << "," << name << "... ";
     check_zero(lremovexattr(path, name));
     std::cout << "done" << std::endl;
 }
 
-void xattr_replace(const char *name, const char *value, const char *path)
+
+void
+xattr_replace(const char* name, const char* value, const char* path)
 {
     std::cout << "xa replace: file:" << path << "," << name << "=" << value << "... ";
-    check_zero(lsetxattr(path, name, (void *) value, strlen(value), XATTR_REPLACE));
+    check_zero(lsetxattr(path, name, (void*) value, strlen(value), XATTR_REPLACE));
     std::cout << "done" << std::endl;
 }

diff --git a/testsuite-real/xattrs-utils.h b/testsuite-real/xattrs-utils.h
new file mode 100644 (file)
index 0000000..22560c4
--- /dev/null
+++ b/testsuite-real/xattrs-utils.h
@@ -0,0 +1,7 @@
+
+
+void xattr_create(const char*, const char*, const char*);
+
+void xattr_remove(const char*, const char*);
+
+void xattr_replace(const char*, const char*, const char*);

diff --git a/testsuite-real/xattrs1.cc b/testsuite-real/xattrs1.cc
index b784b25c15b019c2f5d5704a49b448b230a94ae7..a58a5bbbc5a18a88e5810f11ffdfc72da4e87abd 100644 (file)
--- a/testsuite-real/xattrs1.cc
+++ b/testsuite-real/xattrs1.cc
@@ -1,6 +1,6 @@
 
 #include "common.h"
-#include "xattrs_utils.h"
+#include "xattrs-utils.h"
 
 using namespace std;
 

diff --git a/testsuite-real/xattrs2.cc b/testsuite-real/xattrs2.cc
index 58ee859f24b3759a7a3d74de8f4f52591125eb2b..8035563231e297b739af6d17eb08526e0f7157cd 100644 (file)
--- a/testsuite-real/xattrs2.cc
+++ b/testsuite-real/xattrs2.cc
@@ -1,6 +1,6 @@
 
 #include "common.h"
-#include "xattrs_utils.h"
+#include "xattrs-utils.h"
 
 using namespace std;
 

diff --git a/testsuite-real/xattrs3.cc b/testsuite-real/xattrs3.cc
index fadf34ee1dd093c0f1062c886b36f62537139565..787555f0f5e89b987eac9dd95ebc34b716200d9a 100644 (file)
--- a/testsuite-real/xattrs3.cc
+++ b/testsuite-real/xattrs3.cc
@@ -1,6 +1,6 @@
 
 #include "common.h"
-#include "xattrs_utils.h"
+#include "xattrs-utils.h"
 
 using namespace std;
 

diff --git a/testsuite-real/xattrs_utils.h b/testsuite-real/xattrs_utils.h
deleted file mode 100644 (file)
index 350d9d5..0000000
--- a/testsuite-real/xattrs_utils.h
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-void xattr_create(const char *, const char *, const char *);
-
-void xattr_remove(const char *, const char *);
-
-void xattr_replace(const char *, const char *, const char *);
\ No newline at end of file