Browse Source

backout the __bounded__ attributes for a while; requested by deraadt@

OPENBSD_3_4
avsm 21 years ago
parent
commit
b75b1238ee
16 changed files with 69 additions and 127 deletions
  1. +5
    -9
      src/include/arpa/inet.h
  2. +2
    -3
      src/include/bm.h
  3. +2
    -3
      src/include/dirent.h
  4. +3
    -5
      src/include/kvm.h
  5. +2
    -3
      src/include/md4.h
  6. +2
    -3
      src/include/md5.h
  7. +2
    -3
      src/include/ohash.h
  8. +6
    -12
      src/include/resolv.h
  9. +2
    -3
      src/include/rmd160.h
  10. +2
    -3
      src/include/sha1.h
  11. +6
    -11
      src/include/stdio.h
  12. +3
    -5
      src/include/stdlib.h
  13. +13
    -27
      src/include/string.h
  14. +4
    -7
      src/include/time.h
  15. +12
    -25
      src/include/unistd.h
  16. +3
    -5
      src/include/vis.h

+ 5
- 9
src/include/arpa/inet.h View File

@ -1,4 +1,4 @@
/* $OpenBSD: inet.h,v 1.7 2003/06/26 18:35:13 avsm Exp $ */
/* $OpenBSD: inet.h,v 1.8 2003/06/26 19:34:17 avsm Exp $ */
/* /*
* ++Copyright++ 1983, 1993 * ++Copyright++ 1983, 1993
@ -74,18 +74,14 @@ in_addr_t inet_addr(const char *);
int inet_aton(const char *, struct in_addr *); int inet_aton(const char *, struct in_addr *);
in_addr_t inet_lnaof(struct in_addr); in_addr_t inet_lnaof(struct in_addr);
struct in_addr inet_makeaddr(in_addr_t , in_addr_t); struct in_addr inet_makeaddr(in_addr_t , in_addr_t);
char * inet_neta(in_addr_t, char *, size_t)
__attribute__((__bounded__(__string__,2,3)));
char * inet_neta(in_addr_t, char *, size_t);
in_addr_t inet_netof(struct in_addr); in_addr_t inet_netof(struct in_addr);
in_addr_t inet_network(const char *); in_addr_t inet_network(const char *);
char *inet_net_ntop(int, const void *, int, char *, size_t)
__attribute__((__bounded__(__string__,4,5)));
int inet_net_pton(int, const char *, void *, size_t)
__attribute__((__bounded__(__string__,3,4)));
char *inet_net_ntop(int, const void *, int, char *, size_t);
int inet_net_pton(int, const char *, void *, size_t);
char *inet_ntoa(struct in_addr); char *inet_ntoa(struct in_addr);
int inet_pton(int, const char *, void *); int inet_pton(int, const char *, void *);
const char *inet_ntop(int, const void *, char *, size_t)
__attribute__ ((__bounded__(__string__,3,4)));
const char *inet_ntop(int, const void *, char *, size_t);
u_int inet_nsap_addr(const char *, u_char *, int); u_int inet_nsap_addr(const char *, u_char *, int);
char *inet_nsap_ntoa(int, const u_char *, char *); char *inet_nsap_ntoa(int, const u_char *, char *);
__END_DECLS __END_DECLS


+ 2
- 3
src/include/bm.h View File

@ -1,4 +1,4 @@
/* $OpenBSD: bm.h,v 1.5 2003/06/26 18:35:13 avsm Exp $ */
/* $OpenBSD: bm.h,v 1.6 2003/06/26 19:34:17 avsm Exp $ */
/* $NetBSD: bm.h,v 1.3 1994/10/26 00:55:46 cgd Exp $ */ /* $NetBSD: bm.h,v 1.3 1994/10/26 00:55:46 cgd Exp $ */
/*- /*-
@ -51,8 +51,7 @@ typedef struct {
__BEGIN_DECLS __BEGIN_DECLS
bm_pat *bm_comp(u_char const *, size_t, u_char const *); bm_pat *bm_comp(u_char const *, size_t, u_char const *);
u_char *bm_exec(bm_pat *, u_char *, size_t)
__attribute__ ((__bounded__(__string__,2,3)));
u_char *bm_exec(bm_pat *, u_char *, size_t);
void bm_free(bm_pat *); void bm_free(bm_pat *);
__END_DECLS __END_DECLS


+ 2
- 3
src/include/dirent.h View File

@ -1,4 +1,4 @@
/* $OpenBSD: dirent.h,v 1.11 2003/06/26 18:35:13 avsm Exp $ */
/* $OpenBSD: dirent.h,v 1.12 2003/06/26 19:34:17 avsm Exp $ */
/* $NetBSD: dirent.h,v 1.9 1995/03/26 20:13:37 jtc Exp $ */ /* $NetBSD: dirent.h,v 1.9 1995/03/26 20:13:37 jtc Exp $ */
/*- /*-
@ -103,8 +103,7 @@ void seekdir(DIR *, long);
int scandir(const char *, struct dirent ***, int scandir(const char *, struct dirent ***,
int (*)(struct dirent *), int (*)(const void *, const void *)); int (*)(struct dirent *), int (*)(const void *, const void *));
int alphasort(const void *, const void *); int alphasort(const void *, const void *);
int getdirentries(int, char *, int, long *)
__attribute__ ((__bounded__(__string__,2,3)));
int getdirentries(int, char *, int, long *);
#endif /* not POSIX */ #endif /* not POSIX */
int readdir_r(DIR *, struct dirent *, struct dirent **); int readdir_r(DIR *, struct dirent *, struct dirent **);
__END_DECLS __END_DECLS


