From 300518c0a10b4f5030e23380da07c906a3ee80dc Mon Sep 17 00:00:00 2001 From: imp Date: Sat, 23 Mar 2002 17:24:55 +0000 Subject: Breath deep and take __P out of the system include files. # This appears to not break X11, but I'm having problems compiling the # glide part of the server with or without this patch, so I can't tell # for sure. --- include/rpcsvc/nis_db.h | 27 ---------- include/rpcsvc/nislib.h | 135 ++---------------------------------------------- include/rpcsvc/ypclnt.h | 18 +++---- 3 files changed, 10 insertions(+), 170 deletions(-) (limited to 'include/rpcsvc') diff --git a/include/rpcsvc/nis_db.h b/include/rpcsvc/nis_db.h index 784ac07..9dcc783 100644 --- a/include/rpcsvc/nis_db.h +++ b/include/rpcsvc/nis_db.h @@ -106,8 +106,6 @@ typedef struct db_result db_result; * Prototypes for the database functions. */ -#if (__STDC__) - extern bool_t db_initialize(char *); #ifdef ORIGINAL_DECLS extern bool_t db_create_table(char *, table_obj *); @@ -130,31 +128,6 @@ extern db_status db_unload_table(char *); extern void db_free_result(db_result *); #endif -#else /* Non-prototype definitions */ - -extern bool_t db_initialize(); -#ifdef ORIGINAL_DECLS -extern bool_t db_create_table(); -extern bool_t db_destroy_table(); -#else -extern db_status db_create_table(); -extern db_status db_destroy_table(); -#endif -extern db_result *db_first_entry(); -extern db_result *db_next_entry(); -extern db_result *db_reset_next_entry(); -extern db_result *db_list_entries(); -extern db_result *db_add_entry(); -extern db_result *db_remove_entry(); -extern db_status db_checkpoint(); -extern db_status db_standby(); -#ifndef ORIGINAL_DECLS -extern db_status db_table_exists(); -extern db_status db_unload_table(); -extern void db_free_result(); -#endif -#endif /* __STDC__ */ - #ifdef __cplusplus } #endif diff --git a/include/rpcsvc/nislib.h b/include/rpcsvc/nislib.h index 9f874d2..754affe 100644 --- a/include/rpcsvc/nislib.h +++ b/include/rpcsvc/nislib.h @@ -25,6 +25,8 @@ * Sun Microsystems, Inc. * 2550 Garcia Avenue * Mountain View, California 94043 + * + * $FreeBSD$ */ /* @@ -33,8 +35,7 @@ /* * This file contains the interfaces that are visible in the SunOS 5.x - * implementation of NIS Plus. When using C++ the defined __cplusplus and - * __STDC__ should both be true. + * implementation of NIS Plus. */ #ifndef _RPCSVC_NISLIB_H @@ -51,7 +52,6 @@ struct signature { char *signature_val; }; -#ifdef __STDC__ extern void nis_freeresult(nis_result *); extern nis_result * nis_lookup(nis_name, u_long); extern nis_result * nis_list(nis_name, u_long, @@ -179,135 +179,6 @@ extern u_long __stop_clock(int); extern struct signature *__nis_calculate_encrypted_cksum(unsigned char *, unsigned int, char *, int); -#else - -/* Non-prototype definitions (old fashioned C) */ - -extern void nis_freeresult(); -extern nis_result * nis_lookup(); -extern nis_result * nis_list(); -extern nis_result * nis_add(); -extern nis_result * nis_remove(); -extern nis_result * nis_modify(); - -extern nis_result * nis_add_entry(); -extern nis_result * nis_remove_entry(); -extern nis_result * nis_modify_entry(); -extern nis_result * nis_first_entry(); -extern nis_result * nis_next_entry(); - -extern nis_error nis_mkdir(); -extern nis_error nis_rmdir(); -extern name_pos nis_dir_cmp(); - -extern nis_name *nis_getnames(); -extern void nis_freenames(); -extern nis_name nis_domain_of(); -extern nis_name nis_leaf_of(); -extern nis_name nis_leaf_of_r(); -extern nis_name nis_name_of(); -extern nis_name nis_local_group(); -extern nis_name nis_local_directory(); -extern nis_name nis_local_principal(); -extern nis_name nis_local_host(); - -extern void nis_destroy_object(); -extern nis_object * nis_clone_object(); -extern void nis_print_object(); - -extern char * nis_sperrno(); -extern void nis_perror(); -extern char * nis_sperror(); -extern void nis_lerror(); - -extern void nis_print_group_entry(); -extern bool_t nis_ismember(); -extern nis_error nis_creategroup(); -extern nis_error nis_destroygroup(); -extern nis_error nis_addmember(); -extern nis_error nis_removemember(); -extern nis_error nis_verifygroup(); - -extern void nis_freeservlist(); -extern nis_server ** nis_getservlist(); -extern nis_error nis_stats(); -extern nis_error nis_servstate(); -extern void nis_freetags(); - -extern nis_result * nis_checkpoint(); -extern void nis_ping(); - -/* - * XXX: PLEASE NOTE THAT THE FOLLOWING FUNCTIONS ARE INTERNAL - * TO NIS+ AND SHOULD NOT BE USED BY ANY APPLICATION PROGRAM. - * THEIR SEMANTICS AND/OR SIGNATURE CAN CHANGE WITHOUT NOTICE. - * SO, PLEASE DO NOT USE THEM. YOU ARE WARNED!!!! - */ -extern char ** __break_name(); -extern int __name_distance(); -extern nis_result * nis_make_error(); -extern nis_attr * __cvt2attr(); -extern void nis_free_request(); -extern nis_error nis_get_request(); -extern nis_object * nis_read_obj(); -extern int nis_write_obj(); -extern int nis_in_table(); -extern int nis_insert_item(); -extern NIS_HASH_ITEM * nis_find_item(); -extern NIS_HASH_ITEM * nis_remove_item(); -extern void nis_insert_name(); -extern void nis_remove_name(); -extern CLIENT * nis_make_rpchandle(); -extern void * nis_get_static_storage(); -extern char * nis_data(); - -extern void nis_print_rights(); -extern void nis_print_directory(); -extern void nis_print_group(); -extern void nis_print_table(); -extern void nis_print_link(); -extern void nis_print_entry(); -extern nis_object * nis_get_object(); - -extern nis_server * __nis_init_callback(); -extern int nis_getdtblsize(); -extern int __nis_run_callback(); - -extern log_result * nis_dump(); -extern log_result * nis_dumplog(); - -extern bool_t __do_ismember(); -extern nis_name __nis_map_group(); -extern nis_name __nis_map_group_r(); - - -extern nis_error __nis_CacheBind(); -extern directory_obj * __nis_CacheSearch(); -extern bool_t __nis_CacheRemoveEntry(); -extern void __nis_CacheRestart(); -extern void __nis_CachePrint(); -extern void __nis_CacheDumpStatistics(); -extern bool_t writeColdStartFile(); - -extern CLIENT * __get_ti_clnt(); -extern int __strcmp_case_insens(); -extern int __strncmp_case_insens(); - -extern fd_result * nis_finddirectory(); -extern int __start_clock(); -extern u_long __stop_clock(); - -/* - * This particular function is part of the FreeBSD NIS+ implementation - * only. Ideally it should be somewhere else, but it is used by both - * rpc.nisd and nis_cachemgr, and there aren't that many headers common - * to both programs. - */ - -extern struct signature *__nis_calculate_encrypted_cksum(); - -#endif - #define NUL '\0' #ifdef __cplusplus diff --git a/include/rpcsvc/ypclnt.h b/include/rpcsvc/ypclnt.h index 64a742d..3bf0f30 100644 --- a/include/rpcsvc/ypclnt.h +++ b/include/rpcsvc/ypclnt.h @@ -72,19 +72,15 @@ int yp_bind(char *dom); int _yp_dobind(char *dom, struct dom_binding **ypdb); void yp_unbind(char *dom); int yp_get_default_domain(char **domp); -int yp_match __P((char *indomain, char *inmap, - const char *inkey, int inkeylen, char **outval, - int *outvallen)); -int yp_first __P((char *indomain, char *inmap, - char **outkey, int *outkeylen, char **outval, - int *outvallen)); -int yp_next __P((char *indomain, char *inmap, - char *inkey, int inkeylen, char **outkey, - int *outkeylen, char **outval, int *outvallen)); +int yp_match(char *indomain, char *inmap, const char *inkey, int inkeylen, + char **outval, int *outvallen); +int yp_first(char *indomain, char *inmap, char **outkey, int *outkeylen, + char **outval, int *outvallen); +int yp_next(char *indomain, char *inmap, char *inkey, int inkeylen, + char **outkey, int *outkeylen, char **outval, int *outvallen); int yp_master(char *indomain, char *inmap, char **outname); int yp_order(char *indomain, char *inmap, int *outorder); -int yp_all __P((char *indomain, char *inmap, - struct ypall_callback *incallback)); +int yp_all(char *indomain, char *inmap, struct ypall_callback *incallback); char * yperr_string(int incode); char * ypbinderr_string(int incode); int ypprot_err(unsigned int incode); -- cgit v1.1