X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fio%2Fconsole.cpp;h=b695e3c33a90c14bfe521b1e57ad3dc3c08390d1;hb=df5ab3d867c51d72344e443e3adb05bfa29a2b53;hp=442bbb0f7dc0dbcd70b1cd0da62e74f247f8c162;hpb=e4afb5edb0b7834ef4872218c99207e6b589e9ce;p=libs%2Fcore.git diff --git a/source/io/console.cpp b/source/io/console.cpp index 442bbb0..b695e3c 100644 --- a/source/io/console.cpp +++ b/source/io/console.cpp @@ -68,8 +68,7 @@ void Console::set_block(bool b) void Console::set_local_echo(bool e) { - if(!(mode&M_READ)) - throw invalid_access(M_READ); + check_access(M_READ); #ifdef WIN32 DWORD m; @@ -85,8 +84,7 @@ void Console::set_local_echo(bool e) void Console::set_line_buffer(bool l) { - if(!(mode&M_READ)) - throw invalid_access(M_READ); + check_access(M_READ); #ifdef WIN32 DWORD m; @@ -103,8 +101,7 @@ void Console::set_line_buffer(bool l) void Console::get_size(unsigned &rows, unsigned &cols) { - if(!(mode&M_WRITE)) - throw invalid_access(M_WRITE); + check_access(M_WRITE); #ifdef WIN32 // XXX Figure out how to do this @@ -120,16 +117,14 @@ void Console::get_size(unsigned &rows, unsigned &cols) unsigned Console::do_write(const char *buf, unsigned len) { - if(!(mode&M_WRITE)) - throw invalid_access(M_WRITE); + check_access(M_WRITE); return sys_write(handle, buf, len); } unsigned Console::do_read(char *buf, unsigned len) { - if(!(mode&M_READ)) - throw invalid_access(M_READ); + check_access(M_READ); unsigned ret = sys_read(handle, buf, len); if(ret==0)