+ 3
- 5
src/include/kvm.h View File

@ -1,4 +1,4 @@
/* $OpenBSD: kvm.h,v 1.7 2003/06/26 18:35:13 avsm Exp $ */
/* $OpenBSD: kvm.h,v 1.8 2003/06/26 19:34:17 avsm Exp $ */
/* $NetBSD: kvm.h,v 1.7 1996/04/19 12:02:50 leo Exp $ */ /* $NetBSD: kvm.h,v 1.7 1996/04/19 12:02:50 leo Exp $ */
/*- /*-
@ -70,10 +70,8 @@ kvm_t *kvm_open
(const char *, const char *, const char *, int, const char *); (const char *, const char *, const char *, int, const char *);
kvm_t *kvm_openfiles kvm_t *kvm_openfiles
(const char *, const char *, const char *, int, char *); (const char *, const char *, const char *, int, char *);
ssize_t kvm_read(kvm_t *, u_long, void *, size_t)
__attribute__((__bounded__(__buffer__,3,4)));
ssize_t kvm_write(kvm_t *, u_long, const void *, size_t)
__attribute__((__bounded__(__buffer__,3,4)));
ssize_t kvm_read(kvm_t *, u_long, void *, size_t);
ssize_t kvm_write(kvm_t *, u_long, const void *, size_t);
__END_DECLS __END_DECLS


+ 2
- 3
src/include/md4.h View File

@ -1,5 +1,5 @@
/* MD4.H - header file for MD4C.C /* MD4.H - header file for MD4C.C
* $OpenBSD: md4.h,v 1.8 2003/06/26 18:35:13 avsm Exp $
* $OpenBSD: md4.h,v 1.9 2003/06/26 19:34:17 avsm Exp $
*/ */
/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All /* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
@ -42,8 +42,7 @@ void MD4Final(unsigned char [16], MD4_CTX *);
void MD4Transform(u_int32_t [4], const unsigned char [64]); void MD4Transform(u_int32_t [4], const unsigned char [64]);
char * MD4End(MD4_CTX *, char *); char * MD4End(MD4_CTX *, char *);
char * MD4File(char *, char *); char * MD4File(char *, char *);
char * MD4Data(const unsigned char *, size_t, char *)
__attribute__((__bounded__(__string__,3,2)));
char * MD4Data(const unsigned char *, size_t, char *);
__END_DECLS __END_DECLS
#endif /* _MD4_H_ */ #endif /* _MD4_H_ */

+ 2
- 3
src/include/md5.h View File

