summaryrefslogtreecommitdiff
path: root/crypt
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2012-01-07 23:57:22 -0500
committerUlrich Drepper <drepper@gmail.com>2012-01-07 23:57:22 -0500
commita784e502472fb3a1afa4d01a47c66b52d23e00f6 (patch)
tree5ebaa084119dcffe41671a62e2e799b172c57d24 /crypt
parent33808bf1164be2e7c8535bdd5ac398c75c33ed49 (diff)
Remove pre-ISO C support
No more __const.
Diffstat (limited to 'crypt')
-rw-r--r--crypt/crypt-private.h16
-rw-r--r--crypt/crypt.h11
-rw-r--r--crypt/crypt_util.c10
3 files changed, 19 insertions, 18 deletions
diff --git a/crypt/crypt-private.h b/crypt/crypt-private.h
index 3dd26bc59f..d79dade4f7 100644
--- a/crypt/crypt-private.h
+++ b/crypt/crypt-private.h
@@ -1,7 +1,7 @@
/*
* UFC-crypt: ultra fast crypt(3) implementation
*
- * Copyright (C) 1991, 92, 93, 96, 97, 98 Free Software Foundation, Inc.
+ * Copyright (C) 1991-1993, 1996-1998, 2012 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
@@ -37,24 +37,24 @@ extern void _ufc_doit_r (ufc_long itr, struct crypt_data * __restrict __data,
extern void __init_des_r (struct crypt_data * __restrict __data);
extern void __init_des (void);
-extern void _ufc_setup_salt_r (__const char *s,
+extern void _ufc_setup_salt_r (const char *s,
struct crypt_data * __restrict __data);
-extern void _ufc_mk_keytab_r (__const char *key,
+extern void _ufc_mk_keytab_r (const char *key,
struct crypt_data * __restrict __data);
-extern void _ufc_dofinalperm_r (ufc_long *res,
+extern void _ufc_dofinalperm_r (ufc_long *res,
struct crypt_data * __restrict __data);
extern void _ufc_output_conversion_r (ufc_long v1, ufc_long v2,
- __const char *salt,
+ const char *salt,
struct crypt_data * __restrict __data);
-extern void __setkey_r (__const char *__key,
+extern void __setkey_r (const char *__key,
struct crypt_data * __restrict __data);
extern void __encrypt_r (char * __restrict __block, int __edflag,
struct crypt_data * __restrict __data);
/* crypt-entry.c */
-extern char *__crypt_r (__const char *__key, __const char *__salt,
+extern char *__crypt_r (const char *__key, const char *__salt,
struct crypt_data * __restrict __data);
-extern char *fcrypt (__const char *key, __const char *salt);
+extern char *fcrypt (const char *key, const char *salt);
#endif /* crypt-private.h */
diff --git a/crypt/crypt.h b/crypt/crypt.h
index dcb89d813c..57fb5c62d9 100644
--- a/crypt/crypt.h
+++ b/crypt/crypt.h
@@ -1,7 +1,8 @@
/*
* UFC-crypt: ultra fast crypt(3) implementation
*
- * Copyright (C) 1991,92,93,96,97,98,2000,2004 Free Software Foundation, Inc.
+ * Copyright (C) 1991-1993,1996-1998,2000,2004,2012
+ * 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
@@ -30,11 +31,11 @@
__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 __nonnull ((1, 2));
/* Setup DES tables according KEY. */
-extern void setkey (__const char *__key) __THROW __nonnull ((1));
+extern void setkey (const char *__key) __THROW __nonnull ((1));
/* Encrypt data in BLOCK in place if EDFLAG is zero; otherwise decrypt
block in place. */
@@ -57,11 +58,11 @@ struct crypt_data
int direction, initialized;
};
-extern char *crypt_r (__const char *__key, __const char *__salt,
+extern char *crypt_r (const char *__key, const char *__salt,
struct crypt_data * __restrict __data)
__THROW __nonnull ((1, 2, 3));
-extern void setkey_r (__const char *__key,
+extern void setkey_r (const char *__key,
struct crypt_data * __restrict __data)
__THROW __nonnull ((1, 2));
diff --git a/crypt/crypt_util.c b/crypt/crypt_util.c
index 04b262d9c8..62c87908ff 100644
--- a/crypt/crypt_util.c
+++ b/crypt/crypt_util.c
@@ -1,7 +1,7 @@
/*
* UFC-crypt: ultra fast crypt(3) implementation
*
- * Copyright (C) 1991-1993,1996-1998,2000,2010,2011
+ * Copyright (C) 1991-1993,1996-1998,2000,2010,2011,2012
* Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
@@ -605,7 +605,7 @@ shuffle_sb(k, saltbits)
void
_ufc_setup_salt_r(s, __data)
- __const char *s;
+ const char *s;
struct crypt_data * __restrict __data;
{
ufc_long i, j, saltbits;
@@ -758,7 +758,7 @@ _ufc_dofinalperm_r(res, __data)
void
_ufc_output_conversion_r(v1, v2, salt, __data)
ufc_long v1, v2;
- __const char *salt;
+ const char *salt;
struct crypt_data * __restrict __data;
{
int i, s, shf;
@@ -902,7 +902,7 @@ encrypt(__block, __edflag)
void
__setkey_r(__key, __data)
- __const char *__key;
+ const char *__key;
struct crypt_data * __restrict __data;
{
int i,j;
@@ -922,7 +922,7 @@ weak_alias (__setkey_r, setkey_r)
void
setkey(__key)
- __const char *__key;
+ const char *__key;
{
__setkey_r(__key, &_ufc_foobar);
}