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
300a6199
Commit
300a6199
authored
7 years ago
by
Max Kellermann
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'v0.20.x'
parents
4319dedb
d094c168
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
2 deletions
+19
-2
NEWS
NEWS
+4
-0
Bzip2ArchivePlugin.cxx
src/archive/plugins/Bzip2ArchivePlugin.cxx
+3
-2
Iso9660ArchivePlugin.cxx
src/archive/plugins/Iso9660ArchivePlugin.cxx
+2
-0
ZzipArchivePlugin.cxx
src/archive/plugins/ZzipArchivePlugin.cxx
+4
-0
WStringAPI.hxx
src/util/WStringAPI.hxx
+6
-0
No files found.
NEWS
View file @
300a6199
...
...
@@ -21,6 +21,10 @@ ver 0.21 (not yet released)
ver 0.20.14 (not yet released)
* database
- simple: fix file corruption in the presence of mount points
* archive
- bz2: fix deadlock
- reduce lock contention, fixing lots of xrun problems
* fix Solaris build failure
ver 0.20.13 (2017/12/18)
* output
...
...
This diff is collapsed.
Click to expand it.
src/archive/plugins/Bzip2ArchivePlugin.cxx
View file @
300a6199
...
...
@@ -162,7 +162,7 @@ Bzip2InputStream::FillBuffer()
if
(
bzstream
.
avail_in
>
0
)
return
true
;
size_t
count
=
archive
->
istream
->
Read
(
buffer
,
sizeof
(
buffer
));
size_t
count
=
archive
->
istream
->
Lock
Read
(
buffer
,
sizeof
(
buffer
));
if
(
count
==
0
)
return
false
;
...
...
@@ -174,6 +174,8 @@ Bzip2InputStream::FillBuffer()
size_t
Bzip2InputStream
::
Read
(
void
*
ptr
,
size_t
length
)
{
const
ScopeUnlock
unlock
(
mutex
);
int
bz_result
;
size_t
nbytes
=
0
;
...
...
@@ -224,4 +226,3 @@ const ArchivePlugin bz2_archive_plugin = {
bz2_open
,
bz2_extensions
,
};
This diff is collapsed.
Click to expand it.
src/archive/plugins/Iso9660ArchivePlugin.cxx
View file @
300a6199
...
...
@@ -182,6 +182,8 @@ Iso9660ArchiveFile::OpenStream(const char *pathname,
size_t
Iso9660InputStream
::
Read
(
void
*
ptr
,
size_t
read_size
)
{
const
ScopeUnlock
unlock
(
mutex
);
int
readed
=
0
;
int
no_blocks
,
cur_block
;
size_t
left_bytes
=
statbuf
->
size
-
offset
;
...
...
This diff is collapsed.
Click to expand it.
src/archive/plugins/ZzipArchivePlugin.cxx
View file @
300a6199
...
...
@@ -138,6 +138,8 @@ ZzipArchiveFile::OpenStream(const char *pathname,
size_t
ZzipInputStream
::
Read
(
void
*
ptr
,
size_t
read_size
)
{
const
ScopeUnlock
unlock
(
mutex
);
int
ret
=
zzip_file_read
(
file
,
ptr
,
read_size
);
if
(
ret
<
0
)
throw
std
::
runtime_error
(
"zzip_file_read() has failed"
);
...
...
@@ -155,6 +157,8 @@ ZzipInputStream::IsEOF() noexcept
void
ZzipInputStream
::
Seek
(
offset_type
new_offset
)
{
const
ScopeUnlock
unlock
(
mutex
);
zzip_off_t
ofs
=
zzip_seek
(
file
,
new_offset
,
SEEK_SET
);
if
(
ofs
<
0
)
throw
std
::
runtime_error
(
"zzip_seek() has failed"
);
...
...
This diff is collapsed.
Click to expand it.
src/util/WStringAPI.hxx
View file @
300a6199
...
...
@@ -106,6 +106,8 @@ UnsafeCopyStringP(wchar_t *dest, const wchar_t *src) noexcept
/* emulate wcpcpy() */
UnsafeCopyString
(
dest
,
src
);
return
dest
+
StringLength
(
dest
);
#elif defined(__sun) && defined (__SVR4)
return
std
::
wcpcpy
(
dest
,
src
);
#else
return
wcpcpy
(
dest
,
src
);
#endif
...
...
@@ -159,7 +161,11 @@ gcc_malloc gcc_returns_nonnull gcc_nonnull_all
static
inline
wchar_t
*
DuplicateString
(
const
wchar_t
*
p
)
{
#if defined(__sun) && defined (__SVR4)
return
std
::
wcsdup
(
p
);
#else
return
wcsdup
(
p
);
#endif
}
#endif
...
...
This diff is collapsed.
Click to expand it.
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