@ -1,5 +1,5 @@
/* MD5.H - header file for MD5C.C /* MD5.H - header file for MD5C.C
* $OpenBSD: md5.h,v 1.8 2003/06/26 18:35:13 avsm Exp $
* $OpenBSD: md5.h,v 1.9 2003/06/26 19:34:17 avsm Exp $
*/ */
/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All /* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
@ -43,8 +43,7 @@ void MD5Final(unsigned char [16], MD5_CTX *);
void MD5Transform(u_int32_t [4], const unsigned char [64]); void MD5Transform(u_int32_t [4], const unsigned char [64]);
char * MD5End(MD5_CTX *, char *); char * MD5End(MD5_CTX *, char *);
char * MD5File(char *, char *); char * MD5File(char *, char *);
char * MD5Data(const unsigned char *, size_t, char *)
__attribute__ ((__bounded__(__string__,3,2)));
char * MD5Data(const unsigned char *, size_t, char *);
__END_DECLS __END_DECLS
#endif /* _MD5_H_ */ #endif /* _MD5_H_ */

+ 2
- 3
src/include/ohash.h View File

@ -1,6 +1,6 @@
#ifndef OHASH_H #ifndef OHASH_H
#define OHASH_H #define OHASH_H
/* $OpenBSD: ohash.h,v 1.4 2003/06/26 18:35:13 avsm Exp $ */
/* $OpenBSD: ohash.h,v 1.5 2003/06/26 19:34:17 avsm Exp $ */
/* ex:ts=8 sw=4: /* ex:ts=8 sw=4:
*/ */
@ -68,8 +68,7 @@ unsigned int ohash_lookup_string(struct ohash *, const char *, u_int32_t);
unsigned int ohash_lookup_interval(struct ohash *, const char *, unsigned int ohash_lookup_interval(struct ohash *, const char *,
const char *, u_int32_t); const char *, u_int32_t);
unsigned int ohash_lookup_memory(struct ohash *, const char *, unsigned int ohash_lookup_memory(struct ohash *, const char *,
size_t, u_int32_t)
__attribute__ ((__bounded__(__string__,2,3)));
size_t, u_int32_t);
void *ohash_find(struct ohash *, unsigned int); void *ohash_find(struct ohash *, unsigned int);
void *ohash_remove(struct ohash *, unsigned int); void *ohash_remove(struct ohash *, unsigned int);
void *ohash_insert(struct ohash *, unsigned int, void *); void *ohash_insert(struct ohash *, unsigned int, void *);


+ 6
- 12
src/include/resolv.h View File

@ -1,4 +1,4 @@
/* $OpenBSD: resolv.h,v 1.12 2003/06/26 18:35:13 avsm Exp $ */
/* $OpenBSD: resolv.h,v 1.13 2003/06/26 19:34:17 avsm Exp $ */
/* /*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@ -333,19 +333,13 @@ int dn_expand(const u_char *, const u_char *, const u_char *,
char *, int); char *, int);
int res_init(void); int res_init(void);
u_int res_randomid(void); u_int res_randomid(void);
int res_query(const char *, int, int, u_char *, int)
__attribute__((__bounded__(__string__,4,5)));
int res_search(const char *, int, int, u_char *, int)
__attribute__((__bounded__(__string__,4,5)));
int res_query(const char *, int, int, u_char *, int);
int res_search(const char *, int, int, u_char *, int);
int res_querydomain(const char *, const char *, int, int, int res_querydomain(const char *, const char *, int, int,
u_char *, int)
__attribute__((__bounded__(__string__,5,6)));
u_char *, int);
int res_mkquery(int, const char *, int, int, const u_char *, int, int res_mkquery(int, const char *, int, int, const u_char *, int,
const u_char *, u_char *, int)
__attribute__((__bounded__(__string__,5,6)))
__attribute__((__bounded__(__string__,8,9)));
int res_send(const u_char *, int, u_char *, int)
__attribute__((__bounded__(__string__,3,4)));
const u_char *, u_char *, int);
int res_send(const u_char *, int, u_char *, int);
int res_isourserver(const struct sockaddr_in *); int res_isourserver(const struct sockaddr_in *);
int res_nameinquery(const char *, int, int, int res_nameinquery(const char *, int, int,
const u_char *, const u_char *); const u_char *, const u_char *);


+ 2
- 3
src/include/rmd160.h View File

@ -1,4 +1,4 @@
/* $OpenBSD: rmd160.h,v 1.8 2003/06/26 18:35:13 avsm Exp $ */
/* $OpenBSD: rmd160.h,v 1.9 2003/06/26 19:34:17 avsm Exp $ */
/* /*
* Copyright (c) 2001 Markus Friedl. All rights reserved. * Copyright (c) 2001 Markus Friedl. All rights reserved.
* *
@ -41,8 +41,7 @@ void RMD160Update(RMD160_CTX *, const u_char *, u_int32_t);
void RMD160Final(u_char [20], RMD160_CTX *); void RMD160Final(u_char [20], RMD160_CTX *);
char *RMD160End(RMD160_CTX *, char *); char *RMD160End(RMD160_CTX *, char *);
char *RMD160File(char *, char *); char *RMD160File(char *, char *);
char *RMD160Data(const u_char *, size_t, char *)
__attribute__((__bounded__(__string__,3,2)));
char *RMD160Data(const u_char *, size_t, char *);
__END_DECLS __END_DECLS
#endif /* _RMD160_H */ #endif /* _RMD160_H */

