[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[xen master] tools/xenstore/xenstored_control.c: correctly print time_t



commit b33a5c5929bce66302fbfd680ac5b4091886079e
Author:     Alexander Kanavin <alex@xxxxxxxxxxxxx>
AuthorDate: Wed Apr 19 14:07:09 2023 +0200
Commit:     Julien Grall <jgrall@xxxxxxxxxx>
CommitDate: Wed Apr 19 19:31:04 2023 +0100

    tools/xenstore/xenstored_control.c: correctly print time_t
    
    On 32 bit systems with 64 bit time_t (hello, Y2038 problem),
    the following error occurs otherwise:
    
    | xenstored_control.c: In function 'lu_reject_reason':
    | xenstored_control.c:646:70: error: format '%ld' expects argument of type 
'long int', but argument 5 has type 'time_t' {aka 'long long int'} 
[-Werror=format=]
    
    Signed-off-by: Alexander Kanavin <alex@xxxxxxxxxxxxx>
    Reviewed-by: Juergen Gross <jgross@xxxxxxxx>
---
 tools/xenstore/xenstored_control.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/xenstore/xenstored_control.c 
b/tools/xenstore/xenstored_control.c
index cbd62556c3..403295788a 100644
--- a/tools/xenstore/xenstored_control.c
+++ b/tools/xenstore/xenstored_control.c
@@ -666,12 +666,12 @@ static const char *lu_reject_reason(const void *ctx)
        time_t now = time(NULL);
 
        list_for_each_entry(conn, &connections, list) {
-               if (conn->ta_start_time &&
-                   (now - conn->ta_start_time >= lu_status->timeout)) {
+               unsigned long tdiff = now - conn->ta_start_time;
+
+               if (conn->ta_start_time && (tdiff >= lu_status->timeout)) {
                        ret = talloc_asprintf(ctx, "%s\nDomain %u: %ld s",
                                              ret ? : "Domains with long 
running transactions:",
-                                             conn->id,
-                                             now - conn->ta_start_time);
+                                             conn->id, tdiff);
                }
        }
 
--
generated by git-patchbot for /home/xen/git/xen.git#master



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.