Clean up namespace pollution by prepending underscores to argument names in

function prototypes (or, in a few cases, removing argument names altogether).

Sponsored by:	DARPA, NAI Labs

6 files changed, 96 insertions, 87 deletions

diff --git a/contrib/libpam/libpam/include/security/_pam_types.h b/contrib/libpam/libpam/include/security/_pam_types.h
index f0f3093..d0e4d6a 100644
--- a/contrib/libpam/libpam/include/security/_pam_types.h
+++ b/contrib/libpam/libpam/include/security/_pam_types.h
@@ -9,6 +9,8 @@
  * Note, the copyright+license information is at end of file.
  *
  * Created: 1996/3/5 by AGM
+ *
+ * $FreeBSD$
  */
 
 #ifndef _SECURITY__PAM_TYPES_H
@@ -150,14 +152,14 @@ typedef struct pam_handle pam_handle_t;
 
 /* ---------- Common Linux-PAM application/module PI ----------- */
 
-extern int pam_set_item(pam_handle_t *pamh, int item_type, const void *item);
-extern int pam_get_item(const pam_handle_t *pamh, int item_type,
-			const void **item);
-extern const char *pam_strerror(pam_handle_t *pamh, int errnum);
+extern int pam_set_item(pam_handle_t *_pamh, int _item_type, const void *_item);
+extern int pam_get_item(const pam_handle_t *_pamh, int _item_type,
+			const void **_item);
+extern const char *pam_strerror(pam_handle_t *_pamh, int _errnum);
 
-extern int pam_putenv(pam_handle_t *pamh, const char *name_value);
-extern const char *pam_getenv(pam_handle_t *pamh, const char *name);
-extern char **pam_getenvlist(pam_handle_t *pamh);
+extern int pam_putenv(pam_handle_t *_pamh, const char *_name_value);
+extern const char *pam_getenv(pam_handle_t *_pamh, const char *_name);
+extern char **pam_getenvlist(pam_handle_t *_pamh);
 
 /* ---------- Common Linux-PAM application/module PI ----------- */
 
@@ -187,7 +189,7 @@ extern char **pam_getenvlist(pam_handle_t *pamh);
  */
 
 #define HAVE_PAM_FAIL_DELAY
-extern int pam_fail_delay(pam_handle_t *pamh, unsigned int musec_delay);
+extern int pam_fail_delay(pam_handle_t *_pamh, unsigned int _musec_delay);
 
 #include <syslog.h>
 #ifndef LOG_AUTHPRIV
diff --git a/contrib/libpam/libpam/include/security/pam_appl.h b/contrib/libpam/libpam/include/security/pam_appl.h
index 69ee544..d2aef6c 100644
--- a/contrib/libpam/libpam/include/security/pam_appl.h
+++ b/contrib/libpam/libpam/include/security/pam_appl.h
@@ -11,6 +11,7 @@
  * Last modified: 1996/3/5 by AGM
  *
  * $Id: pam_appl.h,v 1.3 2000/11/19 23:54:02 agmorgan Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SECURITY_PAM_APPL_H
@@ -24,28 +25,28 @@ extern "C" {
 
 /* -------------- The Linux-PAM Framework layer API ------------- */
 
-extern int pam_start(const char *service_name, const char *user,
-		     const struct pam_conv *pam_conversation,
-		     pam_handle_t **pamh);
-extern int pam_end(pam_handle_t *pamh, int pam_status);
+extern int pam_start(const char *_service_name, const char *_user,
+		     const struct pam_conv *_pam_conversation,
+		     pam_handle_t **_pamh);
+extern int pam_end(pam_handle_t *_pamh, int _pam_status);
 
 /* Authentication API's */
 
-extern int pam_authenticate(pam_handle_t *pamh, int flags);
-extern int pam_setcred(pam_handle_t *pamh, int flags);
+extern int pam_authenticate(pam_handle_t *_pamh, int _flags);
+extern int pam_setcred(pam_handle_t *_pamh, int _flags);
 
 /* Account Management API's */
 
-extern int pam_acct_mgmt(pam_handle_t *pamh, int flags);
+extern int pam_acct_mgmt(pam_handle_t *_pamh, int _flags);
 
 /* Session Management API's */
 
-extern int pam_open_session(pam_handle_t *pamh, int flags);
-extern int pam_close_session(pam_handle_t *pamh, int flags);
+extern int pam_open_session(pam_handle_t *_pamh, int _flags);
+extern int pam_close_session(pam_handle_t *_pamh, int _flags);
 
 /* Password Management API's */
 
-extern int pam_chauthtok(pam_handle_t *pamh, int flags);
+extern int pam_chauthtok(pam_handle_t *_pamh, int _flags);
 
 #ifdef __cplusplus
 }
