Refactor with simpler logicals and ternaries

waifuAPIModule.f90

@@ -140,11 +140,7 @@ function fileInfo(token, formatted) result (res)
 
             url = ''
             url = trim(BASEURL) // '/' // trim(token) // '?formatted='
-            if (formatted .eqv. .true.) then
-                url = trim(url) // 'true'
-            else
-                url = trim(url) // 'false'
-            end if
+            url = merge(trim(url) // 'true', trim(url) // 'false', formatted)
 
             call dispatch_curl(rc, 'GET', trim(url), c_null_ptr, body, '')
             call checkError(rc, body%content)
@@ -181,14 +177,10 @@ function fileUpdate(token, password, previous_password, custom_expiry, hide_file
                 fields = trim(fields) // custom_expiry
             end if
             fields = trim(fields) // '","hideFilename":'
-            if (hide_filename .eqv. .true.) then
-                fields = trim(fields) // 'true'
-            else
-                fields = trim(fields) // 'false'
-            end if
+            fields = merge(trim(fields) // 'true ', trim(fields) // 'false', hide_filename)
             fields = trim(fields) // '}'
 
-            call dispatch_curl(rc, 'PATCH', trim(url), headers, body, fields)
+            call dispatch_curl(rc, 'PATCH', trim(url), headers, body, trim(fields))
             call checkError(rc, body%content)
             res = deserializeResponse(body%content)
             deallocate(body%content)
@@ -207,11 +199,7 @@ function deleteFile(token) result (res)
             call dispatch_curl(rc, 'DELETE', trim(url), c_null_ptr, body, '')
             call checkError(rc, body%content)
 
-            if (body%content(1:4) == 'true') then
-                res = .true.
-            else
-                res = .false.
-            end if
+            res = body%content(1:4) == 'true'
             deallocate(body%content)
         end function deleteFile
 

waifuUtilsModule.f90

@@ -11,11 +11,7 @@ module waifuvault_utils
     function stringToLogical(input) result (res)
         character(len=*) :: input
         logical :: res
-        if(input == 'true') then
-            res = .true.
-        else
-            res = .false.
-        end if
+        res = input == 'true'
     end function stringToLogical
 
     function basename(path)
@@ -41,11 +37,7 @@ subroutine expandHomedir(path, result)
 
         call getHomeDirectory(home, status)
 
-        if (path(1:1) == '~' .and. status == 0) then
-            result = trim(home) // path(2:)
-        else
-            result = path
-        end if
+        result = merge(trim(home) // path(2:), path, (path(1:1) == '~' .and. status == 0))
     end subroutine expandHomedir
 
     subroutine getHomeDirectory(home, status)