From: James Jones <jejones3141@gmail.com>
Date: Fri, 19 May 2023 18:12:23 +0000 (-0500)
Subject: Specifically model exfile_{open,close}_lock()
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ff502d660dd2d64f28c1bf1f4cef86a65482390;p=thirdparty%2Ffreeradius-server.git

Specifically model exfile_{open,close}_lock()
---

diff --git a/src/coverity-model/merged_model.c b/src/coverity-model/merged_model.c
index 9f75ada2494..6dbed3fec89 100644
--- a/src/coverity-model/merged_model.c
+++ b/src/coverity-model/merged_model.c
@@ -43,19 +43,19 @@ typedef struct exfile_s {
 	bool			locking;
 } exfile_t;
 
-int exfile_open(exfile_t *ef, char const *filename, mode_t permissions, off_t *offset)
+static int exfile_open_lock(exfile_t *ef, char const *filename, mode_t permissions, off_t *offset)
 {
     int result;
 
-    if (ef->locking && result > 0) __coverity_exclusive_lock_acquire__((void *) &ef->mutex);
+    if (result > 0) __coverity_exclusive_lock_acquire__((void *) &ef->mutex);
     return result;
 }
 
-int exfile_close(exfile_t *ef, int fd)
+static int exfile_close_lock(exfile_t *ef, int fd)
 {
     int result;
 
-    if (ef->locking) __coverity_exclusive_lock_release__((void *) &ef->mutex);
+    __coverity_exclusive_lock_release__((void *) &ef->mutex);
     return result;
 }
 
@@ -74,7 +74,6 @@ typedef struct {
 typedef struct {
 } fr_time_t;
 
-
 static fr_pool_connection_t *connection_spawn(fr_pool_t *pool, request_t *request, fr_time_t now, bool in_use, bool unlock)
 {
 	fr_pool_connection_t *result;