Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/gcc-branch' into gcc-branch

This commit is contained in:
Brian Behlendorf 2008-12-22 15:36:14 -08:00
parent c9357d8ef2 262c2c49c1
commit dfddd3290c
1 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
cmd/zdump/zdump.c
View File

@ -108,8 +108,7 @@ static time_t yeartot(long y);
#define my_localtime localtime #define my_localtime localtime
#else /* !defined TYPECHECK */ #else /* !defined TYPECHECK */
static struct tm * static struct tm *
my_localtime(tp) my_localtime(time_t *tp)
time_t *tp;
{ {
register struct tm *tmp; register struct tm *tmp;
@ -142,9 +141,7 @@ time_t *tp;
#endif /* !defined TYPECHECK */ #endif /* !defined TYPECHECK */
static void static void
abbrok(abbrp, zone) abbrok(const char *abbrp, const char *zone)
const char * const abbrp;
const char * const zone;
{ {
register const char *cp; register const char *cp;
int error = 0; int error = 0;
@ -195,9 +192,7 @@ const char * const zone;
} }
int int
main(argc, argv) main(int argc, char *argv[])
int argc;
char *argv[];
{ {
register int i; register int i;
register int c; register int c;
@ -361,7 +356,7 @@ char *argv[];
} }
static void static void
setabsolutes() setabsolutes(void)
{ {
#if defined(sun) #if defined(sun)
absolute_min_time = LONG_MIN; absolute_min_time = LONG_MIN;
@ -406,8 +401,7 @@ setabsolutes()
} }
static time_t static time_t
yeartot(y) yeartot(const long y)
const long y;
{ {
register long myy; register long myy;
register long seconds; register long seconds;
@ -438,10 +432,7 @@ const long y;
} }
static time_t static time_t
hunt(name, lot, hit) hunt(char *name, time_t lot, time_t hit)
char *name;
time_t lot;
time_t hit;
{ {
time_t t; time_t t;
long diff; long diff;
@ -488,9 +479,7 @@ time_t hit;
*/ */
static long static long
delta(newp, oldp) delta(struct tm *newp, struct tm *oldp)
struct tm *newp;
struct tm *oldp;
{ {
register long result; register long result;
register int tmy; register int tmy;
@ -511,10 +500,7 @@ struct tm *oldp;
} }
static void static void
show(zone, t, v) show(char *zone, time_t t, int v)
char *zone;
time_t t;
int v;
{ {
register struct tm *tmp; register struct tm *tmp;
@ -547,8 +533,7 @@ int v;
} }
static char * static char *
abbr(tmp) abbr(struct tm *tmp)
struct tm *tmp;
{ {
register char *result; register char *result;
static char nada; static char nada;
@ -565,7 +550,7 @@ struct tm *tmp;
*/ */
static const char * static const char *
tformat() tformat(void)
{ {
#if defined(sun) #if defined(sun)
/* time_t is signed long */ /* time_t is signed long */
@ -599,8 +584,7 @@ tformat()
} }
static void static void
dumptime(timeptr) dumptime(register const struct tm *timeptr)
register const struct tm *timeptr;
{ {
static const char wday_name[][3] = { static const char wday_name[][3] = {
"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
@ -654,7 +638,7 @@ register const struct tm *timeptr;
} }
static void static void
usage() usage(void)
{ {
(void) fprintf(stderr, gettext( (void) fprintf(stderr, gettext(
"%s: [ --version ] [ -v ] [ -c [loyear,]hiyear ] zonename ...\n"), "%s: [ --version ] [ -v ] [ -c [loyear,]hiyear ] zonename ...\n"),