mirror of
https://github.com/genodelabs/genode.git
synced 2024-12-19 05:37:54 +00:00
Remove base/include/base/errno.h, fix #1450
This commit is contained in:
parent
2ddf941660
commit
99e7f26b99
@ -62,7 +62,7 @@ void Rpc_entrypoint::entry()
|
|||||||
srv >> IPC_REPLY_WAIT >> opcode;
|
srv >> IPC_REPLY_WAIT >> opcode;
|
||||||
|
|
||||||
/* set default return value */
|
/* set default return value */
|
||||||
srv.ret(ERR_INVALID_OBJECT);
|
srv.ret(Ipc_client::ERR_INVALID_OBJECT);
|
||||||
|
|
||||||
/* check whether capability's label fits global id */
|
/* check whether capability's label fits global id */
|
||||||
if (((unsigned long)srv.badge()) != _rcv_buf.label()) {
|
if (((unsigned long)srv.badge()) != _rcv_buf.label()) {
|
||||||
|
@ -131,7 +131,7 @@ void Rpc_entrypoint::_activation_entry()
|
|||||||
srv >> IPC_WAIT >> opcode;
|
srv >> IPC_WAIT >> opcode;
|
||||||
|
|
||||||
/* set default return value */
|
/* set default return value */
|
||||||
srv.ret(ERR_INVALID_OBJECT);
|
srv.ret(Ipc_client::ERR_INVALID_OBJECT);
|
||||||
|
|
||||||
/* atomically lookup and lock referenced object */
|
/* atomically lookup and lock referenced object */
|
||||||
ep->_curr_obj = ep->lookup_and_lock(id_pt);
|
ep->_curr_obj = ep->lookup_and_lock(id_pt);
|
||||||
|
@ -1,22 +0,0 @@
|
|||||||
/*
|
|
||||||
* \brief Genode error codes
|
|
||||||
* \author Norman Feske
|
|
||||||
* \date 2006-04-28
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Copyright (C) 2006-2013 Genode Labs GmbH
|
|
||||||
*
|
|
||||||
* This file is part of the Genode OS framework, which is distributed
|
|
||||||
* under the terms of the GNU General Public License version 2.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef _INCLUDE__BASE__ERRNO_H_
|
|
||||||
#define _INCLUDE__BASE__ERRNO_H_
|
|
||||||
|
|
||||||
namespace Genode {
|
|
||||||
|
|
||||||
enum { ERR_INVALID_OBJECT = -70000, };
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* _INCLUDE__BASE__ERRNO_H_ */
|
|
@ -23,7 +23,6 @@
|
|||||||
|
|
||||||
#include <util/misc_math.h>
|
#include <util/misc_math.h>
|
||||||
#include <util/string.h>
|
#include <util/string.h>
|
||||||
#include <base/errno.h>
|
|
||||||
#include <base/exception.h>
|
#include <base/exception.h>
|
||||||
#include <base/capability.h>
|
#include <base/capability.h>
|
||||||
#include <base/ipc_msgbuf.h>
|
#include <base/ipc_msgbuf.h>
|
||||||
@ -439,6 +438,8 @@ class Genode::Ipc_client: public Ipc_istream, public Ipc_ostream
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
|
enum { ERR_INVALID_OBJECT = -70000, };
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor
|
* Constructor
|
||||||
*/
|
*/
|
||||||
|
@ -17,7 +17,6 @@
|
|||||||
|
|
||||||
#include <base/thread.h>
|
#include <base/thread.h>
|
||||||
#include <base/thread_state.h>
|
#include <base/thread_state.h>
|
||||||
#include <base/errno.h>
|
|
||||||
#include <base/ipc_pager.h>
|
#include <base/ipc_pager.h>
|
||||||
#include <base/printf.h>
|
#include <base/printf.h>
|
||||||
#include <base/object_pool.h>
|
#include <base/object_pool.h>
|
||||||
|
@ -63,7 +63,7 @@ void Rpc_entrypoint::entry()
|
|||||||
srv >> IPC_REPLY_WAIT >> opcode;
|
srv >> IPC_REPLY_WAIT >> opcode;
|
||||||
|
|
||||||
/* set default return value */
|
/* set default return value */
|
||||||
srv.ret(ERR_INVALID_OBJECT);
|
srv.ret(Ipc_client::ERR_INVALID_OBJECT);
|
||||||
|
|
||||||
/* atomically lookup and lock referenced object */
|
/* atomically lookup and lock referenced object */
|
||||||
Object_pool<Rpc_object_base>::Guard curr_obj(lookup_and_lock(srv.badge()));
|
Object_pool<Rpc_object_base>::Guard curr_obj(lookup_and_lock(srv.badge()));
|
||||||
|
Loading…
Reference in New Issue
Block a user