diff --git a/contrib/libpam/libpam/include/security/pam_malloc.h b/contrib/libpam/libpam/include/security/pam_malloc.h
index 214bf77..1dd380c 100644
--- a/contrib/libpam/libpam/include/security/pam_malloc.h
+++ b/contrib/libpam/libpam/include/security/pam_malloc.h
@@ -1,5 +1,6 @@
 /*
  * $Id: pam_malloc.h,v 1.2 2000/12/04 19:02:34 baggins Exp $
+ * $FreeBSD$
  */
 
 /*
@@ -28,15 +29,15 @@
 
 #include <sys/types.h>
 
-extern void *pam_malloc(size_t s,const char *,const char *,const int);
-extern void *pam_calloc(size_t n,size_t s,const char *,const char *,const int);
-extern void  pam_free(void *x,const char *,const char *,const int);
-extern void *pam_memalign(size_t a,size_t s
+extern void *pam_malloc(size_t ,const char *,const char *,const int);
+extern void *pam_calloc(size_t ,size_t ,const char *,const char *,const int);
+extern void  pam_free(void *,const char *,const char *,const int);
+extern void *pam_memalign(size_t ,size_t
 			 ,const char *,const char *,const int);
-extern void *pam_realloc(void *x,size_t s,const char *,const char *,const int);
-extern void *pam_valloc(size_t s,const char *,const char *,const int);
-extern void *pam_alloca(size_t s,const char *,const char *,const int);
-extern void  pam_exit(int i,const char *,const char *,const int);
+extern void *pam_realloc(void *,size_t ,const char *,const char *,const int);
+extern void *pam_valloc(size_t ,const char *,const char *,const int);
+extern void *pam_alloca(size_t ,const char *,const char *,const int);
+extern void  pam_exit(int ,const char *,const char *,const int);
 
 /* these are the flags used to turn on and off diagnostics */
 
diff --git a/contrib/libpam/libpam/include/security/pam_modules.h b/contrib/libpam/libpam/include/security/pam_modules.h
index 51a701e..6852cf5 100644
--- a/contrib/libpam/libpam/include/security/pam_modules.h
+++ b/contrib/libpam/libpam/include/security/pam_modules.h
@@ -34,15 +34,15 @@
 
 /* -------------- The Linux-PAM Module PI ------------- */
 
-extern int pam_set_data(pam_handle_t *pamh, const char *module_data_name,
-			void *data,
-			void (*cleanup)(pam_handle_t *pamh, void *data,
-				       int error_status));
-extern int pam_get_data(const pam_handle_t *pamh,
-			const char *module_data_name, const void **data);
+extern int pam_set_data(pam_handle_t *_pamh, const char *_module_data_name,
+			void *_data,
+			void (*cleanup)(pam_handle_t *_pamh, void *_data,
+				       int _error_status));
+extern int pam_get_data(const pam_handle_t *_pamh,
+			const char *_module_data_name, const void **_data);
 
-extern int pam_get_user(pam_handle_t *pamh, const char **user
-			, const char *prompt);
+extern int pam_get_user(pam_handle_t *_pamh, const char **_user
+			, const char *_prompt);
 
 #ifdef PAM_STATIC
 
