From e484c931aeba50594f7f4642db2dae4b6814ac55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= Date: Wed, 24 Oct 2007 15:04:23 +0000 Subject: [PATCH] Constify. git-svn-id: svn+ssh://svn.openpam.org/svn/openpam/trunk@400 185d5e19-27fe-0310-9dcf-9bff6b9f3609 --- CREDITS | 1 + include/security/openpam.h | 12 ++++++------ include/security/pam_appl.h | 8 ++++---- lib/openpam_borrow_cred.c | 2 +- lib/openpam_restore_cred.c | 4 ++-- lib/pam_error.c | 2 +- lib/pam_get_data.c | 4 ++-- lib/pam_get_item.c | 2 +- lib/pam_info.c | 2 +- lib/pam_prompt.c | 2 +- lib/pam_strerror.c | 2 +- lib/pam_verror.c | 2 +- lib/pam_vinfo.c | 2 +- lib/pam_vprompt.c | 2 +- 14 files changed, 24 insertions(+), 23 deletions(-) diff --git a/CREDITS b/CREDITS index 3b4517d..18207a3 100644 --- a/CREDITS +++ b/CREDITS @@ -25,6 +25,7 @@ or indirectly, with patches, criticism, suggestions, or ideas: Hubert Feyrer Mark Murray Mike Petullo + Mikhail Teterin Mikko Työläjärvi Robert Watson Ruslan Ermilov diff --git a/include/security/openpam.h b/include/security/openpam.h index 1a342be..25cf613 100644 --- a/include/security/openpam.h +++ b/include/security/openpam.h @@ -80,7 +80,7 @@ openpam_set_option(pam_handle_t *_pamh, const char *_value); int -pam_error(pam_handle_t *_pamh, +pam_error(const pam_handle_t *_pamh, const char *_fmt, ...) OPENPAM_FORMAT ((__printf__, 2, 3)) @@ -94,14 +94,14 @@ pam_get_authtok(pam_handle_t *_pamh, OPENPAM_NONNULL((1,3)); int -pam_info(pam_handle_t *_pamh, +pam_info(const pam_handle_t *_pamh, const char *_fmt, ...) OPENPAM_FORMAT ((__printf__, 2, 3)) OPENPAM_NONNULL((1,2)); int -pam_prompt(pam_handle_t *_pamh, +pam_prompt(const pam_handle_t *_pamh, int _style, char **_resp, const char *_fmt, @@ -117,21 +117,21 @@ pam_setenv(pam_handle_t *_pamh, OPENPAM_NONNULL((1,2,3)); int -pam_vinfo(pam_handle_t *_pamh, +pam_vinfo(const pam_handle_t *_pamh, const char *_fmt, va_list _ap) OPENPAM_FORMAT ((__printf__, 2, 0)) OPENPAM_NONNULL((1,2)); int -pam_verror(pam_handle_t *_pamh, +pam_verror(const pam_handle_t *_pamh, const char *_fmt, va_list _ap) OPENPAM_FORMAT ((__printf__, 2, 0)) OPENPAM_NONNULL((1,2)); int -pam_vprompt(pam_handle_t *_pamh, +pam_vprompt(const pam_handle_t *_pamh, int _style, char **_resp, const char *_fmt, diff --git a/include/security/pam_appl.h b/include/security/pam_appl.h index e2648cc..de7208a 100644 --- a/include/security/pam_appl.h +++ b/include/security/pam_appl.h @@ -75,13 +75,13 @@ pam_end(pam_handle_t *_pamh, OPENPAM_NONNULL((1)); int -pam_get_data(pam_handle_t *_pamh, +pam_get_data(const pam_handle_t *_pamh, const char *_module_data_name, - void **_data) + const void **_data) OPENPAM_NONNULL((1,2,3)); int -pam_get_item(pam_handle_t *_pamh, +pam_get_item(const pam_handle_t *_pamh, int _item_type, const void **_item) OPENPAM_NONNULL((1,3)); @@ -139,7 +139,7 @@ pam_start(const char *_service, OPENPAM_NONNULL((4)); const char * -pam_strerror(pam_handle_t *_pamh, +pam_strerror(const pam_handle_t *_pamh, int _error_number); /* diff --git a/lib/openpam_borrow_cred.c b/lib/openpam_borrow_cred.c index 5cca869..0c1590b 100644 --- a/lib/openpam_borrow_cred.c +++ b/lib/openpam_borrow_cred.c @@ -57,7 +57,7 @@ openpam_borrow_cred(pam_handle_t *pamh, const struct passwd *pwd) { struct pam_saved_cred *scred; - void *scredp; + const void *scredp; int r; ENTERI(pwd->pw_uid); diff --git a/lib/openpam_restore_cred.c b/lib/openpam_restore_cred.c index ae745b4..2e97a7c 100644 --- a/lib/openpam_restore_cred.c +++ b/lib/openpam_restore_cred.c @@ -55,8 +55,8 @@ int openpam_restore_cred(pam_handle_t *pamh) { - struct pam_saved_cred *scred; - void *scredp; + const struct pam_saved_cred *scred; + const void *scredp; int r; ENTER(); diff --git a/lib/pam_error.c b/lib/pam_error.c index ea1df88..d20cbde 100644 --- a/lib/pam_error.c +++ b/lib/pam_error.c @@ -50,7 +50,7 @@ */ int -pam_error(pam_handle_t *pamh, +pam_error(const pam_handle_t *pamh, const char *fmt, ...) { diff --git a/lib/pam_get_data.c b/lib/pam_get_data.c index 36d3ce2..7f418e8 100644 --- a/lib/pam_get_data.c +++ b/lib/pam_get_data.c @@ -48,9 +48,9 @@ */ int -pam_get_data(pam_handle_t *pamh, +pam_get_data(const pam_handle_t *pamh, const char *module_data_name, - void **data) + const void **data) { pam_data_t *dp; diff --git a/lib/pam_get_item.c b/lib/pam_get_item.c index 261f508..df1a977 100644 --- a/lib/pam_get_item.c +++ b/lib/pam_get_item.c @@ -64,7 +64,7 @@ const char *_pam_item_name[PAM_NUM_ITEMS] = { */ int -pam_get_item(pam_handle_t *pamh, +pam_get_item(const pam_handle_t *pamh, int item_type, const void **item) { diff --git a/lib/pam_info.c b/lib/pam_info.c index e01ec67..e8007b0 100644 --- a/lib/pam_info.c +++ b/lib/pam_info.c @@ -50,7 +50,7 @@ */ int -pam_info(pam_handle_t *pamh, +pam_info(const pam_handle_t *pamh, const char *fmt, ...) { diff --git a/lib/pam_prompt.c b/lib/pam_prompt.c index 22067fc..2174af4 100644 --- a/lib/pam_prompt.c +++ b/lib/pam_prompt.c @@ -48,7 +48,7 @@ */ int -pam_prompt(pam_handle_t *pamh, +pam_prompt(const pam_handle_t *pamh, int style, char **resp, const char *fmt, diff --git a/lib/pam_strerror.c b/lib/pam_strerror.c index 6f9d53d..37b4ba0 100644 --- a/lib/pam_strerror.c +++ b/lib/pam_strerror.c @@ -81,7 +81,7 @@ const char *_pam_err_name[PAM_NUM_ERRORS] = { */ const char * -pam_strerror(pam_handle_t *pamh, +pam_strerror(const pam_handle_t *pamh, int error_number) { static char unknown[16]; diff --git a/lib/pam_verror.c b/lib/pam_verror.c index 3dce272..d6da707 100644 --- a/lib/pam_verror.c +++ b/lib/pam_verror.c @@ -49,7 +49,7 @@ */ int -pam_verror(pam_handle_t *pamh, +pam_verror(const pam_handle_t *pamh, const char *fmt, va_list ap) { diff --git a/lib/pam_vinfo.c b/lib/pam_vinfo.c index 5f2dd38..d4ac021 100644 --- a/lib/pam_vinfo.c +++ b/lib/pam_vinfo.c @@ -49,7 +49,7 @@ */ int -pam_vinfo(pam_handle_t *pamh, +pam_vinfo(const pam_handle_t *pamh, const char *fmt, va_list ap) { diff --git a/lib/pam_vprompt.c b/lib/pam_vprompt.c index 561f888..6e85c42 100644 --- a/lib/pam_vprompt.c +++ b/lib/pam_vprompt.c @@ -49,7 +49,7 @@ */ int -pam_vprompt(pam_handle_t *pamh, +pam_vprompt(const pam_handle_t *pamh, int style, char **resp, const char *fmt,