pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/pkgtools/libnbcompat Don't use u_{char,short,int,long}...
details: https://anonhg.NetBSD.org/pkgsrc/rev/7fc3197b94e5
branches: trunk
changeset: 531479:7fc3197b94e5
user: joerg <joerg%pkgsrc.org@localhost>
date: Tue Jul 31 13:17:33 2007 +0000
description:
Don't use u_{char,short,int,long} as they are non-standard.
Bump version to 20070731.
diffstat:
pkgtools/libnbcompat/Makefile | 4 ++--
pkgtools/libnbcompat/files/__fts13.c | 12 ++++++------
pkgtools/libnbcompat/files/__glob13.c | 14 +++++++-------
pkgtools/libnbcompat/files/gettemp.c | 6 +++---
pkgtools/libnbcompat/files/lchflags.c | 4 ++--
pkgtools/libnbcompat/files/nbcompat/fts.h | 16 ++++++++--------
pkgtools/libnbcompat/files/nbcompat/rmd160.h | 10 +++++-----
pkgtools/libnbcompat/files/nbcompat/sha1.h | 12 ++++++------
pkgtools/libnbcompat/files/nbcompat/sha2.h | 4 ++--
pkgtools/libnbcompat/files/pwcache.c | 10 +++++-----
pkgtools/libnbcompat/files/rmd160.c | 10 +++++-----
pkgtools/libnbcompat/files/rmd160hl.c | 10 +++++-----
pkgtools/libnbcompat/files/setmode.c | 10 +++++-----
pkgtools/libnbcompat/files/sha1.c | 28 ++++++++++++++--------------
pkgtools/libnbcompat/files/sha1hl.c | 10 +++++-----
pkgtools/libnbcompat/files/sha2hl.c | 24 ++++++++++++------------
pkgtools/libnbcompat/files/unvis.c | 6 +++---
pkgtools/libnbcompat/files/vis.c | 10 +++++-----
18 files changed, 100 insertions(+), 100 deletions(-)
diffs (truncated from 752 to 300 lines):
diff -r 74a654a3607f -r 7fc3197b94e5 pkgtools/libnbcompat/Makefile
--- a/pkgtools/libnbcompat/Makefile Tue Jul 31 13:07:05 2007 +0000
+++ b/pkgtools/libnbcompat/Makefile Tue Jul 31 13:17:33 2007 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.54 2007/07/21 14:39:25 tnn Exp $
+# $NetBSD: Makefile,v 1.55 2007/07/31 13:17:33 joerg Exp $
#
# NOTE: If you update this package, it is *mandatory* that you update
# pkgsrc/pkgtools/libnbcompat/files/README to reflect the actual
# list of tested and supported platforms.
#
-DISTNAME= libnbcompat-20070721
+DISTNAME= libnbcompat-20070731
CATEGORIES= pkgtools devel
MASTER_SITES= # empty
DISTFILES= # empty
diff -r 74a654a3607f -r 7fc3197b94e5 pkgtools/libnbcompat/files/__fts13.c
--- a/pkgtools/libnbcompat/files/__fts13.c Tue Jul 31 13:07:05 2007 +0000
+++ b/pkgtools/libnbcompat/files/__fts13.c Tue Jul 31 13:17:33 2007 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: __fts13.c,v 1.7 2004/08/23 03:32:12 jlam Exp $ */
+/* $NetBSD: __fts13.c,v 1.8 2007/07/31 13:17:33 joerg Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94";
#else
-__RCSID("$NetBSD: __fts13.c,v 1.7 2004/08/23 03:32:12 jlam Exp $");
+__RCSID("$NetBSD: __fts13.c,v 1.8 2007/07/31 13:17:33 joerg Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -115,7 +115,7 @@
static int fts_palloc __P((FTS *, size_t));
static void fts_padjust __P((FTS *, FTSENT *));
static FTSENT *fts_sort __P((FTS *, FTSENT *, size_t));
-static u_short fts_stat __P((FTS *, FTSENT *, int));
+static unsigned short fts_stat __P((FTS *, FTSENT *, int));
static int fts_safe_changedir __P((const FTS *, const FTSENT *, int,
const char *));
@@ -158,7 +158,7 @@
}
/* Allocate/initialize the stream */
- if ((sp = malloc((u_int)sizeof(FTS))) == NULL)
+ if ((sp = malloc((unsigned int)sizeof(FTS))) == NULL)
return (NULL);
memset(sp, 0, sizeof(FTS));
sp->fts_compar = compar;
@@ -883,7 +883,7 @@
return (head);
}
-static u_short
+static unsigned short
fts_stat(sp, p, follow)
FTS *sp;
FTSENT *p;
@@ -1035,7 +1035,7 @@
if (!ISSET(FTS_NOSTAT))
p->fts_statp =
- (struct STAT *)ALIGN((u_long)(p->fts_name + namelen + 2));
+ (struct STAT *)ALIGN((unsigned long)(p->fts_name + namelen + 2));
#else
if ((p = malloc(sizeof(FTSENT) + namelen)) == NULL)
return (NULL);
diff -r 74a654a3607f -r 7fc3197b94e5 pkgtools/libnbcompat/files/__glob13.c
--- a/pkgtools/libnbcompat/files/__glob13.c Tue Jul 31 13:07:05 2007 +0000
+++ b/pkgtools/libnbcompat/files/__glob13.c Tue Jul 31 13:17:33 2007 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: __glob13.c,v 1.1 2004/08/23 03:32:12 jlam Exp $ */
+/* $NetBSD: __glob13.c,v 1.2 2007/07/31 13:17:33 joerg Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)glob.c 8.3 (Berkeley) 10/13/93";
#else
-__RCSID("$NetBSD: __glob13.c,v 1.1 2004/08/23 03:32:12 jlam Exp $");
+__RCSID("$NetBSD: __glob13.c,v 1.2 2007/07/31 13:17:33 joerg Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -137,7 +137,7 @@
#define M_MASK 0xffff
#define M_ASCII 0x00ff
-typedef u_short Char;
+typedef unsigned short Char;
#else
@@ -189,13 +189,13 @@
int flags, (*errfunc) __P((const char *, int));
glob_t *pglob;
{
- const u_char *patnext;
+ const unsigned char *patnext;
int c;
Char *bufnext, *bufend, patbuf[MAXPATHLEN+1];
_DIAGASSERT(pattern != NULL);
- patnext = (const u_char *) pattern;
+ patnext = (const unsigned char *) pattern;
if (!(flags & GLOB_APPEND)) {
pglob->gl_pathc = 0;
pglob->gl_pathv = NULL;
@@ -720,7 +720,7 @@
else
readdirfunc = (struct dirent *(*)__P((void *))) readdir;
while ((dp = (*readdirfunc)(dirp)) != NULL) {
- u_char *sc;
+ unsigned char *sc;
Char *dc;
/* Initial DOT must be matched literally. */
@@ -730,7 +730,7 @@
* The resulting string contains EOS, so we can
* use the pathlim character, if it is the nul
*/
- for (sc = (u_char *) dp->d_name, dc = pathend;
+ for (sc = (unsigned char *) dp->d_name, dc = pathend;
dc <= pathlim && (*dc++ = *sc++) != EOS;)
continue;
diff -r 74a654a3607f -r 7fc3197b94e5 pkgtools/libnbcompat/files/gettemp.c
--- a/pkgtools/libnbcompat/files/gettemp.c Tue Jul 31 13:07:05 2007 +0000
+++ b/pkgtools/libnbcompat/files/gettemp.c Tue Jul 31 13:17:33 2007 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: gettemp.c,v 1.1 2004/08/23 03:32:12 jlam Exp $ */
+/* $NetBSD: gettemp.c,v 1.2 2007/07/31 13:17:33 joerg Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)mktemp.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: gettemp.c,v 1.1 2004/08/23 03:32:12 jlam Exp $");
+__RCSID("$NetBSD: gettemp.c,v 1.2 2007/07/31 13:17:33 joerg Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -81,7 +81,7 @@
{
char *start, *trv;
struct stat sbuf;
- u_int pid;
+ unsigned int pid;
/* To guarantee multiple calls generate unique names even if
the file is not created. 676 different possibilities with 7
diff -r 74a654a3607f -r 7fc3197b94e5 pkgtools/libnbcompat/files/lchflags.c
--- a/pkgtools/libnbcompat/files/lchflags.c Tue Jul 31 13:07:05 2007 +0000
+++ b/pkgtools/libnbcompat/files/lchflags.c Tue Jul 31 13:17:33 2007 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lchflags.c,v 1.2 2004/08/23 03:32:12 jlam Exp $ */
+/* $NetBSD: lchflags.c,v 1.3 2007/07/31 13:17:33 joerg Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
#include <nbcompat/unistd.h>
int
-lchflags(const char *path, u_long flags)
+lchflags(const char *path, unsigned long flags)
{
struct stat psb;
diff -r 74a654a3607f -r 7fc3197b94e5 pkgtools/libnbcompat/files/nbcompat/fts.h
--- a/pkgtools/libnbcompat/files/nbcompat/fts.h Tue Jul 31 13:07:05 2007 +0000
+++ b/pkgtools/libnbcompat/files/nbcompat/fts.h Tue Jul 31 13:17:33 2007 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fts.h,v 1.4 2004/08/16 17:24:57 jlam Exp $ */
+/* $NetBSD: fts.h,v 1.5 2007/07/31 13:17:34 joerg Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -41,8 +41,8 @@
dev_t fts_dev; /* starting device # */
char *fts_path; /* path for this descent */
int fts_rfd; /* fd for root */
- u_int fts_pathlen; /* sizeof(path) */
- u_int fts_nitems; /* elements in the sort array */
+ unsigned int fts_pathlen; /* sizeof(path) */
+ unsigned int fts_nitems; /* elements in the sort array */
int (*fts_compar) /* compare function */
(const struct _ftsent **, const struct _ftsent **);
@@ -71,8 +71,8 @@
char *fts_path; /* root path */
int fts_errno; /* errno for this node */
int fts_symfd; /* fd for symlink */
- u_short fts_pathlen; /* strlen(fts_path) */
- u_short fts_namelen; /* strlen(fts_name) */
+ unsigned short fts_pathlen; /* strlen(fts_path) */
+ unsigned short fts_namelen; /* strlen(fts_name) */
ino_t fts_ino; /* inode */
dev_t fts_dev; /* device */
@@ -100,18 +100,18 @@
#define FTS_SL 12 /* symbolic link */
#define FTS_SLNONE 13 /* symbolic link without target */
#define FTS_W 14 /* whiteout object */
- u_short fts_info; /* user flags for FTSENT structure */
+ unsigned short fts_info; /* user flags for FTSENT structure */
#define FTS_DONTCHDIR 0x01 /* don't chdir .. to the parent */
#define FTS_SYMFOLLOW 0x02 /* followed a symlink to get here */
#define FTS_ISW 0x04 /* this is a whiteout object */
- u_short fts_flags; /* private flags for FTSENT structure */
+ unsigned short fts_flags; /* private flags for FTSENT structure */
#define FTS_AGAIN 1 /* read node again */
#define FTS_FOLLOW 2 /* follow symbolic link */
#define FTS_NOINSTR 3 /* no instructions */
#define FTS_SKIP 4 /* discard node */
- u_short fts_instr; /* fts_set() instructions */
+ unsigned short fts_instr; /* fts_set() instructions */
struct stat *fts_statp; /* stat(2) information */
char fts_name[1]; /* file name */
diff -r 74a654a3607f -r 7fc3197b94e5 pkgtools/libnbcompat/files/nbcompat/rmd160.h
--- a/pkgtools/libnbcompat/files/nbcompat/rmd160.h Tue Jul 31 13:07:05 2007 +0000
+++ b/pkgtools/libnbcompat/files/nbcompat/rmd160.h Tue Jul 31 13:17:33 2007 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rmd160.h,v 1.2 2004/08/16 17:24:57 jlam Exp $ */
+/* $NetBSD: rmd160.h,v 1.3 2007/07/31 13:17:34 joerg Exp $ */
/********************************************************************\
*
@@ -27,19 +27,19 @@
typedef struct {
u_int32_t state[5]; /* state (ABCDE) */
u_int32_t length[2]; /* number of bits */
- u_char bbuffer[64]; /* overflow buffer */
+ unsigned char bbuffer[64]; /* overflow buffer */
u_int32_t buflen; /* number of chars in bbuffer */
} RMD160_CTX;
__BEGIN_DECLS
void RMD160Init(RMD160_CTX *);
void RMD160Transform(u_int32_t[5], const u_int32_t[16]);
-void RMD160Update(RMD160_CTX *, const u_char *, u_int32_t);
-void RMD160Final(u_char[20], RMD160_CTX *);
+void RMD160Update(RMD160_CTX *, const unsigned char *, u_int32_t);
+void RMD160Final(unsigned char[20], RMD160_CTX *);
#ifndef _KERNEL
char *RMD160End(RMD160_CTX *, char *);
char *RMD160File(char *, char *);
-char *RMD160Data(const u_char *, size_t, char *);
+char *RMD160Data(const unsigned char *, size_t, char *);
#endif /* _KERNEL */
__END_DECLS
diff -r 74a654a3607f -r 7fc3197b94e5 pkgtools/libnbcompat/files/nbcompat/sha1.h
--- a/pkgtools/libnbcompat/files/nbcompat/sha1.h Tue Jul 31 13:07:05 2007 +0000
+++ b/pkgtools/libnbcompat/files/nbcompat/sha1.h Tue Jul 31 13:17:33 2007 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sha1.h,v 1.2 2004/08/16 17:24:57 jlam Exp $ */
+/* $NetBSD: sha1.h,v 1.3 2007/07/31 13:17:34 joerg Exp $ */
/*
* SHA-1 in C
@@ -12,17 +12,17 @@
typedef struct {
u_int32_t state[5];
u_int32_t count[2];
- u_char buffer[64];
+ unsigned char buffer[64];
} SHA1_CTX;
-void SHA1Transform __P((u_int32_t state[5], const u_char buffer[64]));
+void SHA1Transform __P((u_int32_t state[5], const unsigned char buffer[64]));
void SHA1Init __P((SHA1_CTX *context));
-void SHA1Update __P((SHA1_CTX *context, const u_char *data, u_int len));
-void SHA1Final __P((u_char digest[20], SHA1_CTX *context));
+void SHA1Update __P((SHA1_CTX *context, const unsigned char *data, unsigned int len));
+void SHA1Final __P((unsigned char digest[20], SHA1_CTX *context));
#ifndef _KERNEL
char *SHA1End __P((SHA1_CTX *, char *));
char *SHA1File __P((char *, char *));
-char *SHA1Data __P((const u_char *, size_t, char *));
+char *SHA1Data __P((const unsigned char *, size_t, char *));
#endif /* _KERNEL */
#endif /* _NBCOMPAT_SYS_SHA1_H_ */
diff -r 74a654a3607f -r 7fc3197b94e5 pkgtools/libnbcompat/files/nbcompat/sha2.h
--- a/pkgtools/libnbcompat/files/nbcompat/sha2.h Tue Jul 31 13:07:05 2007 +0000
+++ b/pkgtools/libnbcompat/files/nbcompat/sha2.h Tue Jul 31 13:17:33 2007 +0000
@@ -97,8 +97,8 @@
void SHA256_Init(SHA256_CTX *);
Home |
Main Index |
Thread Index |
Old Index