+ 2
- 3
src/include/sha1.h View File

@ -1,4 +1,4 @@
/* $OpenBSD: sha1.h,v 1.12 2003/06/26 18:35:13 avsm Exp $ */
/* $OpenBSD: sha1.h,v 1.13 2003/06/26 19:34:17 avsm Exp $ */
/* /*
* SHA-1 in C * SHA-1 in C
@ -24,8 +24,7 @@ void SHA1Update(SHA1_CTX *context, const u_char *data, u_int len);
void SHA1Final(u_char digest[20], SHA1_CTX *context); void SHA1Final(u_char digest[20], SHA1_CTX *context);
char *SHA1End(SHA1_CTX *, char *); char *SHA1End(SHA1_CTX *, char *);
char *SHA1File(char *, char *); char *SHA1File(char *, char *);
char *SHA1Data(const u_char *, size_t, char *)
__attribute__((__bounded__ (__string__,3,2)));
char *SHA1Data(const u_char *, size_t, char *);
__END_DECLS __END_DECLS
#define SHA1_DIGESTSIZE 20 #define SHA1_DIGESTSIZE 20


+ 6
- 11
src/include/stdio.h View File

@ -1,4 +1,4 @@
/* $OpenBSD: stdio.h,v 1.27 2003/06/26 18:35:13 avsm Exp $ */
/* $OpenBSD: stdio.h,v 1.28 2003/06/26 19:34:17 avsm Exp $ */
/* $NetBSD: stdio.h,v 1.18 1996/04/25 18:29:21 jtc Exp $ */ /* $NetBSD: stdio.h,v 1.18 1996/04/25 18:29:21 jtc Exp $ */
/*- /*-
@ -214,14 +214,12 @@ int ferror(FILE *);
int fflush(FILE *); int fflush(FILE *);
int fgetc(FILE *); int fgetc(FILE *);
int fgetpos(FILE *, fpos_t *); int fgetpos(FILE *, fpos_t *);
char *fgets(char *, int, FILE *)
__attribute__((__bounded__ (__string__,1,2)));
char *fgets(char *, int, FILE *);
FILE *fopen(const char *, const char *); FILE *fopen(const char *, const char *);
int fprintf(FILE *, const char *, ...); int fprintf(FILE *, const char *, ...);
int fputc(int, FILE *); int fputc(int, FILE *);
int fputs(const char *, FILE *); int fputs(const char *, FILE *);
size_t fread(void *, size_t, size_t, FILE *)
__attribute__((__bounded__ (__size__,1,3,2)));
size_t fread(void *, size_t, size_t, FILE *);
FILE *freopen(const char *, const char *, FILE *); FILE *freopen(const char *, const char *, FILE *);
int fscanf(FILE *, const char *, ...); int fscanf(FILE *, const char *, ...);
int fseek(FILE *, long, int); int fseek(FILE *, long, int);
@ -229,8 +227,7 @@ int fseeko(FILE *, off_t, int);
int fsetpos(FILE *, const fpos_t *); int fsetpos(FILE *, const fpos_t *);
long ftell(FILE *); long ftell(FILE *);
off_t ftello(FILE *); off_t ftello(FILE *);
size_t fwrite(const void *, size_t, size_t, FILE *)
__attribute__((__bounded__ (__size__,1,3,2)));
size_t fwrite(const void *, size_t, size_t, FILE *);
int getc(FILE *); int getc(FILE *);
int getchar(void); int getchar(void);
char *gets(char *); char *gets(char *);
@ -316,15 +313,13 @@ int setlinebuf(FILE *);
char *tempnam(const char *, const char *); char *tempnam(const char *, const char *);
int snprintf(char *, size_t, const char *, ...) int snprintf(char *, size_t, const char *, ...)
__attribute__((__format__ (printf, 3, 4))) __attribute__((__format__ (printf, 3, 4)))
__attribute__((__nonnull__ (3)))
__attribute__((__bounded__ (__string__,1,2)));
__attribute__((__nonnull__ (3)));
int vasprintf(char **, const char *, _BSD_VA_LIST_) int vasprintf(char **, const char *, _BSD_VA_LIST_)
__attribute__((__format__ (printf, 2, 0))) __attribute__((__format__ (printf, 2, 0)))
__attribute__((__nonnull__ (2))); __attribute__((__nonnull__ (2)));
int vsnprintf(char *, size_t, const char *, _BSD_VA_LIST_) int vsnprintf(char *, size_t, const char *, _BSD_VA_LIST_)
__attribute__((__format__ (printf, 3, 0))) __attribute__((__format__ (printf, 3, 0)))
__attribute__((__nonnull__ (3)))
__attribute__((__bounded__(__string__,1,2)));
__attribute__((__nonnull__ (3)));
int vscanf(const char *, _BSD_VA_LIST_) int vscanf(const char *, _BSD_VA_LIST_)
__attribute__((__format__ (scanf, 1, 0))) __attribute__((__format__ (scanf, 1, 0)))
__attribute__((__nonnull__ (1))); __attribute__((__nonnull__ (1)));


+ 3
- 5
src/include/stdlib.h View File

@ -1,4 +1,4 @@
/* $OpenBSD: stdlib.h,v 1.26 2003/06/26 18:35:13 avsm Exp $ */
/* $OpenBSD: stdlib.h,v 1.27 2003/06/26 19:34:17 avsm Exp $ */
/* $NetBSD: stdlib.h,v 1.25 1995/12/27 21:19:08 jtc Exp $ */ /* $NetBSD: stdlib.h,v 1.25 1995/12/27 21:19:08 jtc Exp $ */
/*- /*-
@ -188,8 +188,7 @@ int radixsort(const unsigned char **, int, const unsigned char *,
int sradixsort(const unsigned char **, int, const unsigned char *, int sradixsort(const unsigned char **, int, const unsigned char *,
unsigned); unsigned);
char *initstate(unsigned int, char *, size_t)
__attribute__((__bounded__ (__string__,2,3)));
char *initstate(unsigned int, char *, size_t);
long random(void); long random(void);
char *realpath(const char *, char *); char *realpath(const char *, char *);
char *setstate(const char *); char *setstate(const char *);
@ -219,8 +218,7 @@ void srand48(long);
u_int32_t arc4random(void); u_int32_t arc4random(void);
void arc4random_stir(void); void arc4random_stir(void);
void arc4random_addrandom(unsigned char *, int)
__attribute__((__bounded__ (__string__,1,2)));
void arc4random_addrandom(unsigned char *, int);
#endif /* !_ANSI_SOURCE && !_POSIX_SOURCE */ #endif /* !_ANSI_SOURCE && !_POSIX_SOURCE */
__END_DECLS __END_DECLS


