Unify UNIX/APPLE environ NULL check

Author: dusan-exostellar

rocclr/utils/flags.cpp

@@ -119,25 +119,23 @@ bool Flag::init() {
 #else  // !_WIN32
 #ifdef __APPLE__
   char** environ = *_NSGetEnviron();
+#endif  // __APPLE__
+
   if (environ == NULL) {
     return false;
   }
-#endif  // __APPLE__
+  for (const char** p = const_cast<const char**>(environ); *p != NULL; ++p) {
+    std::string var = *p;
+    size_t pos = var.find('=');
+    if ((pos == std::string::npos) || ((pos + 1) > var.size())) {
+      continue;
+    }
 
-  if (environ != NULL) {
-    for (const char** p = const_cast<const char**>(environ); *p != NULL; ++p) {
-      std::string var = *p;
-      size_t pos = var.find('=');
-      if ((pos == std::string::npos) || ((pos + 1) > var.size())) {
-        continue;
-      }
-
-      std::string name = var.substr(0, pos);
-      if ((pos + 1) == var.size()) {
-        vars.insert(std::make_pair(name, " "));
-      } else {
-        vars.insert(std::make_pair(name, &(*p)[pos + 1]));
-      }
+    std::string name = var.substr(0, pos);
+    if ((pos + 1) == var.size()) {
+      vars.insert(std::make_pair(name, " "));
+    } else {
+      vars.insert(std::make_pair(name, &(*p)[pos + 1]));
     }
   }
 #endif  // !_WIN32