From e16b93f3f2d65992d387ded7edf9eada9a661afc Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Tue, 27 Jun 2000 23:50:17 +0000
Subject: [PATCH] cleaned up double if stmnt into one if stmnt

---
 src/ca/access.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/ca/access.cpp b/src/ca/access.cpp
index c6d3642ab..14f741a9e 100644
--- a/src/ca/access.cpp
+++ b/src/ca/access.cpp
@@ -40,6 +40,7 @@ void ca_client_exit_handler ()
     }
 }
 
+// runs once only for each process
 static void ca_init_client_context ( void * dummy )
 {
     caClientContextId = threadPrivateCreate ();
@@ -233,11 +234,7 @@ int epicsShareAPI ca_search_and_connect (const char *name_str, chid *chanptr,
         return caStatus;
     }
 
-    if ( name_str == NULL ) {
-        return ECA_EMPTYSTR;
-    }
-
-    if ( *name_str == '\0' ) {
+    if ( name_str == NULL || *name_str == '\0' ) {
         return ECA_EMPTYSTR;
     }