From 52c847a019c6ef518cdc0851da667b9bf5913988 Mon Sep 17 00:00:00 2001 From: Jim Warner Date: Fri, 19 Jun 2020 00:00:00 -0500 Subject: [PATCH] library: rename a couple of 'reap' structs to 'reaped' In preparation for a documentation attempt, this patch renames 'struct reap' to 'struct reaped' in two of our interfaces. That will bring all the non-pid interfaces into agreement since the api already used that. Signed-off-by: Jim Warner --- proc/diskstats.c | 6 +++--- proc/diskstats.h | 4 ++-- proc/slabinfo.c | 6 +++--- proc/slabinfo.h | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/proc/diskstats.c b/proc/diskstats.c index cd0d48c1..48b43c3a 100644 --- a/proc/diskstats.c +++ b/proc/diskstats.c @@ -92,7 +92,7 @@ struct fetch_support { int n_alloc; // number of above pointers allocated int n_inuse; // number of above pointers occupied int n_alloc_save; // last known reap.stacks allocation - struct diskstats_reap results; // count + stacks for return to caller + struct diskstats_reaped results; // count + stacks for return to caller }; struct diskstats_info { @@ -827,9 +827,9 @@ PROCPS_EXPORT struct diskstats_result *procps_diskstats_get ( * Harvest all the requested disks information providing * the result stacks along with the total number of harvested. * - * Returns: pointer to a diskstats_reap struct on success, NULL on error. + * Returns: pointer to a diskstats_reaped struct on success, NULL on error. */ -PROCPS_EXPORT struct diskstats_reap *procps_diskstats_reap ( +PROCPS_EXPORT struct diskstats_reaped *procps_diskstats_reap ( struct diskstats_info *info, enum diskstats_item *items, int numitems) diff --git a/proc/diskstats.h b/proc/diskstats.h index 50a63623..bc14c5d9 100644 --- a/proc/diskstats.h +++ b/proc/diskstats.h @@ -81,7 +81,7 @@ struct diskstats_stack { struct diskstats_result *head; }; -struct diskstats_reap { +struct diskstats_reaped { int total; struct diskstats_stack **stacks; }; @@ -109,7 +109,7 @@ struct diskstats_result *procps_diskstats_get ( const char *name, enum diskstats_item item); -struct diskstats_reap *procps_diskstats_reap ( +struct diskstats_reaped *procps_diskstats_reap ( struct diskstats_info *info, enum diskstats_item *items, int numitems); diff --git a/proc/slabinfo.c b/proc/slabinfo.c index 744a3bda..ff04ec80 100644 --- a/proc/slabinfo.c +++ b/proc/slabinfo.c @@ -114,7 +114,7 @@ struct fetch_support { int n_alloc; // number of above pointers allocated int n_inuse; // number of above pointers occupied int n_alloc_save; // last known reap.stacks allocation - struct slabinfo_reap results; // count + stacks for return to caller + struct slabinfo_reaped results; // count + stacks for return to caller }; struct slabinfo_info { @@ -852,9 +852,9 @@ PROCPS_EXPORT struct slabinfo_result *procps_slabinfo_get ( * Harvest all the requested SLAB (individual nodes) information * providing the result stacks along with the total number of nodes. * - * Returns: pointer to a slabinfo_reap struct on success, NULL on error. + * Returns: pointer to a slabinfo_reaped struct on success, NULL on error. */ -PROCPS_EXPORT struct slabinfo_reap *procps_slabinfo_reap ( +PROCPS_EXPORT struct slabinfo_reaped *procps_slabinfo_reap ( struct slabinfo_info *info, enum slabinfo_item *items, int numitems) diff --git a/proc/slabinfo.h b/proc/slabinfo.h index 8344c570..9b0c587d 100644 --- a/proc/slabinfo.h +++ b/proc/slabinfo.h @@ -90,7 +90,7 @@ struct slabinfo_stack { struct slabinfo_result *head; }; -struct slabinfo_reap { +struct slabinfo_reaped { int total; struct slabinfo_stack **stacks; }; @@ -114,7 +114,7 @@ struct slabinfo_result *procps_slabinfo_get ( struct slabinfo_info *info, enum slabinfo_item item); -struct slabinfo_reap *procps_slabinfo_reap ( +struct slabinfo_reaped *procps_slabinfo_reap ( struct slabinfo_info *info, enum slabinfo_item *items, int numitems);