1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
From bb477ab4549e7378a86339c5be7e746d410e9889 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Tue, 19 Mar 2024 11:49:26 +0100
Subject: [PATCH] Handle 64 bit time_t on 32 bit systems
---
gridftp/server/src/globus_i_gfs_control.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/globus_i_gfs_control.c b/globus_i_gfs_control.c
index 7e75f9b2fd..e18953becc 100644
--- a/globus_i_gfs_control.c
+++ b/globus_i_gfs_control.c
@@ -1061,11 +1061,11 @@ globus_l_gfs_data_command_cb(
gettimeofday(&now, NULL);
msg = globus_common_create_string(
"%d-Status Marker\r\n"
- " Timestamp: %ld.%01ld\r\n"
+ " Timestamp: %lld.%01d\r\n"
" Bytes Processed: %s\r\n"
"%d End.\r\n",
reply->code,
- now.tv_sec, now.tv_usec / 100000,
+ (long long) now.tv_sec, (int) (now.tv_usec / 100000),
reply->info.command.checksum,
reply->code);
globus_i_gsc_cmd_intermediate_reply(op, msg);
@@ -1098,12 +1098,12 @@ globus_l_gfs_data_command_cb(
case 112:
msg = globus_common_create_string(
"112-Perf Marker\r\n"
- " Timestamp: %ld.%01ld\r\n"
+ " Timestamp: %lld.%01d\r\n"
" Stripe Index: 0\r\n"
" Stripe Bytes Transferred: %s\r\n"
" Total Stripe Count: 1\r\n"
"112 End.\r\n",
- now.tv_sec, now.tv_usec / 100000,
+ (long long) now.tv_sec, (int) (now.tv_usec / 100000),
reply->info.command.checksum);
break;
default:
--
2.44.0
|