+ 13
- 27
src/include/string.h View File

@ -1,4 +1,4 @@
/* $OpenBSD: string.h,v 1.11 2003/06/26 18:35:13 avsm Exp $ */
/* $OpenBSD: string.h,v 1.12 2003/06/26 19:34:17 avsm Exp $ */
/* $NetBSD: string.h,v 1.6 1994/10/26 00:56:30 cgd Exp $ */ /* $NetBSD: string.h,v 1.6 1994/10/26 00:56:30 cgd Exp $ */
/*- /*-
@ -54,14 +54,9 @@ typedef _BSD_SIZE_T_ size_t;
__BEGIN_DECLS __BEGIN_DECLS
void *memchr(const void *, int, size_t); void *memchr(const void *, int, size_t);
int memcmp(const void *, const void *, size_t); int memcmp(const void *, const void *, size_t);
void *memcpy(void *, const void *, size_t)
__attribute__ ((__bounded__(__buffer__,1,3)))
__attribute__ ((__bounded__(__buffer__,2,3)));
void *memmove(void *, const void *, size_t)
__attribute__ ((__bounded__(__buffer__,1,3)))
__attribute__ ((__bounded__(__buffer__,2,3)));
void *memset(void *, int, size_t)
__attribute__ ((__bounded__(__buffer__,1,3)));
void *memcpy(void *, const void *, size_t);
void *memmove(void *, const void *, size_t);
void *memset(void *, int, size_t);
char *strcat(char *, const char *); char *strcat(char *, const char *);
char *strchr(const char *, int); char *strchr(const char *, int);
int strcmp(const char *, const char *); int strcmp(const char *, const char *);
@ -69,41 +64,32 @@ int strcoll(const char *, const char *);
char *strcpy(char *, const char *); char *strcpy(char *, const char *);
size_t strcspn(const char *, const char *); size_t strcspn(const char *, const char *);
char *strerror(int); char *strerror(int);
int strerror_r(int, char *, size_t)
__attribute__ ((__bounded__(__string__,2,3)));
int strerror_r(int, char *, size_t);
size_t strlen(const char *); size_t strlen(const char *);
char *strncat(char *, const char *, size_t)
__attribute__ ((__bounded__(__string__,1,3)));
char *strncat(char *, const char *, size_t);
int strncmp(const char *, const char *, size_t); int strncmp(const char *, const char *, size_t);
char *strncpy(char *, const char *, size_t)
__attribute__ ((__bounded__(__string__,1,3)));
char *strncpy(char *, const char *, size_t);
char *strpbrk(const char *, const char *); char *strpbrk(const char *, const char *);
char *strrchr(const char *, int); char *strrchr(const char *, int);
size_t strspn(const char *, const char *); size_t strspn(const char *, const char *);
char *strstr(const char *, const char *); char *strstr(const char *, const char *);
char *strtok(char *, const char *); char *strtok(char *, const char *);
char *strtok_r(char *, const char *, char **); char *strtok_r(char *, const char *, char **);
size_t strxfrm(char *, const char *, size_t)
__attribute__ ((__bounded__(__string__,1,3)));
size_t strxfrm(char *, const char *, size_t);
/* Nonstandard routines */ /* Nonstandard routines */
#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
int bcmp(const void *, const void *, size_t); int bcmp(const void *, const void *, size_t);
void bcopy(const void *, void *, size_t)
__attribute__ ((__bounded__(__buffer__,2,3)));
void bzero(void *, size_t)
__attribute__ ((__bounded__(__buffer__,1,2)));
void bcopy(const void *, void *, size_t);
void bzero(void *, size_t);
int ffs(int); int ffs(int);
char *index(const char *, int); char *index(const char *, int);
void *memccpy(void *, const void *, int, size_t)
__attribute__ ((__bounded__(__buffer__,1,4)));
void *memccpy(void *, const void *, int, size_t);
char *rindex(const char *, int); char *rindex(const char *, int);
int strcasecmp(const char *, const char *); int strcasecmp(const char *, const char *);
char *strdup(const char *); char *strdup(const char *);
size_t strlcat(char *, const char *, size_t)
__attribute__ ((__bounded__(__string__,1,3)));
size_t strlcpy(char *, const char *, size_t)
__attribute__ ((__bounded__(__string__,1,3)));
size_t strlcat(char *, const char *, size_t);
size_t strlcpy(char *, const char *, size_t);
void strmode(int, char *); void strmode(int, char *);
int strncasecmp(const char *, const char *, size_t); int strncasecmp(const char *, const char *, size_t);
char *strsep(char **, const char *); char *strsep(char **, const char *);


