(nuttx) branch master updated: sched_sysinfo.c: coverity HIS_metric_violation: RETURN

[xiaoxiang]

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new 1900d4c8fb0 sched_sysinfo.c: coverity HIS_metric_violation: RETURN
1900d4c8fb0 is described below

commit 1900d4c8fb08fb22977b3676b5a1131caadb0f64
Author: hujun5 <huj...@xiaomi.com>
AuthorDate: Wed Aug 13 13:46:19 2025 +0800

    sched_sysinfo.c: coverity HIS_metric_violation: RETURN
    
    This change consolidates multiple return statements in the sysinfo() 
function
    into a single exit point and inverts the error condition to improve code 
structure
    and comply with MISRA HIS coding standards for safety-critical systems.
    
    Signed-off-by: hujun5 <huj...@xiaomi.com>
---
 sched/sched/sched_sysinfo.c | 67 +++++++++++++++++++++++----------------------
 1 file changed, 35 insertions(+), 32 deletions(-)

diff --git a/sched/sched/sched_sysinfo.c b/sched/sched/sched_sysinfo.c
index 081ea81c7e3..94d380a6b48 100644
--- a/sched/sched/sched_sysinfo.c
+++ b/sched/sched/sched_sysinfo.c
@@ -62,55 +62,58 @@ int sysinfo(FAR struct sysinfo *info)
 #if defined(MM_KERNEL_USRHEAP_INIT) || defined(CONFIG_MM_KERNEL_HEAP)
   struct mallinfo minfo;
 #endif
+  int ret = OK;
 
-  if (info == NULL)
+  if (info != NULL)
     {
-      set_errno(EINVAL);
-      return -1;
-    }
-
-  memset(info, 0, sizeof(*info));
+      memset(info, 0, sizeof(*info));
 
 #ifndef CONFIG_SCHED_CPULOAD_NONE
-  clock_cpuload(0, &cpuload);
-
-  /* On the simulator, you may hit cpuload.total == 0, but probably never
-   * on real hardware.
-   */
-
-  if (cpuload.total)
-    {
-      info->loads[0] = ((cpuload.total - cpuload.active) <<
-                         SI_LOAD_SHIFT) / cpuload.total;
-      info->loads[1] = info->loads[0];
-      info->loads[2] = info->loads[0];
-    }
+      clock_cpuload(0, &cpuload);
+
+      /* On the simulator, you may hit cpuload.total == 0, but probably never
+       * on real hardware.
+       */
+
+      if (cpuload.total)
+        {
+          info->loads[0] = ((cpuload.total - cpuload.active) <<
+                            SI_LOAD_SHIFT) / cpuload.total;
+          info->loads[1] = info->loads[0];
+          info->loads[2] = info->loads[0];
+        }
 #endif
 
 #ifdef MM_KERNEL_USRHEAP_INIT
-  minfo = kumm_mallinfo();
+      minfo = kumm_mallinfo();
 
-  info->totalram += minfo.arena;
-  info->freeram  += minfo.fordblks;
+      info->totalram += minfo.arena;
+      info->freeram  += minfo.fordblks;
 #endif
 
 #ifdef CONFIG_MM_KERNEL_HEAP
-  minfo = kmm_mallinfo();
+      minfo = kmm_mallinfo();
 
-  info->totalram += minfo.arena;
-  info->freeram  += minfo.fordblks;
+      info->totalram += minfo.arena;
+      info->freeram  += minfo.fordblks;
 #endif
 
 #ifdef CONFIG_MM_PGALLOC
-  mm_pginfo(&pginfo);
+      mm_pginfo(&pginfo);
 
-  info->totalram += pginfo.ntotal << MM_PGSHIFT;
-  info->freeram  += pginfo.nfree  << MM_PGSHIFT;
+      info->totalram += pginfo.ntotal << MM_PGSHIFT;
+      info->freeram  += pginfo.nfree  << MM_PGSHIFT;
 #endif
 
-  info->uptime   = TICK2SEC(clock_systime_ticks());
-  info->procs    = CONFIG_SMP_NCPUS;
-  info->mem_unit = 1;
+      info->uptime   = TICK2SEC(clock_systime_ticks());
+      info->procs    = CONFIG_SMP_NCPUS;
+      info->mem_unit = 1;
+    }
+  else
+    {
+      set_errno(EINVAL);
+      ret = -1;
+    }
 
-  return 0;
+  return ret;
 }