sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

r12641: - remove some unused functions

Browse Source 
- we already call usleep() directly in some places,
  so do it everywhere

metze
This commit is contained in:
Stefan Metzmacher 2005-12-31 09:08:46 +00:00 committed by Gerald (Jerry) Carter
parent 5a257ba981
commit 9eaf6e2c4d
2 changed files with 1 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
source/lib/system.c
View File

@ -38,73 +38,6 @@
expansions/etc make sense to the OS should be acceptable to Samba.
*/
/*******************************************************************
A wrapper for usleep in case we don't have one.
********************************************************************/
int sys_usleep(long usecs)
{
#ifndef HAVE_USLEEP
struct timeval tval;
#endif
/*
* We need this braindamage as the glibc usleep
* is not SPEC1170 complient... grumble... JRA.
*/
if(usecs < 0 || usecs > 1000000) {
errno = EINVAL;
return -1;
}
#if HAVE_USLEEP
usleep(usecs);
return 0;
#else /* HAVE_USLEEP */
/*
* Fake it with select...
*/
tval.tv_sec = 0;
tval.tv_usec = usecs/1000;
select(0,NULL,NULL,NULL,&tval);
return 0;
#endif /* HAVE_USLEEP */
}
/*******************************************************************
A read wrapper that will deal with EINTR.
********************************************************************/
ssize_t sys_read(int fd, void *buf, size_t count)
{
ssize_t ret;
do {
ret = read(fd, buf, count);
} while (ret == -1 && errno == EINTR);
return ret;
}
/*******************************************************************
A write wrapper that will deal with EINTR.
********************************************************************/
ssize_t sys_write(int fd, const void *buf, size_t count)
{
ssize_t ret;
do {
ret = write(fd, buf, count);
} while (ret == -1 && errno == EINTR);
return ret;
}
/**************************************************************************
A wrapper for gethostbyname() that tries avoids looking up hostnames
in the root domain, which can cause dial-on-demand links to come up for no

3
source/torture/nbench/nbio.c
View File

@ -649,8 +649,7 @@ void nb_flush(int fnum, NTSTATUS status)
void nb_sleep(int usec, NTSTATUS status)
{
(void)status;
sys_usleep(usec);
usleep(usec);
}
void nb_deltree(const char *dname)