+ 4
- 7
src/include/time.h View File

@ -1,4 +1,4 @@
/* $OpenBSD: time.h,v 1.14 2003/06/26 18:35:13 avsm Exp $ */
/* $OpenBSD: time.h,v 1.15 2003/06/26 19:34:17 avsm Exp $ */
/* $NetBSD: time.h,v 1.9 1994/10/26 00:56:35 cgd Exp $ */ /* $NetBSD: time.h,v 1.9 1994/10/26 00:56:35 cgd Exp $ */
/* /*
@ -93,14 +93,11 @@ double difftime(time_t, time_t);
struct tm *gmtime(const time_t *); struct tm *gmtime(const time_t *);
struct tm *localtime(const time_t *); struct tm *localtime(const time_t *);
time_t mktime(struct tm *); time_t mktime(struct tm *);
size_t strftime(char *, size_t, const char *, const struct tm *)
__attribute__ ((__bounded__(__string__,1,2)));
size_t strftime(char *, size_t, const char *, const struct tm *);
char *strptime(const char *, const char *, struct tm *); char *strptime(const char *, const char *, struct tm *);
time_t time(time_t *); time_t time(time_t *);
char *asctime_r(const struct tm *, char *)
__attribute__ ((__bounded__(__minbytes__,2,26)));
char *ctime_r(const time_t *, char *)
__attribute__ ((__bounded__(__minbytes__,2,26)));
char *asctime_r(const struct tm *, char *);
char *ctime_r(const time_t *, char *);
struct tm *gmtime_r(const time_t *, struct tm *); struct tm *gmtime_r(const time_t *, struct tm *);
struct tm *localtime_r(const time_t *, struct tm *); struct tm *localtime_r(const time_t *, struct tm *);
int nanosleep(const struct timespec *, struct timespec *); int nanosleep(const struct timespec *, struct timespec *);


+ 12
- 25
src/include/unistd.h View File

@ -1,4 +1,4 @@
/* $OpenBSD: unistd.h,v 1.48 2003/06/26 18:35:13 avsm Exp $ */
/* $OpenBSD: unistd.h,v 1.49 2003/06/26 19:34:17 avsm Exp $ */
/* $NetBSD: unistd.h,v 1.26.4.1 1996/05/28 02:31:51 mrg Exp $ */ /* $NetBSD: unistd.h,v 1.26.4.1 1996/05/28 02:31:51 mrg Exp $ */
/*- /*-
@ -58,8 +58,7 @@ unsigned int alarm(unsigned int);
int chdir(const char *); int chdir(const char *);
int chown(const char *, uid_t, gid_t); int chown(const char *, uid_t, gid_t);
int close(int); int close(int);
size_t confstr(int, char *, size_t)
__attribute__((__bounded__(__string__,2,3)));
size_t confstr(int, char *, size_t);
char *cuserid(char *); char *cuserid(char *);
int dup(int); int dup(int);
int dup2(int, int); int dup2(int, int);
@ -74,17 +73,13 @@ int execve(const char *, char * const *, char * const *);
int execvp(const char *, char * const *); int execvp(const char *, char * const *);
pid_t fork(void); pid_t fork(void);
long fpathconf(int, int); long fpathconf(int, int);
char *getcwd(char *, size_t)
__attribute__((__bounded__(__string__,1,2)))
__attribute__((__bounded__(__minbytes__,1,1024)));
char *getcwd(char *, size_t);
gid_t getegid(void); gid_t getegid(void);
uid_t geteuid(void); uid_t geteuid(void);
gid_t getgid(void); gid_t getgid(void);
int getgroups(int, gid_t *); int getgroups(int, gid_t *);
char *getlogin(void); char *getlogin(void);
int getlogin_r(char *, size_t)
__attribute__((__bounded__(__string__,1,2)))
__attribute__((__bounded__(__minbytes__,1,32)));
int getlogin_r(char *, size_t);
pid_t getpgrp(void); pid_t getpgrp(void);
pid_t getpid(void); pid_t getpid(void);
pid_t getpgid(pid_t); pid_t getpgid(pid_t);
@ -97,8 +92,7 @@ off_t lseek(int, off_t, int);
long pathconf(const char *, int); long pathconf(const char *, int);
int pause(void); int pause(void);
int pipe(int *); int pipe(int *);
ssize_t read(int, void *, size_t)
__attribute__((__bounded__(__buffer__,2,3)));
ssize_t read(int, void *, size_t);
int rmdir(const char *); int rmdir(const char *);
int setgid(gid_t); int setgid(gid_t);
int setpgid(pid_t, pid_t); int setpgid(pid_t, pid_t);
@ -109,11 +103,9 @@ long sysconf(int);
pid_t tcgetpgrp(int); pid_t tcgetpgrp(int);
int tcsetpgrp(int, pid_t); int tcsetpgrp(int, pid_t);
char *ttyname(int); char *ttyname(int);
int ttyname_r(int, char *, size_t)
__attribute__((__bounded__(__string__,2,3)));
int ttyname_r(int, char *, size_t);
int unlink(const char *); int unlink(const char *);
ssize_t write(int, const void *, size_t)
__attribute__((__bounded__(__buffer__,2,3)));
ssize_t write(int, const void *, size_t);
#ifndef _POSIX_SOURCE #ifndef _POSIX_SOURCE
@ -143,21 +135,18 @@ int fchown(int, uid_t, gid_t);
char *fflagstostr(u_int32_t); char *fflagstostr(u_int32_t);
int fsync(int); int fsync(int);
int ftruncate(int, off_t); int ftruncate(int, off_t);
int getdomainname(char *, size_t)
__attribute__ ((__bounded__(__string__,1,2)));
int getdomainname(char *, size_t);
int getdtablesize(void); int getdtablesize(void);
int getgrouplist(const char *, gid_t, gid_t *, int *); int getgrouplist(const char *, gid_t, gid_t *, int *);
long gethostid(void); long gethostid(void);
int gethostname(char *, size_t)
__attribute__ ((__bounded__(__string__,1,2)));
int gethostname(char *, size_t);
mode_t getmode(const void *, mode_t); mode_t getmode(const void *, mode_t);
int getpagesize(void); int getpagesize(void);
int getresgid(gid_t *, gid_t *, gid_t *); int getresgid(gid_t *, gid_t *, gid_t *);
int getresuid(uid_t *, uid_t *, uid_t *); int getresuid(uid_t *, uid_t *, uid_t *);
char *getpass(const char *); char *getpass(const char *);
char *getusershell(void); char *getusershell(void);
char *getwd(char *)
__attribute__ ((__bounded__(__minbytes__,1,1024)));
char *getwd(char *); /* obsoleted by getcwd() */
int initgroups(const char *, gid_t); int initgroups(const char *, gid_t);
int iruserok(u_int32_t, int, const char *, const char *); int iruserok(u_int32_t, int, const char *, const char *);
int iruserok_sa(const void *, int, int, const char *, const char *); int iruserok_sa(const void *, int, int, const char *, const char *);
@ -170,8 +159,7 @@ int nfssvc(int, void *);
int nice(int); int nice(int);
void psignal(unsigned int, const char *); void psignal(unsigned int, const char *);
extern __const char *__const sys_siglist[]; extern __const char *__const sys_siglist[];
int profil(char *, size_t, unsigned long, unsigned int)
__attribute__ ((__bounded__(__string__,1,2)));
int profil(char *, size_t, unsigned long, unsigned int);
int rcmd(char **, int, const char *, int rcmd(char **, int, const char *,
const char *, const char *, int *); const char *, const char *, int *);
int rcmd_af(char **, int, const char *, int rcmd_af(char **, int, const char *,
@ -180,8 +168,7 @@ int rcmdsh(char **, int, const char *,
const char *, const char *, char *); const char *, const char *, char *);
char *re_comp(const char *); char *re_comp(const char *);
int re_exec(const char *); int re_exec(const char *);
int readlink(const char *, char *, size_t)
__attribute__ ((__bounded__(__string__,2,3)));
int readlink(const char *, char *, size_t);
int reboot(int); int reboot(int);
int revoke(const char *); int revoke(const char *);
int rfork(int opts); int rfork(int opts);


+ 3
- 5
src/include/vis.h View File

@ -1,4 +1,4 @@
/* $OpenBSD: vis.h,v 1.7 2003/06/26 18:35:13 avsm Exp $ */
/* $OpenBSD: vis.h,v 1.8 2003/06/26 19:34:17 avsm Exp $ */
/* $NetBSD: vis.h,v 1.4 1994/10/26 00:56:41 cgd Exp $ */ /* $NetBSD: vis.h,v 1.4 1994/10/26 00:56:41 cgd Exp $ */
/*- /*-
@ -75,10 +75,8 @@
__BEGIN_DECLS __BEGIN_DECLS
char *vis(char *, int, int, int); char *vis(char *, int, int, int);
int strvis(char *, const char *, int); int strvis(char *, const char *, int);
int strnvis(char *, const char *, size_t, int)
__attribute__ ((__bounded__(__string__,1,3)));
int strvisx(char *, const char *, size_t, int)
__attribute__ ((__bounded__(__string__,1,3)));
int strnvis(char *, const char *, size_t, int);
int strvisx(char *, const char *, size_t, int);
int strunvis(char *, const char *); int strunvis(char *, const char *);
int unvis(char *, char, int *, int); int unvis(char *, char, int *, int);
__END_DECLS __END_DECLS


Loading…
Cancel
Save