From 4aef1c02ea32b9ce39718fd8013ad477df503220 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Sat, 29 Mar 2008 11:19:27 +0000 Subject: [PATCH] Followed Marcus' suggestion and use strlcpy() instead of strncpy() for Haiku. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24637 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../media/media-add-ons/multi_audio/MultiAudioNode.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/add-ons/media/media-add-ons/multi_audio/MultiAudioNode.cpp b/src/add-ons/media/media-add-ons/multi_audio/MultiAudioNode.cpp index b5df5f4ca7..e7daa7edcc 100644 --- a/src/add-ons/media/media-add-ons/multi_audio/MultiAudioNode.cpp +++ b/src/add-ons/media/media-add-ons/multi_audio/MultiAudioNode.cpp @@ -769,7 +769,11 @@ MultiAudioNode::PrepareToConnect(const media_source& what, channel->fOutput.format = *format; *source = channel->fOutput.source; +#ifdef __HAIKU__ + strlcpy(name, channel->fOutput.name, B_MEDIA_NAME_LENGTH); +#else strncpy(name, channel->fOutput.name, B_MEDIA_NAME_LENGTH); +#endif return B_OK; } @@ -801,7 +805,11 @@ MultiAudioNode::Connect(status_t error, const media_source& source, // format that we agreed on, and report our connection name again. channel->fOutput.destination = destination; channel->fOutput.format = format; +#ifdef __HAIKU__ + strlcpy(name, channel->fOutput.name, B_MEDIA_NAME_LENGTH); +#else strncpy(name, channel->fOutput.name, B_MEDIA_NAME_LENGTH); +#endif // reset our buffer duration, etc. to avoid later calculations bigtime_t duration = channel->fOutput.format.u.raw_audio.buffer_size * 10000