Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
cd108ba3
Commit
cd108ba3
authored
Nov 27, 2011
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
directory: rename attribute "stat" to "have_stat"
"stat" is a macro on mingw32, which is a pretty stupid thing, and this commit works around this build failure.
parent
2bb5bfa7
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
directory.h
src/directory.h
+1
-1
update_walk.c
src/update_walk.c
+2
-2
No files found.
src/directory.h
View file @
cd108ba3
...
@@ -43,7 +43,7 @@ struct directory {
...
@@ -43,7 +43,7 @@ struct directory {
time_t
mtime
;
time_t
mtime
;
ino_t
inode
;
ino_t
inode
;
dev_t
device
;
dev_t
device
;
bool
stat
;
/* not needed if ino_t == dev_t == 0 is impossible */
bool
have_
stat
;
/* not needed if ino_t == dev_t == 0 is impossible */
char
path
[
sizeof
(
long
)];
char
path
[
sizeof
(
long
)];
};
};
...
...
src/update_walk.c
View file @
cd108ba3
...
@@ -86,7 +86,7 @@ directory_set_stat(struct directory *dir, const struct stat *st)
...
@@ -86,7 +86,7 @@ directory_set_stat(struct directory *dir, const struct stat *st)
{
{
dir
->
inode
=
st
->
st_ino
;
dir
->
inode
=
st
->
st_ino
;
dir
->
device
=
st
->
st_dev
;
dir
->
device
=
st
->
st_dev
;
dir
->
stat
=
true
;
dir
->
have_
stat
=
true
;
}
}
static
void
static
void
...
@@ -346,7 +346,7 @@ inodeFoundInParent(struct directory *parent, ino_t inode, dev_t device)
...
@@ -346,7 +346,7 @@ inodeFoundInParent(struct directory *parent, ino_t inode, dev_t device)
{
{
#ifndef G_OS_WIN32
#ifndef G_OS_WIN32
while
(
parent
)
{
while
(
parent
)
{
if
(
!
parent
->
stat
&&
statDirectory
(
parent
)
<
0
)
if
(
!
parent
->
have_
stat
&&
statDirectory
(
parent
)
<
0
)
return
-
1
;
return
-
1
;
if
(
parent
->
inode
==
inode
&&
parent
->
device
==
device
)
{
if
(
parent
->
inode
==
inode
&&
parent
->
device
==
device
)
{
g_debug
(
"recursive directory found"
);
g_debug
(
"recursive directory found"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment