Skip to content

Commit

Permalink
Update.
Browse files Browse the repository at this point in the history
	* catgets/nl_types.h: Likewise.
	* crypt/crypt.h: Likewise.
	* debug/execinfo.h: Likewise.
  • Loading branch information
Ulrich Drepper committed Sep 17, 2004
1 parent 8a1f658 commit 4110274
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 15 deletions.
3 changes: 3 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
* io/sys/statfs.h: Likewise.
* io/sys/statvfs.h: Likewise.
* posix/unistd.h: Likewise.
* catgets/nl_types.h: Likewise.
* crypt/crypt.h: Likewise.
* debug/execinfo.h: Likewise.

2004-09-16 Ulrich Drepper <drepper@redhat.com>

Expand Down
8 changes: 4 additions & 4 deletions catgets/nl_types.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (C) 1996, 1997, 1999, 2003 Free Software Foundation, Inc.
/* Copyright (C) 1996, 1997, 1999, 2003, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
Expand Down Expand Up @@ -40,15 +40,15 @@ typedef int nl_item;
This function is a possible cancellation point and therefore not
marked with __THROW. */
extern nl_catd catopen (__const char *__cat_name, int __flag);
extern nl_catd catopen (__const char *__cat_name, int __flag) __nonnull ((1));

/* Return translation with NUMBER in SET of CATALOG; if not found
return STRING. */
extern char *catgets (nl_catd __catalog, int __set, int __number,
__const char *__string) __THROW;
__const char *__string) __THROW __nonnull ((1));

/* Close message CATALOG. */
extern int catclose (nl_catd __catalog) __THROW;
extern int catclose (nl_catd __catalog) __THROW __nonnull ((1));

__END_DECLS

Expand Down
18 changes: 11 additions & 7 deletions crypt/crypt.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* UFC-crypt: ultra fast crypt(3) implementation
*
* Copyright (C) 1991, 92, 93, 96, 97, 98, 2000 Free Software Foundation, Inc.
* Copyright (C) 1991,92,93,96,97,98,2000,2004 Free Software Foundation, Inc.
*
* The GNU C Library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Expand Down Expand Up @@ -30,14 +30,15 @@
__BEGIN_DECLS

/* Encrypt at most 8 characters from KEY using salt to perturb DES. */
extern char *crypt (__const char *__key, __const char *__salt) __THROW;
extern char *crypt (__const char *__key, __const char *__salt)
__THROW __nonnull ((1, 2));

/* Setup DES tables according KEY. */
extern void setkey (__const char *__key) __THROW;
extern void setkey (__const char *__key) __THROW __nonnull ((1));

/* Encrypt data in BLOCK in place if EDFLAG is zero; otherwise decrypt
block in place. */
extern void encrypt (char *__block, int __edflag) __THROW;
extern void encrypt (char *__block, int __edflag) __THROW __nonnull ((1));

#ifdef __USE_GNU
/* Reentrant versions of the functions above. The additional argument
Expand All @@ -57,13 +58,16 @@ struct crypt_data
};

extern char *crypt_r (__const char *__key, __const char *__salt,
struct crypt_data * __restrict __data) __THROW;
struct crypt_data * __restrict __data)
__THROW __nonnull ((1, 2, 3));

extern void setkey_r (__const char *__key,
struct crypt_data * __restrict __data) __THROW;
struct crypt_data * __restrict __data)
__THROW __nonnull ((1, 2));

extern void encrypt_r (char *__block, int __edflag,
struct crypt_data * __restrict __data) __THROW;
struct crypt_data * __restrict __data)
__THROW __nonnull ((1, 3));
#endif

__END_DECLS
Expand Down
9 changes: 5 additions & 4 deletions debug/execinfo.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (C) 1998, 1999 Free Software Foundation, Inc.
/* Copyright (C) 1998, 1999, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
Expand All @@ -25,19 +25,20 @@ __BEGIN_DECLS

/* Store up to SIZE return address of the current program state in
ARRAY and return the exact number of values stored. */
extern int backtrace (void **__array, int __size) __THROW;
extern int backtrace (void **__array, int __size) __THROW __nonnull ((1));


/* Return names of functions from the backtrace list in ARRAY in a newly
malloc()ed memory block. */
extern char **backtrace_symbols (void *__const *__array, int __size) __THROW;
extern char **backtrace_symbols (void *__const *__array, int __size)
__THROW __nonnull ((1));


/* This function is similar to backtrace_symbols() but it writes the result
immediately to a file and can therefore also be used in situations where
malloc() is not usable anymore. */
extern void backtrace_symbols_fd (void *__const *__array, int __size,
int __fd) __THROW;
int __fd) __THROW __nonnull ((1));

__END_DECLS

Expand Down

0 comments on commit 4110274

Please sign in to comment.