From a892c90367a9f1b1d3d962cfe958174b8fefcaee Mon Sep 17 00:00:00 2001 From: Peter Wu Date: Tue, 30 Aug 2016 11:12:44 +0200 Subject: [PATCH] time_util: fix -Wshadow issue time_util.c was already fixed, but the header was missing the change, breaking the build on a very old compiler. Change-Id: I95685c9a3e25dcb7567f2551b92f20c8792a6e47 Reviewed-on: https://code.wireshark.org/review/17384 Petri-Dish: Dario Lombardo Tested-by: Petri Dish Buildbot Reviewed-by: Dario Lombardo Reviewed-by: Peter Wu --- wsutil/time_util.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wsutil/time_util.h b/wsutil/time_util.h index 16e0a8626f..2835d68ef3 100644 --- a/wsutil/time_util.h +++ b/wsutil/time_util.h @@ -38,11 +38,11 @@ time_t mktime_utc(struct tm *tm); * Fetch the current process user and system CPU times, convert them to * seconds, and store them in the provided parameters. * - * @param utime Seconds spent in user mode. - * @param stime Seconds spent in system (kernel) mode. + * @param user_time Seconds spent in user mode. + * @param sys_time Seconds spent in system (kernel) mode. */ WS_DLL_PUBLIC -void get_resource_usage(double *utime, double *stime); +void get_resource_usage(double *user_time, double *sys_time); /** Print the process CPU time followed by a log message. * -- 2.34.1