From: Arvin Schnell Date: Thu, 17 Mar 2022 11:05:46 +0000 (+0100) Subject: - coding style X-Git-Tag: v0.10.0~10^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F697%2Fhead;p=thirdparty%2Fsnapper.git - coding style --- diff --git a/testsuite-real/Makefile.am b/testsuite-real/Makefile.am index 717313a4..f72080f5 100644 --- 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 ad0f9cd1..a5d2432d 100644 --- a/testsuite-real/xattrs_utils.cc +++ b/testsuite-real/xattrs-utils.cc @@ -2,26 +2,32 @@ #include #include -#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 index 00000000..22560c43 --- /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 b784b25c..a58a5bbb 100644 --- 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 58ee859f..80355632 100644 --- 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 fadf34ee..787555f0 100644 --- 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 index 350d9d51..00000000 --- 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