allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Fixed error handling to use XSI strerror_r(), not the GNU version.

Browse Source 
git-svn-id: svn://localhost/ardour2/trunk@1582 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Taybin Rutkin
2007-03-13 14:57:02 +00:00
parent c1a5269c55
commit 3f4232c646
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
libs/surfaces/mackie/surface_port.cc
View File

@@ -27,10 +27,13 @@
#include "i18n.h"
#define _XOPEN_SOURCE 600 // force XSI for non-GNU strerror_r()
#include <sstream>
#include <cstring>
#include <cerrno>
using namespace std;
using namespace Mackie;
@@ -84,11 +87,15 @@ MidiByteArray SurfacePort::read()
{
if ( errno != EAGAIN )
{
char buf[512];
char * msg = strerror_r( errno, buf, 512 );
ostringstream os;
os << "Surface: error reading from port: " << port().name() << ": " << errno << " " << msg;
os << "Surface: error reading from port: " << port().name() << ": " << errno;
char buf[512];
int result = strerror_r( errno, buf, 512 );
if (!result) {
os << " " << buf;
}
cout << os.str() << endl;
inactive_event();
throw MackieControlException( os.str() );
@@ -114,11 +121,15 @@ void SurfacePort::write( const MidiByteArray & mba )
{
if ( errno != EAGAIN )
{
char buf[512];
char * msg = strerror_r( errno, buf, 512 );
ostringstream os;
os << "Surface: couldn't write to port " << port().name() << ": " << errno << " " << msg;
os << "Surface: couldn't write to port " << port().name() << ": " << errno;
char buf[512];
int result = strerror_r( errno, buf, 512 );
if (!result) {
os << " " << buf;
}
cout << os.str();
inactive_event();
throw MackieControlException( os.str() );