This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository efm2.
View the commit online.
commit fdfef7ea061dd2be0689d4c49570d711bb0ee4d1
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
AuthorDate: Mon Jun 17 08:31:41 2024 +0100
reformat
---
.clang-format | 1 +
src/backends/default/fs.c | 24 ++++++++++++------------
src/backends/default/meta.c | 12 ++++++------
src/backends/default/mv.c | 9 +++++----
src/shared/sha.c | 21 ++++++++++-----------
src/shared/util.c | 2 +-
6 files changed, 35 insertions(+), 34 deletions(-)
diff --git a/.clang-format b/.clang-format
index 8c5ba6f..e1809fa 100644
--- a/.clang-format
+++ b/.clang-format
@@ -26,3 +26,4 @@ SpaceBeforeAssignmentOperators: True
SpaceBeforeParens: ControlStatements
IncludeBlocks: Preserve
SortIncludes: Never
+IndentPPDirectives: AfterHash
diff --git a/src/backends/default/fs.c b/src/backends/default/fs.c
index e098d64..2fe1148 100644
--- a/src/backends/default/fs.c
+++ b/src/backends/default/fs.c
@@ -407,19 +407,19 @@ err_unlink:
chown(dst, st.st_uid, st.st_gid); // ignore err
// duplicate mtime+atime from src down to msic/nsec if possible
#ifdef STAT_NSEC
-#ifdef st_mtime
-#define STAT_NSEC_ATIME(st) (unsigned long long)((st)->st_atim.tv_nsec)
-#define STAT_NSEC_MTIME(st) (unsigned long long)((st)->st_mtim.tv_nsec)
-#define STAT_NSEC_CTIME(st) (unsigned long long)((st)->st_ctim.tv_nsec)
+# ifdef st_mtime
+# define STAT_NSEC_ATIME(st) (unsigned long long)((st)->st_atim.tv_nsec)
+# define STAT_NSEC_MTIME(st) (unsigned long long)((st)->st_mtim.tv_nsec)
+# define STAT_NSEC_CTIME(st) (unsigned long long)((st)->st_ctim.tv_nsec)
+# else
+# define STAT_NSEC_ATIME(st) (unsigned long long)((st)->st_atimensec)
+# define STAT_NSEC_MTIME(st) (unsigned long long)((st)->st_mtimensec)
+# define STAT_NSEC_CTIME(st) (unsigned long long)((st)->st_ctimensec)
+# endif
#else
-#define STAT_NSEC_ATIME(st) (unsigned long long)((st)->st_atimensec)
-#define STAT_NSEC_MTIME(st) (unsigned long long)((st)->st_mtimensec)
-#define STAT_NSEC_CTIME(st) (unsigned long long)((st)->st_ctimensec)
-#endif
-#else
-#define STAT_NSEC_ATIME(st) (unsigned long long)(0)
-#define STAT_NSEC_MTIME(st) (unsigned long long)(0)
-#define STAT_NSEC_CTIME(st) (unsigned long long)(0)
+# define STAT_NSEC_ATIME(st) (unsigned long long)(0)
+# define STAT_NSEC_MTIME(st) (unsigned long long)(0)
+# define STAT_NSEC_CTIME(st) (unsigned long long)(0)
#endif
times[0].tv_sec = st.st_atime;
times[0].tv_usec = STAT_NSEC_ATIME(st) * 1000;
diff --git a/src/backends/default/meta.c b/src/backends/default/meta.c
index c366f3b..dcaebeb 100644
--- a/src/backends/default/meta.c
+++ b/src/backends/default/meta.c
@@ -382,8 +382,8 @@ meta_path_user_find(const char *path, const char *extn)
Eina_Bool
meta_path_prepare(const char *path)
{ // "path" is the path returned by meta_path_user_find() or meta_path_find()
- Eina_Bool ret = EINA_FALSE;
- char *dir = ecore_file_dir_get(path);
+ Eina_Bool ret = EINA_FALSE;
+ char *dir = ecore_file_dir_get(path);
if (!dir) return ret;
if (ecore_file_is_dir(dir)) ret = EINA_TRUE;
@@ -418,8 +418,8 @@ meta_path_can_write(const char *path)
// policy - we only consider dirs owned by the user writeable. want to
// avoid e.g. root browsing then modifying dirs ownee by a user or dirs
// that might have group write access being written to by multiple users
- if (((st.st_uid == uid) && (st.st_mode & S_IWUSR)) ||
- (access(dir, W_OK) == 0))
+ if (((st.st_uid == uid) && (st.st_mode & S_IWUSR))
+ || (access(dir, W_OK) == 0))
{
snprintf(buf, sizeof(buf), "%s/.efm", dir);
res = mkdir(buf, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH
@@ -433,8 +433,8 @@ meta_path_can_write(const char *path)
{
if (errno == EEXIST)
{ // dir exists - test we can create a file in it
- snprintf(buf, sizeof(buf),
- "%s/.efm/.testfilename.extension.efm", dir);
+ snprintf(buf, sizeof(buf), "%s/.efm/.testfilename.extension.efm",
+ dir);
res = open(buf, O_WRONLY | O_CREAT | O_CLOEXEC, S_IWUSR);
if (res >= 0)
{ // we can create and write to file - remove it now
diff --git a/src/backends/default/mv.c b/src/backends/default/mv.c
index 6ca7c4c..d655bc9 100644
--- a/src/backends/default/mv.c
+++ b/src/backends/default/mv.c
@@ -143,7 +143,7 @@ main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
src = "" = dst = dsttmpdir = dsttmpfile = NULL;
// src and src temp dir
- src = ""
+ src = ""
srcdir = ecore_file_dir_get(fs->src);
if (!srcdir)
{
@@ -172,7 +172,8 @@ main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
eina_strbuf_append(buf, fname);
eina_strbuf_append(buf, ".tmp");
dsttmpfile = strdup(eina_strbuf_string_get(buf));
- if ((!src) || (!srctmpdir) || (!dst) || (!dsttmpdir) || (!dsttmpfile)) mem_abort();
+ if ((!src) || (!srctmpdir) || (!dst) || (!dsttmpdir) || (!dsttmpfile))
+ mem_abort();
// can we modify the meta files in the src? (like mv/rm them?)
src_can_write = meta_path_can_write(src);
@@ -181,7 +182,7 @@ main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
// mkdir the /dstdir/.efm dir in the dest as we'll use it for tmp files
prev_umask = umask(0);
// make the dir using the same mode as the parent
- ret = mkdir(dsttmpdir, st.st_mode);
+ ret = mkdir(dsttmpdir, st.st_mode);
if ((ret != 0) && (errno != EEXIST))
{
status_error(fs->src, eina_strbuf_string_get(buf),
@@ -229,7 +230,7 @@ main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
// get stat info of new mv'd file
if (stat(dsttmpfile, &st) == 0)
{
- Eet_File *ef;
+ Eet_File *ef;
unsigned char statsha1[21];
// sha1 the stat info
diff --git a/src/shared/sha.c b/src/shared/sha.c
index 2e21462..a2a6492 100644
--- a/src/shared/sha.c
+++ b/src/shared/sha.c
@@ -11,22 +11,21 @@ sha1_stat(const struct stat *st, unsigned char dst[20])
char buf[128];
#ifdef STAT_NSEC
-#ifdef st_mtime
-#define STAT_NSEC_MTIME(st) (unsigned long long)((st)->st_mtim.tv_nsec)
-#define STAT_NSEC_CTIME(st) (unsigned long long)((st)->st_ctim.tv_nsec)
+# ifdef st_mtime
+# define STAT_NSEC_MTIME(st) (unsigned long long)((st)->st_mtim.tv_nsec)
+# define STAT_NSEC_CTIME(st) (unsigned long long)((st)->st_ctim.tv_nsec)
+# else
+# define STAT_NSEC_MTIME(st) (unsigned long long)((st)->st_mtimensec)
+# define STAT_NSEC_CTIME(st) (unsigned long long)((st)->st_ctimensec)
+# endif
#else
-#define STAT_NSEC_MTIME(st) (unsigned long long)((st)->st_mtimensec)
-#define STAT_NSEC_CTIME(st) (unsigned long long)((st)->st_ctimensec)
-#endif
-#else
-#define STAT_NSEC_MTIME(st) (unsigned long long)(0)
-#define STAT_NSEC_CTIME(st) (unsigned long long)(0)
+# define STAT_NSEC_MTIME(st) (unsigned long long)(0)
+# define STAT_NSEC_CTIME(st) (unsigned long long)(0)
#endif
snprintf(buf, sizeof(buf), "%llu %llu %llu",
(unsigned long long)(st->st_size),
- (unsigned long long)(st->st_mtime),
- STAT_NSEC_MTIME(st));
+ (unsigned long long)(st->st_mtime), STAT_NSEC_MTIME(st));
eina_sha1((unsigned char *)buf, strlen(buf), dst);
}
diff --git a/src/shared/util.c b/src/shared/util.c
index 0f79715..d24b6d1 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -8,7 +8,7 @@ void
util_file_mode_parent_copy(const char *file, Eina_Bool is_dir)
{
struct stat st;
- char *s, *dir_parent = strdup(file);
+ char *s, *dir_parent = strdup(file);
if (!dir_parent) return;
s = strrchr(file, '/');
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
