From 9ee82d317abe68e5345cee9e21fde70f804efa6b Mon Sep 17 00:00:00 2001 From: lukem Date: Sun, 28 Oct 2001 13:06:43 +0000 Subject: [PATCH] s/u_longlong_t/unsigned long long/ to shut up the parc port --- bin/pax/Makefile | 6 +++--- bin/pax/extern.h | 6 +++--- bin/pax/gen_subs.c | 30 +++++++++++++++--------------- bin/pax/pax.h | 10 +++++----- bin/pax/tar.c | 20 ++++++++++---------- 5 files changed, 36 insertions(+), 36 deletions(-) diff --git a/bin/pax/Makefile b/bin/pax/Makefile index 40b26ed89fc7..b0fa1bc09c90 100644 --- a/bin/pax/Makefile +++ b/bin/pax/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/10/25 08:51:50 lukem Exp $ +# $NetBSD: Makefile,v 1.13 2001/10/28 13:06:43 lukem Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # To install on versions prior to BSD 4.4 the following may have to be @@ -8,8 +8,8 @@ # stat structure is easily determined by looking at the # basic type of an off_t (often defined in the file: # /usr/include/sys/types.h). If off_t is a long (and is -# NOT A longlong_t) then you must define NET2_STAT. -# This define is important, as if you do have a longlong_t +# NOT A long long) then you must define NET2_STAT. +# This define is important, as if you do have a long long # off_t and define NET2_STAT, pax will compile but will # NOT RUN PROPERLY. # diff --git a/bin/pax/extern.h b/bin/pax/extern.h index e2cc7d3bf9c2..80f567c83078 100644 --- a/bin/pax/extern.h +++ b/bin/pax/extern.h @@ -1,4 +1,4 @@ -/* $NetBSD: extern.h,v 1.27 2001/10/25 08:51:50 lukem Exp $ */ +/* $NetBSD: extern.h,v 1.28 2001/10/28 13:06:43 lukem Exp $ */ /*- * Copyright (c) 1992 Keith Muller. @@ -178,8 +178,8 @@ int l_strncpy(char *, const char *, int); u_long asc_ul(char *, int, int); int ul_asc(u_long, char *, int, int); #ifndef NET2_STAT -u_longlong_t asc_ull(char *, int, int); -int ull_asc(u_longlong_t, char *, int, int); +unsigned long long asc_ull(char *, int, int); +int ull_asc(unsigned long long, char *, int, int); #endif int check_Aflag(void); diff --git a/bin/pax/gen_subs.c b/bin/pax/gen_subs.c index 26c457568680..a1df8feaf082 100644 --- a/bin/pax/gen_subs.c +++ b/bin/pax/gen_subs.c @@ -1,4 +1,4 @@ -/* $NetBSD: gen_subs.c,v 1.21 2001/10/25 05:33:33 lukem Exp $ */ +/* $NetBSD: gen_subs.c,v 1.22 2001/10/28 13:06:43 lukem Exp $ */ /*- * Copyright (c) 1992 Keith Muller. @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)gen_subs.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: gen_subs.c,v 1.21 2001/10/25 05:33:33 lukem Exp $"); +__RCSID("$NetBSD: gen_subs.c,v 1.22 2001/10/28 13:06:43 lukem Exp $"); #endif #endif /* not lint */ @@ -323,19 +323,19 @@ ul_asc(u_long val, char *str, int len, int base) #ifndef NET2_STAT /* * asc_ull() - * convert hex/octal character string into a u_longlong_t. We do not have - * to to check for overflow! (the headers in all supported formats are - * not large enough to create an overflow). + * convert hex/octal character string into a unsigned long long. We do + * not have to to check for overflow! (the headers in all supported + * formats are not large enough to create an overflow). * NOTE: strings passed to us are NOT TERMINATED. * Return: - * u_longlong_t value + * unsigned long long value */ -u_longlong_t +unsigned long long asc_ull(char *str, int len, int base) { char *stop; - u_longlong_t tval = 0; + unsigned long long tval = 0; stop = str + len; @@ -369,16 +369,16 @@ asc_ull(char *str, int len, int base) /* * ull_asc() - * convert an u_longlong_t into a hex/oct ascii string. pads with LEADING - * ascii 0's to fill string completely + * convert an unsigned long long into a hex/oct ascii string. pads with + * LEADING ascii 0's to fill string completely * NOTE: the string created is NOT TERMINATED. */ int -ull_asc(u_longlong_t val, char *str, int len, int base) +ull_asc(unsigned long long val, char *str, int len, int base) { char *pt; - u_longlong_t digit; + unsigned long long digit; /* * WARNING str is not '\0' terminated by this routine @@ -396,13 +396,13 @@ ull_asc(u_longlong_t val, char *str, int len, int base) *pt-- = '0' + (char)digit; else *pt-- = 'a' + (char)(digit - 10); - if ((val = (val >> 4)) == (u_longlong_t)0) + if ((val = (val >> 4)) == (unsigned long long)0) break; } } else { while (pt >= str) { *pt-- = '0' + (char)(val & 0x7); - if ((val = (val >> 3)) == (u_longlong_t)0) + if ((val = (val >> 3)) == (unsigned long long)0) break; } } @@ -412,7 +412,7 @@ ull_asc(u_longlong_t val, char *str, int len, int base) */ while (pt >= str) *pt-- = '0'; - if (val != (u_longlong_t)0) + if (val != (unsigned long long)0) return(-1); return(0); } diff --git a/bin/pax/pax.h b/bin/pax/pax.h index cee845b302d7..5a3d7f7b554f 100644 --- a/bin/pax/pax.h +++ b/bin/pax/pax.h @@ -1,4 +1,4 @@ -/* $NetBSD: pax.h,v 1.11 2001/10/25 05:33:33 lukem Exp $ */ +/* $NetBSD: pax.h,v 1.12 2001/10/28 13:06:43 lukem Exp $ */ /*- * Copyright (c) 1992 Keith Muller. @@ -253,7 +253,7 @@ typedef struct oplist { #define TMPFILE "paxXXXXXX" /* - * Macros to manipulate off_t as a u_long or u_longlong_t + * Macros to manipulate off_t as a unsigned long or unsigned long long */ #ifdef NET2_STAT #define OFFT_F "%lu" @@ -267,10 +267,10 @@ typedef struct oplist { #else #define OFFT_F "%llu" #define OFFT_FP(x) "%" x "llu" -#define OFFT_T u_longlong_t +#define OFFT_T unsigned long long #define ASC_OFFT(x,y,z) asc_ull(x,y,z) -#define OFFT_ASC(w,x,y,z) ull_asc((u_longlong_t)w,x,y,z) -#define OFFT_OCT(w,x,y,z) ull_oct((u_longlong_t)w,x,y,z) +#define OFFT_ASC(w,x,y,z) ull_asc((unsigned long long)w,x,y,z) +#define OFFT_OCT(w,x,y,z) ull_oct((unsigned long long)w,x,y,z) #define STRTOOFFT(x,y,z) strtoll(x,y,z) #define OFFT_MAX ULLONG_MAX #endif diff --git a/bin/pax/tar.c b/bin/pax/tar.c index 055984511974..bf038854e04f 100644 --- a/bin/pax/tar.c +++ b/bin/pax/tar.c @@ -1,4 +1,4 @@ -/* $NetBSD: tar.c,v 1.19 2001/10/25 05:33:34 lukem Exp $ */ +/* $NetBSD: tar.c,v 1.20 2001/10/28 13:06:43 lukem Exp $ */ /*- * Copyright (c) 1992 Keith Muller. @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)tar.c 8.2 (Berkeley) 4/18/94"; #else -__RCSID("$NetBSD: tar.c,v 1.19 2001/10/25 05:33:34 lukem Exp $"); +__RCSID("$NetBSD: tar.c,v 1.20 2001/10/28 13:06:43 lukem Exp $"); #endif #endif /* not lint */ @@ -72,7 +72,7 @@ static u_long tar_chksm(char *, int); static char *name_split(char *, int); static int ul_oct(u_long, char *, int, int); #ifndef NET2_STAT -static int ull_oct(u_longlong_t, char *, int, int); +static int ull_oct(unsigned long long, char *, int, int); #endif /* @@ -209,17 +209,17 @@ ul_oct(u_long val, char *str, int len, int term) #ifndef NET2_STAT /* * ull_oct() - * convert an u_longlong_t to an octal string. one of many oddball field - * termination characters are used by the various versions of tar in the - * different fields. term selects which kind to use. str is '0' padded - * at the front to len. we are unable to use only one format as many old - * tar readers are very cranky about this. + * convert an unsigned long long to an octal string. one of many oddball + * field termination characters are used by the various versions of tar + * in the different fields. term selects which kind to use. str is '0' + * padded at the front to len. we are unable to use only one format as + * many old tar readers are very cranky about this. * Return: * 0 if the number fit into the string, -1 otherwise */ static int -ull_oct(u_longlong_t val, char *str, int len, int term) +ull_oct(unsigned long long val, char *str, int len, int term) { char *pt; @@ -256,7 +256,7 @@ ull_oct(u_longlong_t val, char *str, int len, int term) while (pt >= str) *pt-- = '0'; - if (val != (u_longlong_t)0) + if (val != (unsigned long long)0) return(-1); return(0); }