Module Name: krb5 Committed By: raeburn Date: Sat Dec 7 03:37:24 UTC 2002 Modified Files: krb5/src/util/profile/ChangeLog krb5/src/util/profile/prof_err.et krb5/src/util/profile/prof_file.c krb5/src/util/profile/prof_init.c krb5/src/util/profile/prof_int.h krb5/src/util/profile/prof_set.c krb5/src/util/profile/prof_tree.c krb5/src/util/profile/test_profile.c Added Files: Removed Files: Log Message ticket: 1237 status: open Checkpoint first step of merge. Moved per-file data into a separate object from the profile handle. Dropped some old MacOS 9 code. * prof_int.h: Include Mac OS X versions of header files if appropriate. Only include prof_err.h if profile.h doesn't define ERROR_TABLE_BASE_prof. (struct _prf_data_t): Move most of contents of _prf_file_t here. Add reference count. (prf_data_t): New typedef. (struct _prf_file_t): Include an array of one _prf_data_t structure. * prof_file.c (profile_open_file): Fill in "data" field. Drop some old Mac specific code. (profile_flush_file_data): Renamed from profile_flush_file, now takes prf_data_t argument. (profile_flush_file_data): Likewise. (profile_free_file): Now calls profile_free_file_data. (profile_free_file_data): New function, with most of old profile_free_file code. * prof_init.c (profile_init_path): Removed old Mac version. (profile_ser_size, profile_ser_externalize): Get file data from new "data" field. * prof_set.c (rw_setup, profile_update_relation, profile_clear_relation, profile_rename_section, profile_add_relation): Likewise. * prof_tree.c (profile_node_iterator): Likewise. * test_profile.c (do_batchmode): Likewise. * prof_int.h (profile_flush_file): Now a macro. * prof_err.et (PROF_MAGIC_FILE_DATA): New error code value. To generate a diff of this commit: cvs diff -r1.118 -r1.119 krb5/src/util/profile/ChangeLog cvs diff -r1.7 -r1.8 krb5/src/util/profile/prof_err.et cvs diff -r1.22 -r1.23 krb5/src/util/profile/prof_file.c cvs diff -r1.29 -r1.30 krb5/src/util/profile/prof_init.c cvs diff -r1.23 -r1.24 krb5/src/util/profile/prof_int.h cvs diff -r1.2 -r1.3 krb5/src/util/profile/prof_set.c cvs diff -r1.20 -r1.21 krb5/src/util/profile/prof_tree.c cvs diff -r1.12 -r1.13 krb5/src/util/profile/test_profile.c