diff options
author | Alasdair G Kergon <agk@redhat.com> | 2017-10-18 15:57:46 +0100 |
---|---|---|
committer | Alasdair G Kergon <agk@redhat.com> | 2017-10-18 15:58:13 +0100 |
commit | f1cc5b12fd80c3c62247fccfb2e5537aef27533d (patch) | |
tree | f839eaa11450e9f52d9a3915e54db009c839d303 /lib/report | |
parent | 327d9d59be6f7179b2e0a756deaa0f9a196e0651 (diff) | |
download | lvm2-f1cc5b12fd80c3c62247fccfb2e5537aef27533d.tar.gz |
tidy: Add missing underscores to statics.
Diffstat (limited to 'lib/report')
-rw-r--r-- | lib/report/report.c | 15 | ||||
-rw-r--r-- | lib/report/values.h | 4 |
2 files changed, 9 insertions, 10 deletions
diff --git a/lib/report/report.c b/lib/report/report.c index c32df714e..6d6289e09 100644 --- a/lib/report/report.c +++ b/lib/report/report.c @@ -38,8 +38,7 @@ struct lvm_report_object { struct label *label; }; -static uint32_t log_seqnum = 1; - +static uint32_t _log_seqnum = 1; /* * Enum for field_num index to use in per-field reserved value definition. @@ -1091,10 +1090,10 @@ static void *_lv_time_handler_get_dynamic_value(struct dm_report *rh, return result; } -static int lv_time_handler(struct dm_report *rh, struct dm_pool *mem, - uint32_t field_num, - dm_report_reserved_action_t action, - const void *data_in, const void **data_out) +static int _lv_time_handler(struct dm_report *rh, struct dm_pool *mem, + uint32_t field_num, + dm_report_reserved_action_t action, + const void *data_in, const void **data_out) { *data_out = NULL; if (!data_in) @@ -4128,7 +4127,7 @@ int report_cmdlog(void *handle, const char *type, const char *context, const char *object_group_id, const char *msg, int current_errno, int ret_code) { - struct cmd_log_item log_item = {log_seqnum++, type, context, object_type_name, + struct cmd_log_item log_item = {_log_seqnum++, type, context, object_type_name, object_name ? : "", object_id ? : "", object_group ? : "", object_group_id ? : "", msg ? : "", current_errno, ret_code}; @@ -4141,7 +4140,7 @@ int report_cmdlog(void *handle, const char *type, const char *context, void report_reset_cmdlog_seqnum(void) { - log_seqnum = 1; + _log_seqnum = 1; } int report_current_object_cmdlog(const char *type, const char *msg, int32_t ret_code) diff --git a/lib/report/values.h b/lib/report/values.h index 652689b87..7c53651d4 100644 --- a/lib/report/values.h +++ b/lib/report/values.h @@ -90,8 +90,8 @@ FIELD_RESERVED_VALUE(NOFLAG, lv_read_ahead, lv_read_ahead_auto, "", &_siz_max, " FIELD_RESERVED_VALUE(NAMED, lv_when_full, lv_when_full_error, "", "error", "error", "error when full", "error if no space") FIELD_RESERVED_VALUE(NAMED, lv_when_full, lv_when_full_queue, "", "queue", "queue", "queue when full", "queue if no space") FIELD_RESERVED_VALUE(NOFLAG, lv_when_full, lv_when_full_undef, "", "", "", "undefined") -FIELD_RESERVED_VALUE(NAMED | RANGE | FUZZY | DYNAMIC, lv_time, lv_time_fuzzy, "", lv_time_handler, NULL) -FIELD_RESERVED_VALUE(NAMED | RANGE | FUZZY | DYNAMIC, lv_time_removed, lv_time_removed_fuzzy, "", lv_time_handler, NULL) +FIELD_RESERVED_VALUE(NAMED | RANGE | FUZZY | DYNAMIC, lv_time, lv_time_fuzzy, "", _lv_time_handler, NULL) +FIELD_RESERVED_VALUE(NAMED | RANGE | FUZZY | DYNAMIC, lv_time_removed, lv_time_removed_fuzzy, "", _lv_time_handler, NULL) /* Reserved values for SEG fields */ FIELD_RESERVED_VALUE(NOFLAG, cache_policy, cache_policy_undef, "", "", "", "undefined") |