From 9d8ae839f2a8f34e4798492eaedc1c73a008a3f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Thu, 3 Feb 2005 08:45:13 +0000 Subject: [PATCH] de-__P git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14551 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/com_err/com_err.h | 18 ++++++------ lib/com_err/com_right.h | 14 ++------- lib/kafs/kafs.h | 64 +++++++++++++++++------------------------ 3 files changed, 39 insertions(+), 57 deletions(-) diff --git a/lib/com_err/com_err.h b/lib/com_err/com_err.h index 0f636f740..f9ab66f9a 100644 --- a/lib/com_err/com_err.h +++ b/lib/com_err/com_err.h @@ -44,22 +44,22 @@ #define __attribute__(X) #endif -typedef void (*errf) __P((const char *, long, const char *, va_list)); +typedef void (*errf) (const char *, long, const char *, va_list); -const char * error_message __P((long)); -int init_error_table __P((const char**, long, int)); +const char * error_message (long); +int init_error_table (const char**, long, int); -void com_err_va __P((const char *, long, const char *, va_list)) +void com_err_va (const char *, long, const char *, va_list) __attribute__((format(printf, 3, 0))); -void com_err __P((const char *, long, const char *, ...)) +void com_err (const char *, long, const char *, ...) __attribute__((format(printf, 3, 4))); -errf set_com_err_hook __P((errf)); -errf reset_com_err_hook __P((void)); +errf set_com_err_hook (errf); +errf reset_com_err_hook (void); -const char *error_table_name __P((int num)); +const char *error_table_name (int num); -void add_to_error_table __P((struct et_list *new_table)); +void add_to_error_table (struct et_list *new_table); #endif /* __COM_ERR_H__ */ diff --git a/lib/com_err/com_right.h b/lib/com_err/com_right.h index c7a3b05a2..f8cd2b612 100644 --- a/lib/com_err/com_right.h +++ b/lib/com_err/com_right.h @@ -40,14 +40,6 @@ #include #endif -#ifndef __P -#ifdef __STDC__ -#define __P(X) X -#else -#define __P(X) () -#endif -#endif - struct error_table { char const * const * msgs; long base; @@ -59,8 +51,8 @@ struct et_list { }; extern struct et_list *_et_list; -const char *com_right __P((struct et_list *list, long code)); -void initialize_error_table_r __P((struct et_list **, const char **, int, long)); -void free_error_table __P((struct et_list *)); +const char *com_right (struct et_list *list, long code); +void initialize_error_table_r (struct et_list **, const char **, int, long); +void free_error_table (struct et_list *); #endif /* __COM_RIGHT_H__ */ diff --git a/lib/kafs/kafs.h b/lib/kafs/kafs.h index 4609aa9d0..8afcc8067 100644 --- a/lib/kafs/kafs.h +++ b/lib/kafs/kafs.h @@ -97,41 +97,31 @@ struct ClearToken { int32_t EndTimestamp; }; -#ifdef __STDC__ -#ifndef __P -#define __P(x) x -#endif -#else -#ifndef __P -#define __P(x) () -#endif -#endif - /* Use k_hasafs() to probe if the machine supports AFS syscalls. The other functions will generate a SIGSYS if AFS is not supported */ -int k_hasafs __P((void)); +int k_hasafs (void); -int krb_afslog __P((const char *cell, const char *realm)); -int krb_afslog_uid __P((const char *cell, const char *realm, uid_t uid)); -int krb_afslog_home __P((const char *cell, const char *realm, - const char *homedir)); -int krb_afslog_uid_home __P((const char *cell, const char *realm, uid_t uid, - const char *homedir)); +int krb_afslog (const char *cell, const char *realm); +int krb_afslog_uid (const char *cell, const char *realm, uid_t uid); +int krb_afslog_home (const char *cell, const char *realm, + const char *homedir); +int krb_afslog_uid_home (const char *cell, const char *realm, uid_t uid, + const char *homedir); -int krb_realm_of_cell __P((const char *cell, char **realm)); +int krb_realm_of_cell (const char *cell, char **realm); /* compat */ #define k_afsklog krb_afslog #define k_afsklog_uid krb_afslog_uid -int k_pioctl __P((char *a_path, +int k_pioctl (char *a_path, int o_opcode, struct ViceIoctl *a_paramsP, - int a_followSymlinks)); -int k_unlog __P((void)); -int k_setpag __P((void)); -int k_afs_cell_of_file __P((const char *path, char *cell, int len)); + int a_followSymlinks); +int k_unlog (void); +int k_setpag (void); +int k_afs_cell_of_file (const char *path, char *cell, int len); @@ -144,41 +134,41 @@ int k_afs_cell_of_file __P((const char *path, char *cell, int len)); #define KRB5_H_INCLUDED #endif -void kafs_set_verbose __P((void (*kafs_verbose)(void *, const char *), void *)); -int kafs_settoken_rxkad __P((const char *, struct ClearToken *, - void *ticket, size_t ticket_len)); +void kafs_set_verbose (void (*kafs_verbose)(void *, const char *), void *); +int kafs_settoken_rxkad (const char *, struct ClearToken *, + void *ticket, size_t ticket_len); #ifdef KRB_H_INCLUDED -int kafs_settoken __P((const char*, uid_t, CREDENTIALS*)); +int kafs_settoken (const char*, uid_t, CREDENTIALS*); #endif #ifdef KRB5_H_INCLUDED -int kafs_settoken5 __P((krb5_context, const char*, uid_t, krb5_creds*)); +int kafs_settoken5 (krb5_context, const char*, uid_t, krb5_creds*); #endif #ifdef KRB5_H_INCLUDED -krb5_error_code krb5_afslog_uid __P((krb5_context context, +krb5_error_code krb5_afslog_uid (krb5_context context, krb5_ccache id, const char *cell, krb5_const_realm realm, - uid_t uid)); -krb5_error_code krb5_afslog __P((krb5_context context, + uid_t uid); +krb5_error_code krb5_afslog (krb5_context context, krb5_ccache id, const char *cell, - krb5_const_realm realm)); -krb5_error_code krb5_afslog_uid_home __P((krb5_context context, + krb5_const_realm realm); +krb5_error_code krb5_afslog_uid_home (krb5_context context, krb5_ccache id, const char *cell, krb5_const_realm realm, uid_t uid, - const char *homedir)); + const char *homedir); -krb5_error_code krb5_afslog_home __P((krb5_context context, +krb5_error_code krb5_afslog_home (krb5_context context, krb5_ccache id, const char *cell, krb5_const_realm realm, - const char *homedir)); + const char *homedir); -krb5_error_code krb5_realm_of_cell __P((const char *cell, char **realm)); +krb5_error_code krb5_realm_of_cell (const char *cell, char **realm); #endif