Page MenuHomeFreeBSD
Files F175899108

D52694.diff
No OneTemporary
Actions

D52694.diff
View Options

diff --git a/contrib/tzcode/asctime.c b/contrib/tzcode/asctime.c
--- a/contrib/tzcode/asctime.c
+++ b/contrib/tzcode/asctime.c
@@ -14,9 +14,7 @@
/*LINTLIBRARY*/
-#include "namespace.h"
#include "private.h"
-#include "un-namespace.h"
#include <stdio.h>
enum { STD_ASCTIME_BUF_SIZE = 26 };
diff --git a/contrib/tzcode/difftime.c b/contrib/tzcode/difftime.c
--- a/contrib/tzcode/difftime.c
+++ b/contrib/tzcode/difftime.c
@@ -7,9 +7,7 @@
/*LINTLIBRARY*/
-#include "namespace.h"
#include "private.h" /* for time_t and TYPE_SIGNED */
-#include "un-namespace.h"
/* Return -X as a double. Using this avoids casting to 'double'. */
static double
diff --git a/contrib/tzcode/localtime.c b/contrib/tzcode/localtime.c
--- a/contrib/tzcode/localtime.c
+++ b/contrib/tzcode/localtime.c
@@ -14,7 +14,6 @@
#define LOCALTIME_IMPLEMENTATION
#ifdef __FreeBSD__
-#include "namespace.h"
#include <pthread.h>
#endif /* __FreeBSD__ */
#ifdef DETECT_TZ_CHANGES
@@ -31,7 +30,6 @@
#include <fcntl.h>
#ifdef __FreeBSD__
#include "libc_private.h"
-#include "un-namespace.h"
#endif /* __FreeBSD__ */
#if HAVE_SYS_STAT_H
@@ -45,8 +43,8 @@
#if defined THREAD_SAFE && THREAD_SAFE
# include <pthread.h>
#ifdef __FreeBSD__
-# define pthread_mutex_lock(l) (__isthreaded ? _pthread_mutex_lock(l) : 0)
-# define pthread_mutex_unlock(l) (__isthreaded ? _pthread_mutex_unlock(l) : 0)
+# define pthread_mutex_lock(l) (__isthreaded ? pthread_mutex_lock(l) : 0)
+# define pthread_mutex_unlock(l) (__isthreaded ? pthread_mutex_unlock(l) : 0)
#endif /* __FreeBSD__ */
static pthread_mutex_t locallock = PTHREAD_MUTEX_INITIALIZER;
static int lock(void) { return pthread_mutex_lock(&locallock); }
@@ -525,7 +523,7 @@
static struct stat old_sb;
struct stat sb;
- if (_fstat(fd, &sb) != 0)
+ if (fstat(fd, &sb) != 0)
return -1;
if (strcmp(name, old_name) != 0) {
@@ -668,7 +666,7 @@
}
#endif
}
- fid = _open(name, (O_RDONLY | O_BINARY | O_CLOEXEC | O_CLOFORK
+ fid = open(name, (O_RDONLY | O_BINARY | O_CLOEXEC | O_CLOFORK
| O_IGNORE_CTTY | O_NOCTTY));
#else /* __FreeBSD__ */
if ((tzloadflags & TZLOAD_FROMENV) && strcmp(name, TZDEFAULT) == 0)
@@ -676,7 +674,7 @@
relname = name;
if (strncmp(relname, TZDIR "/", strlen(TZDIR) + 1) == 0)
relname += strlen(TZDIR) + 1;
- dd = _open(TZDIR, O_DIRECTORY | O_RDONLY);
+ dd = open(TZDIR, O_DIRECTORY | O_RDONLY);
if ((tzloadflags & TZLOAD_FROMENV) && issetugid()) {
if (dd < 0)
return errno;
@@ -686,18 +684,18 @@
fid = -1;
errno = EINVAL;
} else {
- fid = _openat(dd, relname, O_RDONLY | O_BINARY, AT_RESOLVE_BENEATH);
+ fid = openat(dd, relname, O_RDONLY | O_BINARY, AT_RESOLVE_BENEATH);
}
} else {
if (dd < 0) {
relname = name;
dd = AT_FDCWD;
}
- fid = _openat(dd, relname, O_RDONLY | O_BINARY, 0);
+ fid = openat(dd, relname, O_RDONLY | O_BINARY, 0);
}
if (dd != AT_FDCWD && dd >= 0) {
serrno = errno;
- _close(dd);
+ close(dd);
errno = serrno;
}
#endif /* __FreeBSD__ */
@@ -714,23 +712,23 @@
switch (tzfile_changed(name, fid)) {
case -1:
serrno = errno;
- _close(fid);
+ close(fid);
return serrno;
case 0:
- _close(fid);
+ close(fid);
return 0;
case 1:
break;
}
}
#endif /* DETECT_TZ_CHANGES */
- nread = _read(fid, up->buf, sizeof up->buf);
+ nread = read(fid, up->buf, sizeof up->buf);
if (nread < tzheadsize) {
int err = nread < 0 ? errno : EINVAL;
- _close(fid);
+ close(fid);
return err;
}
- if (_close(fid) < 0)
+ if (close(fid) < 0)
return errno;
for (stored = 4; stored <= 8; stored *= 2) {
char version = up->tzhead.tzh_version[0];
@@ -1890,7 +1888,7 @@
static void
localtime_key_init(void)
{
- localtime_key_error = _pthread_key_create(&localtime_key, free);
+ localtime_key_error = pthread_key_create(&localtime_key, free);
}
#endif /* __FreeBSD__ */
struct tm *
@@ -1903,16 +1901,16 @@
struct tm *p_tm = &tm;
if (__isthreaded != 0) {
- _pthread_once(&localtime_once, localtime_key_init);
+ pthread_once(&localtime_once, localtime_key_init);
if (localtime_key_error != 0) {
errno = localtime_key_error;
return (NULL);
}
- if ((p_tm = _pthread_getspecific(localtime_key)) == NULL) {
+ if ((p_tm = pthread_getspecific(localtime_key)) == NULL) {
if ((p_tm = malloc(sizeof(*p_tm))) == NULL) {
return (NULL);
}
- if (_pthread_setspecific(localtime_key, p_tm) != 0) {
+ if (pthread_setspecific(localtime_key, p_tm) != 0) {
free(p_tm);
return (NULL);
}
@@ -1969,7 +1967,7 @@
static void
gmtime_key_init(void)
{
- gmtime_key_error = _pthread_key_create(&gmtime_key, free);
+ gmtime_key_error = pthread_key_create(&gmtime_key, free);
}
#endif /* __FreeBSD__ */
struct tm *
@@ -1982,16 +1980,16 @@
struct tm *p_tm = &tm;
if (__isthreaded != 0) {
- _pthread_once(&gmtime_once, gmtime_key_init);
+ pthread_once(&gmtime_once, gmtime_key_init);
if (gmtime_key_error != 0) {
errno = gmtime_key_error;
return (NULL);
}
- if ((p_tm = _pthread_getspecific(gmtime_key)) == NULL) {
+ if ((p_tm = pthread_getspecific(gmtime_key)) == NULL) {
if ((p_tm = malloc(sizeof(*p_tm))) == NULL) {
return (NULL);
}
- if (_pthread_setspecific(gmtime_key, p_tm) != 0) {
+ if (pthread_setspecific(gmtime_key, p_tm) != 0) {
free(p_tm);
return (NULL);
}
@@ -2017,7 +2015,7 @@
static void
offtime_key_init(void)
{
- offtime_key_error = _pthread_key_create(&offtime_key, free);
+ offtime_key_error = pthread_key_create(&offtime_key, free);
}
#endif /* __FreeBSD__ */
struct tm *
@@ -2030,16 +2028,16 @@
struct tm *p_tm = &tm;
if (__isthreaded != 0) {
- _pthread_once(&offtime_once, offtime_key_init);
+ pthread_once(&offtime_once, offtime_key_init);
if (offtime_key_error != 0) {
errno = offtime_key_error;
return (NULL);
}
- if ((p_tm = _pthread_getspecific(offtime_key)) == NULL) {
+ if ((p_tm = pthread_getspecific(offtime_key)) == NULL) {
if ((p_tm = malloc(sizeof(*p_tm))) == NULL) {
return (NULL);
}
- if (_pthread_setspecific(offtime_key, p_tm) != 0) {
+ if (pthread_setspecific(offtime_key, p_tm) != 0) {
free(p_tm);
return (NULL);
}

File Metadata

Mime Type
text/plain
Expires
Thu, Oct 15, 8:00 AM (16 h, 48 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
40839900
Default Alt Text
D52694.diff (6 KB)

Event Timeline