chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
path-util: minor coding style fix
[elogind.git]
/
src
/
basic
/
path-util.c
diff --git
a/src/basic/path-util.c
b/src/basic/path-util.c
index 238252eebfb2f228100a8ec432ff8881ed81196e..7b38a01e34314d4eb81c7979e385ec3d92b18226 100644
(file)
--- a/
src/basic/path-util.c
+++ b/
src/basic/path-util.c
@@
-219,7
+219,6
@@
int path_make_relative(const char *from_dir, const char *to_path, char **_r) {
*_r = r;
return 0;
}
*_r = r;
return 0;
}
-#endif // 0
char **path_strv_make_absolute_cwd(char **l) {
char **s;
char **path_strv_make_absolute_cwd(char **l) {
char **s;
@@
-241,6
+240,7
@@
char **path_strv_make_absolute_cwd(char **l) {
return l;
}
return l;
}
+#endif // 0
char **path_strv_resolve(char **l, const char *prefix) {
char **s;
char **path_strv_resolve(char **l, const char *prefix) {
char **s;
@@
-417,7
+417,7
@@
int path_compare(const char *a, const char *b) {
* Which one is sorted before the other does not really matter.
* Here a relative path is ordered before an absolute path. */
d = (a[0] == '/') - (b[0] == '/');
* Which one is sorted before the other does not really matter.
* Here a relative path is ordered before an absolute path. */
d = (a[0] == '/') - (b[0] == '/');
- if (d)
+ if (d
!= 0
)
return d;
for (;;) {
return d;
for (;;) {
@@
-440,12
+440,12
@@
int path_compare(const char *a, const char *b) {
/* Alphabetical sort: "/foo/aaa" before "/foo/b" */
d = memcmp(a, b, MIN(j, k));
/* Alphabetical sort: "/foo/aaa" before "/foo/b" */
d = memcmp(a, b, MIN(j, k));
- if (d)
+ if (d
!= 0
)
return (d > 0) - (d < 0); /* sign of d */
/* Sort "/foo/a" before "/foo/aaa" */
d = (j > k) - (j < k); /* sign of (j - k) */
return (d > 0) - (d < 0); /* sign of d */
/* Sort "/foo/a" before "/foo/aaa" */
d = (j > k) - (j < k); /* sign of (j - k) */
- if (d)
+ if (d
!= 0
)
return d;
a += j;
return d;
a += j;