Fix #1220, Moved OS_DEBUG calls outside of rtems_rtl_lock and fixed f…

…ormatting
nasa · Mar 7, 2022 · 7f049e5 · 7f049e5
1 parent 60e877d
commit 7f049e5
Showing 1 changed file with 24 additions and 22 deletions.
diff --git a/src/os/rtems/src/os-impl-loader.c b/src/os/rtems/src/os-impl-loader.c
@@ -217,40 +217,42 @@ int32 OS_ModuleUnload_Impl(const OS_object_token_t *token)
  *-----------------------------------------------------------------*/
 int32 OS_ModuleGetInfo_Impl(const OS_object_token_t *token, OS_module_prop_t *module_prop)
 {
-    rtems_rtl_obj                       *obj; 
-    OS_impl_module_internal_record_t    *impl;
-    int32                               status = OS_ERROR;
+    rtems_rtl_obj *                   obj;
+    OS_impl_module_internal_record_t *impl;
+    int32                             status = OS_ERROR;
 
     impl = OS_OBJECT_TABLE_GET(OS_impl_module_table, *token);
-
-    /* Lock RTEMS runtime loader */ 
-    if(rtems_rtl_lock() != NULL){
 
-        /* Get RTL object from handle */ 
+    /* Lock RTEMS runtime loader */
+    if (rtems_rtl_lock() != NULL)
+    {
+        /* Get RTL object from handle and populate section info */
         obj = rtems_rtl_check_handle(impl->dl_handle);
 
-        if (obj == NULL)
-        {
-            OS_DEBUG("Error getting object information from handle\n");
-            module_prop->addr.valid = false;
-        }
-        else
+        if (obj != NULL)
         {
             module_prop->addr.valid        = true;
             module_prop->addr.code_address = obj->text_base;
-            module_prop->addr.code_size    = rtems_rtl_obj_text_size(obj); 
-            module_prop->addr.data_address = obj->data_base; 
-            module_prop->addr.data_size    = rtems_rtl_obj_data_size(obj); 
-            module_prop->addr.bss_address  = obj->bss_base; 
-            module_prop->addr.bss_size     = rtems_rtl_obj_bss_size(obj); 
+            module_prop->addr.code_size    = rtems_rtl_obj_text_size(obj);
+            module_prop->addr.data_address = obj->data_base;
+            module_prop->addr.data_size    = rtems_rtl_obj_data_size(obj);
+            module_prop->addr.bss_address  = obj->bss_base;
+            module_prop->addr.bss_size     = rtems_rtl_obj_bss_size(obj);
 
-            status = OS_SUCCESS; 
+            status = OS_SUCCESS;
         }
 
-        /* Unlock RTEMS runtime loader */ 
-        rtems_rtl_unlock(); 
+        /* Unlock RTEMS runtime loader, report error if applicable */
+        rtems_rtl_unlock();
+
+        if (obj == NULL)
+        {
+            OS_DEBUG("Error getting object information from handle\n");
+            module_prop->addr.valid = false;
+        }
     }
-    else{
+    else
+    {
         OS_DEBUG("Error locking RTEMS runtime loader\n");
         module_prop->addr.valid = false;
     }