This is the mail archive of the libc-hacker@sources.redhat.com mailing list for the glibc project.

Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

[PATCH] Missing __THROW in crypt.h


Hi!

This patch makes it possible to include both crypt.h and unistd.h (or
stdlib.h) together in a C++ program with _GNU_SOURCE.

2000-09-22  Jakub Jelinek  <jakub@redhat.com>

	* crypt/crypt.h (crypt, setkey, encrypt): Add __THROW.
	(crypt_r, setkey_r, encrypt_r): Likewise.

--- libc/crypt/crypt.h.jj	Sat Mar  4 01:47:30 2000
+++ libc/crypt/crypt.h	Fri Sep 22 14:04:23 2000
@@ -30,14 +30,14 @@
 __BEGIN_DECLS
 
 /* Encrypt at most 8 characters from KEY using salt to perturb DES.  */
-extern char *crypt (__const char *__key, __const char *__salt);
+extern char *crypt (__const char *__key, __const char *__salt) __THROW;
 
 /* Setup DES tables according KEY.  */
-extern void setkey (__const char *__key);
+extern void setkey (__const char *__key) __THROW;
 
 /* Encrypt data in BLOCK in place if EDFLAG is zero; otherwise decrypt
    block in place.  */
-extern void encrypt (char *__block, int __edflag);
+extern void encrypt (char *__block, int __edflag) __THROW;
 
 #ifdef __USE_GNU
 /* Reentrant versions of the functions above.  The additional argument
@@ -57,13 +57,13 @@ struct crypt_data
   };
 
 extern char *crypt_r (__const char *__key, __const char *__salt,
-		      struct crypt_data * __restrict __data);
+		      struct crypt_data * __restrict __data) __THROW;
 
 extern void setkey_r (__const char *__key,
-		      struct crypt_data * __restrict __data);
+		      struct crypt_data * __restrict __data) __THROW;
 
 extern void encrypt_r (char *__block, int __edflag,
-		       struct crypt_data * __restrict __data);
+		       struct crypt_data * __restrict __data) __THROW;
 #endif
 
 __END_DECLS

	Jakub

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]