[uClibc] Re: PATCH: use __libc_gettimeofday instead of gettimeofday
Peter S. Mazinger
ps.m at gmx.net
Sun Oct 17 18:15:07 UTC 2004
Oops: forgot to attach the patch
--
Peter S. Mazinger <ps dot m at gmx dot net> ID: 0xA5F059F2
Key fingerprint = 92A4 31E1 56BC 3D5A 2D08 BB6E C389 975E A5F0 59F2
-------------- next part --------------
--- ./libc/inet/rpc/auth_unix.c.mps 2004-10-03 14:33:26.000000000 +0200
+++ ./libc/inet/rpc/auth_unix.c 2004-10-03 14:34:19.000000000 +0200
@@ -130,7 +130,7 @@
/*
* fill in param struct from the given params
*/
- (void) gettimeofday (&now, (struct timezone *) 0);
+ (void) __libc_gettimeofday (&now, (struct timezone *) 0);
aup.aup_time = now.tv_sec;
aup.aup_machname = machname;
aup.aup_uid = uid;
@@ -265,7 +265,7 @@
goto done;
/* update the time and serialize in place */
- (void) gettimeofday (&now, (struct timezone *) 0);
+ (void) __libc_gettimeofday (&now, (struct timezone *) 0);
aup.aup_time = now.tv_sec;
xdrs.x_op = XDR_ENCODE;
XDR_SETPOS (&xdrs, 0);
--- ./libc/inet/rpc/create_xid.c.mps 2004-10-03 14:34:37.000000000 +0200
+++ ./libc/inet/rpc/create_xid.c 2004-10-03 14:34:58.000000000 +0200
@@ -51,7 +51,7 @@
{
struct timeval now;
- gettimeofday (&now, (struct timezone *) 0);
+ __libc_gettimeofday (&now, (struct timezone *) 0);
srand48_r (now.tv_sec ^ now.tv_usec, &__rpc_lrand48_data);
is_initialized = 1;
}
--- ./libc/misc/time/clock_gettime.c.mps 2004-10-03 14:35:24.000000000 +0200
+++ ./libc/misc/time/clock_gettime.c 2004-10-03 14:35:36.000000000 +0200
@@ -26,7 +26,7 @@
int retval = -1;
switch (clock) {
case CLOCK_REALTIME:
- retval = gettimeofday (&tv, NULL);
+ retval = __libc_gettimeofday (&tv, NULL);
if (retval == 0) {
TIMEVAL_TO_TIMESPEC (&tv, ts);
}
--- ./libc/misc/time/ftime.c.mps 2004-10-03 14:36:04.000000000 +0200
+++ ./libc/misc/time/ftime.c 2004-10-03 14:36:11.000000000 +0200
@@ -25,7 +25,7 @@
struct timeval tv;
struct timezone tz;
- if (gettimeofday (&tv, &tz) < 0)
+ if (__libc_gettimeofday (&tv, &tz) < 0)
return -1;
timebuf->time = tv.tv_sec;
--- ./libc/misc/time/time.c.mps 2004-10-03 14:36:23.000000000 +0200
+++ ./libc/misc/time/time.c 2004-10-03 14:36:31.000000000 +0200
@@ -1603,7 +1603,7 @@
struct timeval tv;
register struct timeval *p = &tv;
- gettimeofday(p, NULL); /* This should never fail... */
+ __libc_gettimeofday(p, NULL); /* This should never fail... */
if (tloc) {
*tloc = p->tv_sec;
--- ./libc/misc/utmp/wtent.c.mps 2004-10-03 14:37:06.000000000 +0200
+++ ./libc/misc/utmp/wtent.c 2004-10-03 14:37:18.000000000 +0200
@@ -38,7 +38,7 @@
strncpy(lutmp.ut_line, line, sizeof(lutmp.ut_line)-1);
strncpy(lutmp.ut_name, name, sizeof(lutmp.ut_name)-1);
strncpy(lutmp.ut_host, host, sizeof(lutmp.ut_host)-1);
- gettimeofday(&(lutmp.ut_tv), NULL);
+ __libc_gettimeofday(&(lutmp.ut_tv), NULL);
updwtmp(_PATH_WTMP, &(lutmp));
}
--- ./libc/sysdeps/linux/common/time.c.mps 2004-10-03 14:38:02.000000000 +0200
+++ ./libc/sysdeps/linux/common/time.c 2004-10-03 14:38:11.000000000 +0200
@@ -18,7 +18,7 @@
time_t result;
struct timeval tv;
- if (gettimeofday(&tv, (struct timezone *) NULL)) {
+ if (__libc_gettimeofday(&tv, (struct timezone *) NULL)) {
result = (time_t) - 1;
} else {
result = (time_t) tv.tv_sec;
--- ./libc/sysdeps/linux/common/gettimeofday.c.mps 2004-10-03 14:16:31.000000000 +0200
+++ ./libc/sysdeps/linux/common/gettimeofday.c 2004-10-03 14:32:22.000000000 +0200
@@ -9,4 +9,9 @@
#include "syscalls.h"
#include <sys/time.h>
-_syscall2(int, gettimeofday, struct timeval *, tv, struct timezone *, tz);
+
+#ifdef __NR_gettimeofday
+#define __NR___libc_gettimeofday __NR_gettimeofday
+#endif
+_syscall2(int, __libc_gettimeofday, struct timeval *, tv, struct timezone *, tz);
+weak_alias(__libc_gettimeofday, gettimeofday);
--- ./libc/sysdeps/linux/common/utime.c.mps 2004-10-03 14:38:28.000000000 +0200
+++ ./libc/sysdeps/linux/common/utime.c 2004-10-03 14:38:43.000000000 +0200
@@ -24,7 +24,7 @@
timevals[0].tv_sec = (long int) times->actime;
timevals[1].tv_sec = (long int) times->modtime;
} else {
- if (gettimeofday(&timevals[0], NULL) < 0) {
+ if (__libc_gettimeofday(&timevals[0], NULL) < 0) {
return -1;
}
timevals[1] = timevals[0];
--- ./libc/sysdeps/linux/common/ssp.c.mps 2004-10-03 14:51:32.000000000 +0200
+++ ./libc/sysdeps/linux/common/ssp.c 2004-10-03 14:52:03.000000000 +0200
@@ -113,7 +113,7 @@
* terminator canary */
struct timeval tv;
- gettimeofday (&tv, NULL);
+ __libc_gettimeofday (&tv, NULL);
__guard ^= tv.tv_usec ^ tv.tv_sec;
}
}
--- ./libpthread/linuxthreads/pthread.c.mps 2004-10-03 14:41:02.000000000 +0200
+++ ./libpthread/linuxthreads/pthread.c 2004-10-03 14:41:25.000000000 +0200
@@ -889,7 +889,7 @@
struct timespec reltime;
/* Compute a time offset relative to now. */
- __gettimeofday (&now, NULL);
+ __libc_gettimeofday (&now, NULL);
reltime.tv_nsec = abstime->tv_nsec - now.tv_usec * 1000;
reltime.tv_sec = abstime->tv_sec - now.tv_sec;
if (reltime.tv_nsec < 0) {
@@ -974,7 +974,7 @@
struct timespec reltime;
/* Compute a time offset relative to now. */
- gettimeofday (&now, NULL);
+ __libc_gettimeofday (&now, NULL);
reltime.tv_nsec = abstime->tv_nsec - now.tv_usec * 1000;
reltime.tv_sec = abstime->tv_sec - now.tv_sec;
if (reltime.tv_nsec < 0) {
--- ./libutil/logout.c.mps 2004-10-03 14:41:47.000000000 +0200
+++ ./libutil/logout.c 2004-10-03 14:42:03.000000000 +0200
@@ -50,7 +50,7 @@
memset (ut->ut_host, 0, sizeof ut->ut_host);
#endif
#if _HAVE_UT_TV - 0
- gettimeofday (&ut->ut_tv, NULL);
+ __libc_gettimeofday (&ut->ut_tv, NULL);
#else
time (&ut->ut_time);
#endif
--- ./libutil/logwtmp.c.mps 2004-10-03 14:42:20.000000000 +0200
+++ ./libutil/logwtmp.c 2004-10-03 14:42:32.000000000 +0200
@@ -36,7 +36,7 @@
strncpy(lutmp.ut_line, line, sizeof(lutmp.ut_line)-1);
strncpy(lutmp.ut_name, name, sizeof(lutmp.ut_name)-1);
strncpy(lutmp.ut_host, host, sizeof(lutmp.ut_host)-1);
- gettimeofday(&(lutmp.ut_tv), NULL);
+ __libc_gettimeofday(&(lutmp.ut_tv), NULL);
updwtmp(_PATH_WTMP, &(lutmp));
}
--- include/sys/time.h.mps 2004-10-03 15:06:32.000000000 +0200
+++ include/sys/time.h 2004-10-03 15:08:46.000000000 +0200
@@ -72,6 +72,11 @@
extern int gettimeofday (struct timeval *__restrict __tv,
__timezone_ptr_t __tz) __THROW;
+#ifdef _LIBC
+extern int __libc_gettimeofday (struct timeval *__restrict __tv,
+ __timezone_ptr_t __tz) __THROW;
+#endif
+
#ifdef __USE_BSD
/* Set the current time of day and timezone information.
This call is restricted to the super-user. */
More information about the uClibc
mailing list