@@ -53,18 +53,18 @@ struct pam_module {
 
     /* These are function pointers to the module's key functions.  */
 
-    int (*pam_sm_authenticate)(pam_handle_t *pamh, int flags,
-			       int argc, const char **argv);
-    int (*pam_sm_setcred)(pam_handle_t *pamh, int flags,
-			  int argc, const char **argv);
-    int (*pam_sm_acct_mgmt)(pam_handle_t *pamh, int flags,
-			    int argc, const char **argv);
-    int (*pam_sm_open_session)(pam_handle_t *pamh, int flags,
-			       int argc, const char **argv);
-    int (*pam_sm_close_session)(pam_handle_t *pamh, int flags,
-				int argc, const char **argv);
-    int (*pam_sm_chauthtok)(pam_handle_t *pamh, int flags,
-			    int argc, const char **argv);
+    int (*pam_sm_authenticate)(pam_handle_t *_pamh, int _flags,
+			       int _argc, const char **_argv);
+    int (*pam_sm_setcred)(pam_handle_t *_pamh, int _flags,
+			  int _argc, const char **_argv);
+    int (*pam_sm_acct_mgmt)(pam_handle_t *_pamh, int _flags,
+			    int _argc, const char **_argv);
+    int (*pam_sm_open_session)(pam_handle_t *_pamh, int _flags,
+			       int _argc, const char **_argv);
+    int (*pam_sm_close_session)(pam_handle_t *_pamh, int _flags,
+				int _argc, const char **_argv);
+    int (*pam_sm_chauthtok)(pam_handle_t *_pamh, int _flags,
+			    int _argc, const char **_argv);
 };
 
 #ifdef PAM_SM_AUTH
@@ -122,10 +122,10 @@ struct pam_module {
 #if (defined(PAM_STATIC) && defined(PAM_SM_AUTH)) || !defined(PAM_STATIC)
 
 /* Authentication API's */
-PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags,
-                                   int argc, const char **argv);
-PAM_EXTERN int pam_sm_setcred(pam_handle_t *pamh, int flags,
-			      int argc, const char **argv);
+PAM_EXTERN int pam_sm_authenticate(pam_handle_t *_pamh, int _flags,
+                                   int _argc, const char **_argv);
+PAM_EXTERN int pam_sm_setcred(pam_handle_t *_pamh, int _flags,
+			      int _argc, const char **_argv);
 
 #endif /*(defined(PAM_STATIC) && defined(PAM_SM_AUTH))
 	 || !defined(PAM_STATIC)*/
