Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Continue removing ERR_INVALID_ARGS in favour of EINVAL 

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@212 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
David Reid 2002-07-14 10:14:29 +00:00
parent dfc6d0bbbd
commit faf1362d13
2 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/kernel/core/cbuf.c
View File

@ -290,12 +290,12 @@ int cbuf_memcpy_to_chain(cbuf *chain, size_t offset, const void *_src, size_t le
if((chain->flags & CBUF_FLAG_CHAIN_HEAD) == 0) {
dprintf("cbuf_memcpy_to_chain: chain at %p not head\n", chain);
return ERR_INVALID_ARGS;
return EINVAL;
}
if(len + offset > chain->total_len) {
dprintf("cbuf_memcpy_to_chain: len + offset > size of cbuf chain\n");
return ERR_INVALID_ARGS;
return EINVAL;
}
// find the starting cbuf in the chain to copy to
@ -343,12 +343,12 @@ int cbuf_user_memcpy_to_chain(cbuf *chain, size_t offset, const void *_src, size
if((chain->flags & CBUF_FLAG_CHAIN_HEAD) == 0) {
dprintf("cbuf_memcpy_to_chain: chain at %p not head\n", chain);
return ERR_INVALID_ARGS;
return EINVAL;
}
if(len + offset > chain->total_len) {
dprintf("cbuf_memcpy_to_chain: len + offset > size of cbuf chain\n");
return ERR_INVALID_ARGS;
return EINVAL;
}
// find the starting cbuf in the chain to copy to
@ -398,12 +398,12 @@ int cbuf_memcpy_from_chain(void *_dest, cbuf *chain, size_t offset, size_t len)
if((chain->flags & CBUF_FLAG_CHAIN_HEAD) == 0) {
dprintf("cbuf_memcpy_from_chain: chain at %p not head\n", chain);
return ERR_INVALID_ARGS;
return EINVAL;
}
if(len + offset > chain->total_len) {
dprintf("cbuf_memcpy_from_chain: len + offset > size of cbuf chain\n");
return ERR_INVALID_ARGS;
return EINVAL;
}
// find the starting cbuf in the chain to copy from
@ -452,12 +452,12 @@ int cbuf_user_memcpy_from_chain(void *_dest, cbuf *chain, size_t offset, size_t
if((chain->flags & CBUF_FLAG_CHAIN_HEAD) == 0) {
dprintf("cbuf_memcpy_from_chain: chain at %p not head\n", chain);
return ERR_INVALID_ARGS;
return EINVAL;
}
if(len + offset > chain->total_len) {
dprintf("cbuf_memcpy_from_chain: len + offset > size of cbuf chain\n");
return ERR_INVALID_ARGS;
return EINVAL;
}
// find the starting cbuf in the chain to copy from
@ -615,7 +615,7 @@ cbuf *cbuf_merge_chains(cbuf *chain1, cbuf *chain2)
size_t cbuf_get_len(cbuf *buf)
{
if(!buf)
return ERR_INVALID_ARGS;
return EINVAL;
if(buf->flags & CBUF_FLAG_CHAIN_HEAD) {
return buf->total_len;
@ -707,10 +707,8 @@ int cbuf_truncate_head(cbuf *buf, size_t trunc_bytes)
{
cbuf *head = buf;
if(!buf)
return ERR_INVALID_ARGS;
if((buf->flags & CBUF_FLAG_CHAIN_HEAD) == 0)
return ERR_INVALID_ARGS;
if(!buf || (buf->flags & CBUF_FLAG_CHAIN_HEAD) == 0)
return EINVAL;
while(buf && trunc_bytes > 0) {
int to_trunc;
@ -734,10 +732,8 @@ int cbuf_truncate_tail(cbuf *buf, size_t trunc_bytes)
size_t buf_offset;
cbuf *head = buf;
if(!buf)
return ERR_INVALID_ARGS;
if((buf->flags & CBUF_FLAG_CHAIN_HEAD) == 0)
return ERR_INVALID_ARGS;
if(!buf || (buf->flags & CBUF_FLAG_CHAIN_HEAD) == 0)
return EINVAL;
offset = buf->total_len - trunc_bytes;
buf_offset = 0;

8
src/kernel/core/sem.c
View File

@ -342,7 +342,7 @@ int acquire_sem_etc(sem_id id, int count, int flags, bigtime_t timeout)
}
if(count <= 0)
return ERR_INVALID_ARGS;
return EINVAL;
state = int_disable_interrupts();
GRAB_SEM_LOCK(sems[slot]);
@ -463,7 +463,7 @@ int release_sem_etc(sem_id id, int count, int flags)
return B_BAD_SEM_ID;
if(count <= 0)
return ERR_INVALID_ARGS;
return EINVAL;
state = int_disable_interrupts();
GRAB_SEM_LOCK(sems[slot]);
@ -536,7 +536,7 @@ int get_sem_count(sem_id id, int32* thread_count)
if(id < 0)
return B_BAD_SEM_ID;
if (thread_count == NULL)
return ERR_INVALID_ARGS;
return EINVAL;
slot = id % MAX_SEMS;
@ -568,7 +568,7 @@ int _get_sem_info(sem_id id, struct sem_info *info, size_t sz)
if(id < 0)
return B_BAD_SEM_ID;
if (info == NULL)
return ERR_INVALID_ARGS;
return EINVAL;
slot = id % MAX_SEMS;