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 /usr.sbin | |
| parent | 7a4391ac153424874aea9d00a8bf383d347b030d (diff) | |
remove INITIALIZE macro and do it the hard way.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/zdump/zdump.c | 32 | ||||
| -rw-r--r-- | usr.sbin/zic/zic.c | 8 |
2 files changed, 7 insertions, 33 deletions
diff --git a/usr.sbin/zdump/zdump.c b/usr.sbin/zdump/zdump.c index c6c81187043..1395f6ec993 100644 --- a/usr.sbin/zdump/zdump.c +++ b/usr.sbin/zdump/zdump.c @@ -1,4 +1,4 @@ -/* $OpenBSD: zdump.c,v 1.4 2015/02/09 13:39:16 tedu Exp $ */ +/* $OpenBSD: zdump.c,v 1.5 2015/02/09 13:46:22 tedu Exp $ */ /* ** This file is in the public domain, so clarified as of ** 2009-05-17 by Arthur David Olson. @@ -80,33 +80,7 @@ #define SECSPERNYEAR (SECSPERDAY * DAYSPERNYEAR) #define SECSPERLYEAR (SECSPERNYEAR + SECSPERDAY) -#ifndef GNUC_or_lint -#ifdef lint -#define GNUC_or_lint -#else /* !defined 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) -#else /* !defined 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" @@ -242,8 +216,8 @@ char * argv[]; struct tm * tmp; struct tm * newtmp; - INITIALIZE(cutlotime); - INITIALIZE(cuthitime); + cutlotime = 0; + cuthitime = 0; progname = argv[0]; vflag = 0; cutarg = NULL; diff --git a/usr.sbin/zic/zic.c b/usr.sbin/zic/zic.c index 7fb9d07a62e..3b11e794f89 100644 --- a/usr.sbin/zic/zic.c +++ b/usr.sbin/zic/zic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: zic.c,v 1.6 2015/02/09 13:42:03 tedu Exp $ */ +/* $OpenBSD: zic.c,v 1.7 2015/02/09 13:46:22 tedu Exp $ */ /* ** This file is in the public domain, so clarified as of ** 2006-07-17 by Arthur David Olson. @@ -1998,8 +1998,8 @@ const int zonecount; startbuf = emalloc(max_abbr_len + 1); ab = emalloc(max_abbr_len + 1); envvar = emalloc(max_envvar_len + 1); - INITIALIZE(untiltime); - INITIALIZE(starttime); + untiltime = 0; + starttime = 0; /* ** Now. . .finally. . .generate some useful data! */ @@ -2119,7 +2119,7 @@ wp = ecpyalloc(_("no POSIX environment variable for zone")); zic_t jtime, ktime; long offset; - INITIALIZE(ktime); + ktime = 0; if (useuntil) { /* ** Turn untiltime into UTC |