From 59a0fb24390bc9387d3404e5f3dcde33bf80dffa Mon Sep 17 00:00:00 2001 From: Marcel Raad Date: Sat, 8 Jul 2017 23:19:36 +0200 Subject: smb: rename variable to fix shadowing warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GCC 4.6.3 on travis complains: smb.c: In function ‘get_posix_time’: smb.c:725:13: error: declaration of ‘time’ shadows a global declaration [-Werror=shadow] Fix this by renaming the variable. --- lib/smb.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/smb.c') diff --git a/lib/smb.c b/lib/smb.c index 8ae4303b0..13dfd514b 100644 --- a/lib/smb.c +++ b/lib/smb.c @@ -722,14 +722,14 @@ static CURLcode smb_connection_state(struct connectdata *conn, bool *done) static void get_posix_time(long *_out, const void *_in) { #ifdef HAVE_LONGLONG - long long time = *(long long *) _in; + long long timestamp = *(long long *) _in; #else - unsigned __int64 time = *(unsigned __int64 *) _in; + unsigned __int64 timestamp = *(unsigned __int64 *) _in; #endif - time -= 116444736000000000ULL; - time /= 10000000; - *_out = (long) time; + timestamp -= 116444736000000000ULL; + timestamp /= 10000000; + *_out = (long) timestamp; } static CURLcode smb_request_state(struct connectdata *conn, bool *done) -- cgit v1.2.3