@@ -133,8 +133,8 @@ PAM_EXTERN int pam_sm_setcred(pam_handle_t *pamh, int flags,
 #if (defined(PAM_STATIC) && defined(PAM_SM_ACCOUNT)) || !defined(PAM_STATIC)
 
 /* Account Management API's */
-PAM_EXTERN int pam_sm_acct_mgmt(pam_handle_t *pamh, int flags,
-				int argc, const char **argv);
+PAM_EXTERN int pam_sm_acct_mgmt(pam_handle_t *_pamh, int _flags,
+				int _argc, const char **_argv);
 
 #endif /*(defined(PAM_STATIC) && defined(PAM_SM_ACCOUNT))
 	 || !defined(PAM_STATIC)*/
@@ -142,11 +142,11 @@ PAM_EXTERN int pam_sm_acct_mgmt(pam_handle_t *pamh, int flags,
 #if (defined(PAM_STATIC) && defined(PAM_SM_SESSION)) || !defined(PAM_STATIC)
 
 /* Session Management API's */
-PAM_EXTERN int pam_sm_open_session(pam_handle_t *pamh, int flags,
-				   int argc, const char **argv);
+PAM_EXTERN int pam_sm_open_session(pam_handle_t *_pamh, int _flags,
+				   int _argc, const char **_argv);
 
-PAM_EXTERN int pam_sm_close_session(pam_handle_t *pamh, int flags,
-				    int argc, const char **argv);
+PAM_EXTERN int pam_sm_close_session(pam_handle_t *_pamh, int _flags,
+				    int _argc, const char **_argv);
 
 #endif /*(defined(PAM_STATIC) && defined(PAM_SM_SESSION))
 	 || !defined(PAM_STATIC)*/
@@ -154,8 +154,8 @@ PAM_EXTERN int pam_sm_close_session(pam_handle_t *pamh, int flags,
 #if (defined(PAM_STATIC) && defined(PAM_SM_PASSWORD)) || !defined(PAM_STATIC)
 
 /* Password Management API's */
-PAM_EXTERN int pam_sm_chauthtok(pam_handle_t *pamh, int flags,
-				int argc, const char **argv);
+PAM_EXTERN int pam_sm_chauthtok(pam_handle_t *_pamh, int _flags,
+				int _argc, const char **_argv);
 
 #endif /*(defined(PAM_STATIC) && defined(PAM_SM_PASSWORD))
 	 || !defined(PAM_STATIC)*/
diff --git a/contrib/libpam/libpam/pam_private.h b/contrib/libpam/libpam/pam_private.h
index cd7843f..98e3ff2 100644
--- a/contrib/libpam/libpam/pam_private.h
+++ b/contrib/libpam/libpam/pam_private.h
@@ -11,6 +11,8 @@
  *
  * Creator: Marc Ewing.
  * Maintained: CVS
+ *
+ * $FreeBSD$
  */
 
 #ifndef _PAM_PRIVATE_H
@@ -45,7 +47,7 @@
 
 struct handler {
     int must_fail;
-    int (*func)(pam_handle_t *pamh, int flags, int argc, char **argv);
+    int (*func)(pam_handle_t *_pamh, int _flags, int _argc, char **_argv);
     int actions[_PAM_RETURN_VALUES];
     /* set by authenticate, open_session, chauthtok(1st)
        consumed by setcred, close_session, chauthtok(2nd) */
@@ -175,24 +177,24 @@ extern const char * const _pam_token_returns[_PAM_RETURN_VALUES+1];
  * internally defined functions --- these should not be directly
  * called by applications or modules
  */
-int _pam_dispatch(pam_handle_t *pamh, int flags, int choice);
+int _pam_dispatch(pam_handle_t *_pamh, int _flags, int _choice);
 
 /* Free various allocated structures and dlclose() the libs */
-int _pam_free_handlers(pam_handle_t *pamh);
+int _pam_free_handlers(pam_handle_t *_pamh);
 
 /* Parse config file, allocate handler structures, dlopen() */
-int _pam_init_handlers(pam_handle_t *pamh);
+int _pam_init_handlers(pam_handle_t *_pamh);
 
 /* Set all hander stuff to 0/NULL - called once from pam_start() */
-void _pam_start_handlers(pam_handle_t *pamh);
+void _pam_start_handlers(pam_handle_t *_pamh);
 
 /* environment helper functions */
 
 /* create the environment structure */
-int _pam_make_env(pam_handle_t *pamh);
+int _pam_make_env(pam_handle_t *_pamh);
 
 /* delete the environment structure */
-void _pam_drop_env(pam_handle_t *pamh);
+void _pam_drop_env(pam_handle_t *_pamh);
 
 /* these functions deal with failure delays as required by the
    authentication modules and application. Their *interface* is likely
@@ -200,13 +202,13 @@ void _pam_drop_env(pam_handle_t *pamh);
    improve */
 
 /* reset the timer to no-delay */
-void _pam_reset_timer(pam_handle_t *pamh);
+void _pam_reset_timer(pam_handle_t *_pamh);
 
 /* this sets the clock ticking */
-void _pam_start_timer(pam_handle_t *pamh);
+void _pam_start_timer(pam_handle_t *_pamh);
 
 /* this waits for the clock to stop ticking if status != PAM_SUCCESS */
-void _pam_await_timer(pam_handle_t *pamh, int status);
+void _pam_await_timer(pam_handle_t *_pamh, int _status);
 
 typedef void (*voidfunc(void))(void);
 #ifdef PAM_STATIC
@@ -214,11 +216,11 @@ typedef void (*voidfunc(void))(void);
 /* The next two in ../modules/_pam_static/pam_static.c */
 
 /* Return pointer to data structure used to define a static module */
-struct pam_module * _pam_open_static_handler(const char *path);
+struct pam_module * _pam_open_static_handler(const char *_path);
 
 /* Return pointer to function requested from static module */
 
-voidfunc *_pam_get_static_sym(struct pam_module *mod, const char *symname);
+voidfunc *_pam_get_static_sym(struct pam_module *_mod, const char *_symname);
 
 #endif
 
@@ -229,26 +231,26 @@ voidfunc *_pam_get_static_sym(struct pam_module *mod, const char *symname);
 struct pam_data {
      char *name;
      void *data;
-     void (*cleanup)(pam_handle_t *pamh, void *data, int error_status);
+     void (*cleanup)(pam_handle_t *_pamh, void *_data, int _error_status);
      struct pam_data *next;
 };
 
-void _pam_free_data(pam_handle_t *pamh, int status);
+void _pam_free_data(pam_handle_t *_pamh, int _status);
 
-int _pam_strCMP(const char *s, const char *t);
-char *_pam_StrTok(char *from, const char *format, char **next);
+int _pam_strCMP(const char *_s, const char *_t);
+char *_pam_StrTok(char *_from, const char *_format, char **_next);
 
-char *_pam_strdup(const char *s);
+char *_pam_strdup(const char *_s);
 
-int _pam_mkargv(char *s, char ***argv, int *argc);
+int _pam_mkargv(char *_s, char ***_argv, int *_argc);
 
-void _pam_sanitize(pam_handle_t *pamh);
+void _pam_sanitize(pam_handle_t *_pamh);
 
-void _pam_set_default_control(int *control_array, int default_action);
+void _pam_set_default_control(int *_control_array, int _default_action);
 
-void _pam_parse_control(int *control_array, char *tok);
+void _pam_parse_control(int *_control_array, char *_tok);
 
-void _pam_system_log(int priority, const char *format,  ... );
+void _pam_system_log(int _priority, const char *_format,  ... );
 #define _PAM_SYSTEM_LOG_PREFIX "PAM "
 
 /*
diff --git a/contrib/libpam/libpam_misc/include/security/pam_misc.h b/contrib/libpam/libpam_misc/include/security/pam_misc.h
index 1e8c478..1a48365 100644
--- a/contrib/libpam/libpam_misc/include/security/pam_misc.h
+++ b/contrib/libpam/libpam_misc/include/security/pam_misc.h
@@ -1,4 +1,7 @@
-/* $Id: pam_misc.h,v 1.3 2001/01/20 22:29:47 agmorgan Exp $ */
+/*
+ * $Id: pam_misc.h,v 1.3 2001/01/20 22:29:47 agmorgan Exp $
+ * $FreeBSD$
+ */
 
 #ifndef __PAMMISC_H
 #define __PAMMISC_H
@@ -12,8 +15,8 @@
 
 /* functions defined in pam_misc.* libraries */
 
-extern int misc_conv(int num_msg, const struct pam_message **msgm,
-		     struct pam_response **response, void *appdata_ptr);
+extern int misc_conv(int _num_msg, const struct pam_message **_msgm,
+		     struct pam_response **_response, void *_appdata_ptr);
 
 #include <time.h>
 
@@ -22,15 +25,15 @@ extern time_t pam_misc_conv_die_time;         /* cut-off time for input */
 extern const char *pam_misc_conv_warn_line;           /* warning notice */
 extern const char *pam_misc_conv_die_line;            /* cut-off remark */
 extern int pam_misc_conv_died;      /* 1 = cut-off time reached (0 not) */
-extern int (*pam_binary_handler_fn)(void *appdata, pamc_bp_t *prompt_p);
-extern void (*pam_binary_handler_free)(void *appdata, pamc_bp_t *prompt_p);
+extern int (*pam_binary_handler_fn)(void *_appdata, pamc_bp_t *_prompt_p);
+extern void (*pam_binary_handler_free)(void *_appdata, pamc_bp_t *_prompt_p);
 /*
  * Environment helper functions
  */
 
 /* transcribe given environment (to pam) */
-extern int pam_misc_paste_env(pam_handle_t *pamh
-			      , const char * const * user_env);
+extern int pam_misc_paste_env(pam_handle_t *_pamh
+			      , const char * const *_user_env);
 
 /* char **pam_misc_copy_env(pam_handle_t *pamh);