From 6506c87aab5567ae855d1f75dc9b41e1a091f542 Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Thu, 23 Jan 2014 18:15:24 -0500 Subject: Modernize iprop code * Don't use "extern" for kdb_log.h prototypes. * Avoid passing structures by value. * Avoid the need to cast the result of the INDEX macro, and use char * instead of unsigned long for pointer arithmetic. * Reorganize kdb_log.c so static helpers are at the top and don't use the "ulog_" prefix. * Get rid of ulog_finish_update_slave since it's more concise to open-code it in ulog_replay. * Get rid of ulog_delete_update. In krb5_db_delete_principal, just call ulog_add_update with kdb_deleted set in upd. * Modernize coding style of kproplog.c. Use k5memdup0 instead of snprintf in print_str to convert a byte range to a C string. Remove an unnecesary textdomain call; libkrb5 takes care of calling bindtextdomain in the library initializer. * Modernize coding style of kpropd.c and kprop.c. No functional changes. --- src/include/kdb_log.h | 53 ++++++++++++++++++++------------------------------- 1 file changed, 21 insertions(+), 32 deletions(-) (limited to 'src/include') diff --git a/src/include/kdb_log.h b/src/include/kdb_log.h index 43d2fc41d..88f0eb590 100644 --- a/src/include/kdb_log.h +++ b/src/include/kdb_log.h @@ -21,8 +21,9 @@ extern "C" { /* * DB macros */ -#define INDEX(ulogaddr, i) ((unsigned long) ulogaddr + sizeof (kdb_hlog_t) + \ - (i*ulog->kdb_block)) +#define INDEX(ulog, i) (kdb_ent_header_t *)((char *)(ulog) + \ + sizeof(kdb_hlog_t) + \ + (i) * ulog->kdb_block) /* * Current DB version # @@ -67,35 +68,23 @@ extern "C" { /* * Prototype declarations */ -extern krb5_error_code ulog_map(krb5_context context, - const char *logname, uint32_t entries, - int caller, - char **db_args); -extern void ulog_init_header(krb5_context context); -extern krb5_error_code ulog_add_update(krb5_context context, - kdb_incr_update_t *upd); -extern krb5_error_code ulog_delete_update(krb5_context context, - kdb_incr_update_t *upd); -extern krb5_error_code ulog_finish_update(krb5_context context, - kdb_incr_update_t *upd); -extern krb5_error_code ulog_get_entries(krb5_context context, kdb_last_t last, - kdb_incr_result_t *ulog_handle); - -extern krb5_error_code -ulog_replay(krb5_context context, kdb_incr_result_t *incr_ret, char **db_args); - -extern krb5_error_code -ulog_conv_2logentry(krb5_context context, krb5_db_entry *entry, - kdb_incr_update_t *update); - -extern krb5_error_code -ulog_conv_2dbentry(krb5_context context, krb5_db_entry **entry, - kdb_incr_update_t *update); - -extern void ulog_free_entries(kdb_incr_update_t *updates, int no_of_updates); -extern krb5_error_code ulog_set_role(krb5_context ctx, iprop_role role); - -extern krb5_error_code ulog_lock(krb5_context ctx, int mode); +krb5_error_code ulog_map(krb5_context context, const char *logname, + uint32_t entries, int caller, char **db_args); +void ulog_init_header(krb5_context context); +krb5_error_code ulog_add_update(krb5_context context, kdb_incr_update_t *upd); +krb5_error_code ulog_finish_update(krb5_context context, + kdb_incr_update_t *upd); +krb5_error_code ulog_get_entries(krb5_context context, const kdb_last_t *last, + kdb_incr_result_t *ulog_handle); +krb5_error_code ulog_replay(krb5_context context, kdb_incr_result_t *incr_ret, + char **db_args); +krb5_error_code ulog_conv_2logentry(krb5_context context, krb5_db_entry *entry, + kdb_incr_update_t *update); +krb5_error_code ulog_conv_2dbentry(krb5_context context, krb5_db_entry **entry, + kdb_incr_update_t *update); +void ulog_free_entries(kdb_incr_update_t *updates, int no_of_updates); +krb5_error_code ulog_set_role(krb5_context ctx, iprop_role role); +krb5_error_code ulog_lock(krb5_context ctx, int mode); typedef struct kdb_hlog { uint32_t kdb_hmagic; /* Log header magic # */ @@ -109,7 +98,7 @@ typedef struct kdb_hlog { uint16_t kdb_block; /* Block size of each element */ } kdb_hlog_t; -extern void ulog_sync_header(kdb_hlog_t *); +void ulog_sync_header(kdb_hlog_t *); typedef struct kdb_ent_header { uint32_t kdb_umagic; /* Update entry magic # */ -- cgit