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
43675717
Commit
43675717
authored
Oct 01, 2013
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
filesystem/Path: use std::string
parent
b21ed2fa
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
45 additions
and
81 deletions
+45
-81
DecoderThread.cxx
src/DecoderThread.cxx
+1
-1
SimpleDatabasePlugin.cxx
src/db/SimpleDatabasePlugin.cxx
+1
-2
Path.cxx
src/fs/Path.cxx
+20
-0
Path.hxx
src/fs/Path.hxx
+23
-78
No files found.
src/DecoderThread.cxx
View file @
43675717
...
@@ -426,7 +426,7 @@ decoder_run(struct decoder_control *dc)
...
@@ -426,7 +426,7 @@ decoder_run(struct decoder_control *dc)
assert
(
song
!=
NULL
);
assert
(
song
!=
NULL
);
if
(
song
->
IsFile
())
if
(
song
->
IsFile
())
uri
=
map_song_fs
(
song
).
Steal
(
);
uri
=
g_strdup
(
map_song_fs
(
song
).
c_str
()
);
else
else
uri
=
song
->
GetURI
();
uri
=
song
->
GetURI
();
...
...
src/db/SimpleDatabasePlugin.cxx
View file @
43675717
...
@@ -71,7 +71,6 @@ bool
...
@@ -71,7 +71,6 @@ bool
SimpleDatabase
::
Check
(
Error
&
error
)
const
SimpleDatabase
::
Check
(
Error
&
error
)
const
{
{
assert
(
!
path
.
IsNull
());
assert
(
!
path
.
IsNull
());
assert
(
!
path
.
empty
());
/* Check if the file exists */
/* Check if the file exists */
if
(
!
CheckAccess
(
path
,
F_OK
))
{
if
(
!
CheckAccess
(
path
,
F_OK
))
{
...
@@ -137,7 +136,7 @@ SimpleDatabase::Check(Error &error) const
...
@@ -137,7 +136,7 @@ SimpleDatabase::Check(Error &error) const
bool
bool
SimpleDatabase
::
Load
(
Error
&
error
)
SimpleDatabase
::
Load
(
Error
&
error
)
{
{
assert
(
!
path
.
empty
());
assert
(
!
path
.
IsNull
());
assert
(
root
!=
NULL
);
assert
(
root
!=
NULL
);
TextFile
file
(
path
);
TextFile
file
(
path
);
...
...
src/fs/Path.cxx
View file @
43675717
...
@@ -52,6 +52,20 @@ const Domain path_domain("path");
...
@@ -52,6 +52,20 @@ const Domain path_domain("path");
std
::
string
fs_charset
;
std
::
string
fs_charset
;
inline
Path
::
Path
(
Donate
,
pointer
_value
)
:
value
(
_value
)
{
g_free
(
_value
);
}
/* no inlining, please */
Path
::~
Path
()
{}
Path
Path
::
Build
(
const_pointer
a
,
const_pointer
b
)
{
return
Path
(
Donate
(),
g_build_filename
(
a
,
b
,
nullptr
));
}
std
::
string
Path
::
ToUTF8
(
const_pointer
path_fs
)
std
::
string
Path
::
ToUTF8
(
const_pointer
path_fs
)
{
{
if
(
path_fs
==
nullptr
)
if
(
path_fs
==
nullptr
)
...
@@ -102,6 +116,12 @@ Path::FromUTF8(const char *path_utf8, Error &error)
...
@@ -102,6 +116,12 @@ Path::FromUTF8(const char *path_utf8, Error &error)
return
path
;
return
path
;
}
}
Path
Path
::
GetDirectoryName
()
const
{
return
Path
(
Donate
(),
g_path_get_dirname
(
value
.
c_str
()));
}
gcc_pure
gcc_pure
static
bool
static
bool
IsSupportedCharset
(
const
char
*
charset
)
IsSupportedCharset
(
const
char
*
charset
)
...
...
src/fs/Path.hxx
View file @
43675717
...
@@ -23,8 +23,6 @@
...
@@ -23,8 +23,6 @@
#include "check.h"
#include "check.h"
#include "gcc.h"
#include "gcc.h"
#include <glib.h>
#include <algorithm>
#include <algorithm>
#include <string>
#include <string>
...
@@ -52,56 +50,37 @@ extern const class Domain path_domain;
...
@@ -52,56 +50,37 @@ extern const class Domain path_domain;
* A path name in the native file system character set.
* A path name in the native file system character set.
*/
*/
class
Path
{
class
Path
{
typedef
std
::
string
string
;
public
:
public
:
typedef
char
value_type
;
typedef
string
::
value_type
value_type
;
typedef
value_type
*
pointer
;
typedef
string
::
pointer
pointer
;
typedef
const
value_type
*
const_pointer
;
typedef
string
::
const_pointer
const_pointer
;
private
:
private
:
pointer
value
;
string
value
;
struct
Donate
{};
struct
Donate
{};
/**
/**
* Donate the allocated pointer to a new #Path object.
* Donate the allocated pointer to a new #Path object.
*/
*/
constexpr
Path
(
Donate
,
pointer
_value
)
:
value
(
_value
)
{}
Path
(
Donate
,
pointer
_value
);
/**
Path
(
const_pointer
_value
)
:
value
(
_value
)
{}
* Release memory allocated by the value, but do not clear the
* value pointer.
*/
void
Free
()
{
/* free() can be optimized by gcc, while g_free() can
not: when the compiler knows that the value is
nullptr, it will not emit a free() call in the
inlined destructor; however on Windows, we need to
call g_free(), because the value has been allocated
by GLib, and on Windows, this matters */
#ifdef WIN32
g_free
(
value
);
#else
free
(
value
);
#endif
}
public
:
public
:
/**
/**
* Copy a #Path object.
* Copy a #Path object.
*/
*/
Path
(
const
Path
&
other
)
Path
(
const
Path
&
)
=
default
;
:
value
(
g_strdup
(
other
.
value
))
{}
/**
/**
* Move a #Path object.
* Move a #Path object.
*/
*/
Path
(
Path
&&
other
)
:
value
(
other
.
value
)
{
Path
(
Path
&&
other
)
:
value
(
std
::
move
(
other
.
value
))
{}
other
.
value
=
nullptr
;
}
~
Path
()
{
~
Path
();
Free
();
}
/**
/**
* Return a "nulled" instance. Its IsNull() method will
* Return a "nulled" instance. Its IsNull() method will
...
@@ -111,16 +90,14 @@ public:
...
@@ -111,16 +90,14 @@ public:
*/
*/
gcc_const
gcc_const
static
Path
Null
()
{
static
Path
Null
()
{
return
Path
(
Donate
(),
nullptr
);
return
Path
(
""
);
}
}
/**
/**
* Join two path components with the path separator.
* Join two path components with the path separator.
*/
*/
gcc_pure
gcc_nonnull_all
gcc_pure
gcc_nonnull_all
static
Path
Build
(
const_pointer
a
,
const_pointer
b
)
{
static
Path
Build
(
const_pointer
a
,
const_pointer
b
);
return
Path
(
Donate
(),
g_build_filename
(
a
,
b
,
nullptr
));
}
gcc_pure
gcc_nonnull_all
gcc_pure
gcc_nonnull_all
static
Path
Build
(
const_pointer
a
,
const
Path
&
b
)
{
static
Path
Build
(
const_pointer
a
,
const
Path
&
b
)
{
...
@@ -143,7 +120,7 @@ public:
...
@@ -143,7 +120,7 @@ public:
*/
*/
gcc_pure
gcc_pure
static
Path
FromFS
(
const_pointer
fs
)
{
static
Path
FromFS
(
const_pointer
fs
)
{
return
Path
(
Donate
(),
g_strdup
(
fs
)
);
return
Path
(
fs
);
}
}
/**
/**
...
@@ -176,40 +153,22 @@ public:
...
@@ -176,40 +153,22 @@ public:
/**
/**
* Copy a #Path object.
* Copy a #Path object.
*/
*/
Path
&
operator
=
(
const
Path
&
other
)
{
Path
&
operator
=
(
const
Path
&
)
=
default
;
if
(
this
!=
&
other
)
{
Free
();
value
=
g_strdup
(
other
.
value
);
}
return
*
this
;
}
/**
/**
* Move a #Path object.
* Move a #Path object.
*/
*/
Path
&
operator
=
(
Path
&&
other
)
{
Path
&
operator
=
(
Path
&&
other
)
{
std
::
swap
(
value
,
other
.
value
);
value
=
std
::
move
(
other
.
value
);
return
*
this
;
return
*
this
;
}
}
/**
/**
* Steal the allocated value. This object has an undefined
* value, and the caller is response for freeing this method's
* return value.
*/
pointer
Steal
()
{
pointer
result
=
value
;
value
=
nullptr
;
return
result
;
}
/**
* Check if this is a "nulled" instance. A "nulled" instance
* Check if this is a "nulled" instance. A "nulled" instance
* must not be used.
* must not be used.
*/
*/
bool
IsNull
()
const
{
bool
IsNull
()
const
{
return
value
==
nullptr
;
return
value
.
empty
()
;
}
}
/**
/**
...
@@ -218,15 +177,7 @@ public:
...
@@ -218,15 +177,7 @@ public:
* @see IsNull()
* @see IsNull()
*/
*/
void
SetNull
()
{
void
SetNull
()
{
Free
();
value
.
clear
();
value
=
nullptr
;
}
gcc_pure
bool
empty
()
const
{
assert
(
value
!=
nullptr
);
return
*
value
==
0
;
}
}
/**
/**
...
@@ -235,9 +186,7 @@ public:
...
@@ -235,9 +186,7 @@ public:
*/
*/
gcc_pure
gcc_pure
size_t
length
()
const
{
size_t
length
()
const
{
assert
(
value
!=
nullptr
);
return
value
.
length
();
return
strlen
(
value
);
}
}
/**
/**
...
@@ -247,9 +196,7 @@ public:
...
@@ -247,9 +196,7 @@ public:
*/
*/
gcc_pure
gcc_pure
const_pointer
c_str
()
const
{
const_pointer
c_str
()
const
{
assert
(
value
!=
nullptr
);
return
value
.
c_str
();
return
value
;
}
}
/**
/**
...
@@ -258,17 +205,15 @@ public:
...
@@ -258,17 +205,15 @@ public:
* (#IsNull returns true).
* (#IsNull returns true).
*/
*/
std
::
string
ToUTF8
()
const
{
std
::
string
ToUTF8
()
const
{
return
ToUTF8
(
value
);
return
ToUTF8
(
value
.
c_str
()
);
}
}
/**
/**
* Gets directory name of this path.
* Gets directory name of this path.
* Returns a "nulled" instance on error.
* Returns a "nulled" instance on error.
*/
*/
Path
GetDirectoryName
()
const
{
gcc_pure
assert
(
value
!=
nullptr
);
Path
GetDirectoryName
()
const
;
return
Path
(
Donate
(),
g_path_get_dirname
(
value
));
}
};
};
#endif
#endif
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