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
8d89add8
Commit
8d89add8
authored
Aug 27, 2007
by
J. Alexander Treuman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
adding \n to a bunch of error message strings
git-svn-id:
https://svn.musicpd.org/mpd/trunk@6826
09075e82-0dd4-0310-85a5-a0d7c8717e4f
parent
f18e5241
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
8 deletions
+8
-8
audioOutput_jack.c
src/audioOutputs/audioOutput_jack.c
+3
-3
audioOutput_oss.c
src/audioOutputs/audioOutput_oss.c
+1
-1
mpc_plugin.c
src/inputPlugins/mpc_plugin.c
+2
-2
inputStream_http.c
src/inputStream_http.c
+1
-1
path.c
src/path.c
+1
-1
No files found.
src/audioOutputs/audioOutput_jack.c
View file @
8d89add8
...
@@ -267,7 +267,7 @@ static int connect_jack(AudioOutput *audioOutput)
...
@@ -267,7 +267,7 @@ static int connect_jack(AudioOutput *audioOutput)
jack_on_shutdown
(
jd
->
client
,
shutdown_callback
,
(
void
*
)
jd
);
jack_on_shutdown
(
jd
->
client
,
shutdown_callback
,
(
void
*
)
jd
);
if
(
jack_activate
(
jd
->
client
)
)
{
if
(
jack_activate
(
jd
->
client
)
)
{
ERROR
(
"cannot activate client"
);
ERROR
(
"cannot activate client
\n
"
);
freeJackData
(
audioOutput
);
freeJackData
(
audioOutput
);
return
-
1
;
return
-
1
;
}
}
...
@@ -312,7 +312,7 @@ static int connect_jack(AudioOutput *audioOutput)
...
@@ -312,7 +312,7 @@ static int connect_jack(AudioOutput *audioOutput)
sprintf
(
port_name
,
"%s:left"
,
name
);
sprintf
(
port_name
,
"%s:left"
,
name
);
if
(
(
jack_connect
(
jd
->
client
,
port_name
,
if
(
(
jack_connect
(
jd
->
client
,
port_name
,
output_ports
[
0
]))
!=
0
)
{
output_ports
[
0
]))
!=
0
)
{
ERROR
(
"%s is not a valid Jack Client / Port
"
,
ERROR
(
"%s is not a valid Jack Client / Port
\n
"
,
output_ports
[
0
]);
output_ports
[
0
]);
freeJackData
(
audioOutput
);
freeJackData
(
audioOutput
);
free
(
port_name
);
free
(
port_name
);
...
@@ -321,7 +321,7 @@ static int connect_jack(AudioOutput *audioOutput)
...
@@ -321,7 +321,7 @@ static int connect_jack(AudioOutput *audioOutput)
sprintf
(
port_name
,
"%s:right"
,
name
);
sprintf
(
port_name
,
"%s:right"
,
name
);
if
(
(
jack_connect
(
jd
->
client
,
port_name
,
if
(
(
jack_connect
(
jd
->
client
,
port_name
,
output_ports
[
1
]))
!=
0
)
{
output_ports
[
1
]))
!=
0
)
{
ERROR
(
"%s is not a valid Jack Client / Port
"
,
ERROR
(
"%s is not a valid Jack Client / Port
\n
"
,
output_ports
[
1
]);
output_ports
[
1
]);
freeJackData
(
audioOutput
);
freeJackData
(
audioOutput
);
free
(
port_name
);
free
(
port_name
);
...
...
src/audioOutputs/audioOutput_oss.c
View file @
8d89add8
...
@@ -377,7 +377,7 @@ static int oss_open_default(AudioOutput *ao, ConfigParam *param, OssData *od)
...
@@ -377,7 +377,7 @@ static int oss_open_default(AudioOutput *ao, ConfigParam *param, OssData *od)
ERROR
(
"%s: permission denied
\n
"
,
dev
);
ERROR
(
"%s: permission denied
\n
"
,
dev
);
break
;
break
;
default:
default:
ERROR
(
"Error accessing %s: %s"
,
dev
,
strerror
(
err
[
i
]));
ERROR
(
"Error accessing %s: %s
\n
"
,
dev
,
strerror
(
err
[
i
]));
}
}
}
}
exit
(
EXIT_FAILURE
);
exit
(
EXIT_FAILURE
);
...
...
src/inputPlugins/mpc_plugin.c
View file @
8d89add8
...
@@ -158,7 +158,7 @@ static int mpc_decode(OutputBuffer * cb, DecoderControl * dc,
...
@@ -158,7 +158,7 @@ static int mpc_decode(OutputBuffer * cb, DecoderControl * dc,
if
((
ret
=
mpc_streaminfo_read
(
&
info
,
&
reader
))
!=
ERROR_CODE_OK
)
{
if
((
ret
=
mpc_streaminfo_read
(
&
info
,
&
reader
))
!=
ERROR_CODE_OK
)
{
closeInputStream
(
inStream
);
closeInputStream
(
inStream
);
if
(
!
dc
->
stop
)
{
if
(
!
dc
->
stop
)
{
ERROR
(
"Not a valid musepack stream"
);
ERROR
(
"Not a valid musepack stream
\n
"
);
return
-
1
;
return
-
1
;
}
else
{
}
else
{
dc
->
state
=
DECODE_STATE_STOP
;
dc
->
state
=
DECODE_STATE_STOP
;
...
@@ -172,7 +172,7 @@ static int mpc_decode(OutputBuffer * cb, DecoderControl * dc,
...
@@ -172,7 +172,7 @@ static int mpc_decode(OutputBuffer * cb, DecoderControl * dc,
if
(
!
mpc_decoder_initialize
(
&
decoder
,
&
info
))
{
if
(
!
mpc_decoder_initialize
(
&
decoder
,
&
info
))
{
closeInputStream
(
inStream
);
closeInputStream
(
inStream
);
if
(
!
dc
->
stop
)
{
if
(
!
dc
->
stop
)
{
ERROR
(
"Not a valid musepack stream"
);
ERROR
(
"Not a valid musepack stream
\n
"
);
}
else
{
}
else
{
dc
->
state
=
DECODE_STATE_STOP
;
dc
->
state
=
DECODE_STATE_STOP
;
dc
->
stop
=
0
;
dc
->
stop
=
0
;
...
...
src/inputStream_http.c
View file @
8d89add8
...
@@ -81,7 +81,7 @@ void inputStream_initHttp(void)
...
@@ -81,7 +81,7 @@ void inputStream_initHttp(void)
param
=
getConfigParam
(
CONF_HTTP_PROXY_PORT
);
param
=
getConfigParam
(
CONF_HTTP_PROXY_PORT
);
if
(
!
param
)
{
if
(
!
param
)
{
FATAL
(
"%s specified but not %s"
,
CONF_HTTP_PROXY_HOST
,
FATAL
(
"%s specified but not %s
\n
"
,
CONF_HTTP_PROXY_HOST
,
CONF_HTTP_PROXY_PORT
);
CONF_HTTP_PROXY_PORT
);
}
}
proxyPort
=
param
->
value
;
proxyPort
=
param
->
value
;
...
...
src/path.c
View file @
8d89add8
...
@@ -220,7 +220,7 @@ static char *pfx_path(const char *path, const char *pfx, const size_t pfx_len)
...
@@ -220,7 +220,7 @@ static char *pfx_path(const char *path, const char *pfx, const size_t pfx_len)
/* unlikely, return an empty string because truncating would
/* unlikely, return an empty string because truncating would
* also be wrong... break early and break loudly (the system
* also be wrong... break early and break loudly (the system
* headers are likely screwed, not mpd) */
* headers are likely screwed, not mpd) */
ERROR
(
"Cannot prefix '%s' to '%s', max: %d"
,
pfx
,
path
,
MAXPATHLEN
);
ERROR
(
"Cannot prefix '%s' to '%s', max: %d
\n
"
,
pfx
,
path
,
MAXPATHLEN
);
ret
[
0
]
=
'\0'
;
ret
[
0
]
=
'\0'
;
return
ret
;
return
ret
;
}
}
...
...
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