aboutsummaryrefslogtreecommitdiffstats
path: root/wsutil
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2016-08-30 11:12:44 +0200
committerPeter Wu <peter@lekensteyn.nl>2016-08-30 10:35:33 +0000
commita892c90367a9f1b1d3d962cfe958174b8fefcaee (patch)
treeff3ff659378aefc2f7f4f62fa12c1b3cfc3f6053 /wsutil
parent7c753702242dff9f73a960911907120203196248 (diff)
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 <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'wsutil')
-rw-r--r--wsutil/time_util.h6
1 files 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.
*