diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2015-02-09 13:46:23 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2015-02-09 13:46:23 +0000 |
| commit | e15f0f9af8cc0ee4ea33004d5adc1fe574a5ded5 (patch) | |
| tree | 535cdcc8b93e129ed554639b5d73787faa438ae7 /lib | |
| parent | 7a4391ac153424874aea9d00a8bf383d347b030d (diff) | |
remove INITIALIZE macro and do it the hard way.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc/time/localtime.c | 6 | ||||
| -rw-r--r-- | lib/libc/time/private.h | 34 |
2 files changed, 4 insertions, 36 deletions
diff --git a/lib/libc/time/localtime.c b/lib/libc/time/localtime.c index a2d0997a4e4..9398e8b967c 100644 --- a/lib/libc/time/localtime.c +++ b/lib/libc/time/localtime.c @@ -1,4 +1,4 @@ -/* $OpenBSD: localtime.c,v 1.41 2015/02/09 13:32:51 tedu Exp $ */ +/* $OpenBSD: localtime.c,v 1.42 2015/02/09 13:46:22 tedu Exp $ */ /* ** This file is in the public domain, so clarified as of ** 1996-06-05 by Arthur David Olson. @@ -824,7 +824,7 @@ const long offset; register int i; int d, m1, yy0, yy1, yy2, dow; - INITIALIZE(value); + value = 0; leapyear = isleap(year); switch (rulep->r_type) { @@ -925,7 +925,7 @@ const int lastditch; register int load_result; static struct ttinfo zttinfo; - INITIALIZE(dstname); + dstname = NULL; stdname = name; if (lastditch) { stdlen = strlen(name); /* length of standard zone name */ diff --git a/lib/libc/time/private.h b/lib/libc/time/private.h index 950b6bf0cc1..647a998ab41 100644 --- a/lib/libc/time/private.h +++ b/lib/libc/time/private.h @@ -1,4 +1,4 @@ -/* $OpenBSD: private.h,v 1.32 2015/02/09 13:42:03 tedu Exp $ */ +/* $OpenBSD: private.h,v 1.33 2015/02/09 13:46:22 tedu Exp $ */ #ifndef PRIVATE_H #define PRIVATE_H @@ -91,39 +91,7 @@ const char * scheck(const char * string, const char * format); 1 + TYPE_SIGNED(type)) #endif /* !defined INT_STRLEN_MAXIMUM */ -/* -** INITIALIZE(x) -*/ - -#ifndef GNUC_or_lint -#ifdef lint -#define GNUC_or_lint -#endif /* defined lint */ -#ifndef lint -#ifdef __GNUC__ -#define GNUC_or_lint -#endif /* defined __GNUC__ */ -#endif /* !defined lint */ -#endif /* !defined GNUC_or_lint */ - -#ifndef INITIALIZE -#ifdef GNUC_or_lint -#define INITIALIZE(x) ((x) = 0) -#endif /* defined GNUC_or_lint */ -#ifndef GNUC_or_lint -#define INITIALIZE(x) -#endif /* !defined GNUC_or_lint */ -#endif /* !defined INITIALIZE */ - -/* -** For the benefit of GNU folk... -** `_(MSGID)' uses the current locale's message library string for MSGID. -** The default is to use gettext if available, and use MSGID otherwise. -*/ - -#ifndef _ #define _(msgid) msgid -#endif /* !defined _ */ #ifndef TZ_DOMAIN #define TZ_DOMAIN "tz" |