From 379ea6e58688e8f4ed69aa7fa797971b89a50f15 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Sat, 18 Apr 2020 21:41:47 -0700 Subject: [PATCH] WIN32: epicsFindSymbol() clear error on success --- modules/libcom/src/osi/os/WIN32/osdFindSymbol.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/modules/libcom/src/osi/os/WIN32/osdFindSymbol.c b/modules/libcom/src/osi/os/WIN32/osdFindSymbol.c index c8c74b56d..6447971fc 100644 --- a/modules/libcom/src/osi/os/WIN32/osdFindSymbol.c +++ b/modules/libcom/src/osi/os/WIN32/osdFindSymbol.c @@ -39,10 +39,7 @@ epicsShareFunc void * epicsLoadLibrary(const char *name) epicsLoadErrorCode = 0; lib = LoadLibrary(name); - if (lib == NULL) - { - epicsLoadErrorCode = GetLastError(); - } + epicsLoadErrorCode = lib ? 0 : GetLastError(); return lib; } @@ -113,10 +110,7 @@ epicsShareFunc void * epicsShareAPI epicsFindSymbol(const char *name) } } - - if(!ret) { - epicsLoadErrorCode = GetLastError(); - } + epicsLoadErrorCode = ret ? 0 : GetLastError(); free(dlls); return ret; }