From 384380c2f12503888101d367eb350f6a03cc45d1 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 6 Dec 2009 12:49:09 +0100 Subject: [PATCH] s3: Simplify usr_info_cmp by calling timeval_compare() (cherry picked from commit 4b3ad2547c452dd9493fe63e056346a5f7561a37) --- source3/rpc_server/srv_wkssvc_nt.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/source3/rpc_server/srv_wkssvc_nt.c b/source3/rpc_server/srv_wkssvc_nt.c index b3bfe80200b..8a8551cc245 100644 --- a/source3/rpc_server/srv_wkssvc_nt.c +++ b/source3/rpc_server/srv_wkssvc_nt.c @@ -53,9 +53,7 @@ static int usr_info_cmp(const void *p1, const void *p2) /* Called from qsort to compare two users in a usrinfo_t array for * sorting by login time. Return >0 if usr1 login time was later than * usr2 login time, <0 if it was earlier */ - return ((usr1->login_time.tv_sec == usr2->login_time.tv_sec) - ? usr1->login_time.tv_usec - usr2->login_time.tv_usec - : usr1->login_time.tv_sec - usr2->login_time.tv_sec); + return timeval_compare(&usr1->login_time, &usr2->login_time); } /******************************************************************* -- 2.11.4.GIT