]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
smbd: Use MIN() instead of explicit if-statement
authorVolker Lendecke <vl@samba.org>
Fri, 16 Dec 2022 13:12:57 +0000 (14:12 +0100)
committerJeremy Allison <jra@samba.org>
Thu, 23 Jan 2025 23:08:38 +0000 (23:08 +0000)
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
source3/smbd/smb1_trans2.c

index 47a408d507591371e5a26ed28e2b655aab2ce099..8301e7f60a93e2280bd39062eb3cd1996c7425bc 100644 (file)
@@ -5550,10 +5550,10 @@ void reply_transs2(struct smb_request *req)
        /* Revise state->total_param and state->total_data in case they have
           changed downwards */
 
-       if (SVAL(req->vwv+0, 0) < state->total_param)
-               state->total_param = SVAL(req->vwv+0, 0);
-       if (SVAL(req->vwv+1, 0) < state->total_data)
-               state->total_data = SVAL(req->vwv+1, 0);
+       state->total_param = MIN(PULL_LE_U16(req->vwv + 0, 0),
+                                state->total_param);
+       state->total_data = MIN(PULL_LE_U16(req->vwv + 1, 0),
+                               state->total_data);
 
        pcnt = SVAL(req->vwv+2, 0);
        poff = SVAL(req->vwv+3, 0);