Merge pull request #1226 from nasa/integration-candidate

osal Integration candidate: Caelum-rc4+dev4
nasa · Feb 25, 2022 · 92fbf08 · 92fbf08
2 parents b095858 + 776de07
commit 92fbf08
Show file tree

Hide file tree

Showing 210 changed files with 309 additions and 229 deletions.
diff --git a/README.md b/README.md
@@ -11,6 +11,13 @@ The autogenerated OSAL user's guide can be viewed at <https://github.com/nasa/cF
 
 ## Version History
 
+### Development Build: v6.0.0-rc4+dev42
+
+- Resolve UT uninitialized variable warnings
+- Add ut_assert to doxygen and fix warnings
+- Protect if OS_FDGetInfo called on socket
+- See <https://github.com/nasa/osal/pull/1226> and <https://github.com/nasa/cFS/pull/432>
+
 ### Development Build: v6.0.0-rc4+dev32
 
 - Typesafe definition of osal_id_t

diff --git a/docs/osal-detaildesign.doxyfile.in b/docs/osal-detaildesign.doxyfile.in
@@ -5,3 +5,5 @@
 INPUT    += @osal_MISSION_DIR@/src/os
 INPUT    += @osal_MISSION_DIR@/src/bsp
 
+# Include ut_assert documentation in detail design document
+INPUT    += @osal_MISSION_DIR@/ut_assert
diff --git a/src/bsp/shared/src/osapi-bsp.c b/src/bsp/shared/src/osapi-bsp.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-bsp.c
+ * \file
  * \author   [email protected]
  *
  * This file  contains some of the OS APIs abstraction layer code

diff --git a/src/os/inc/osapi-version.h b/src/os/inc/osapi-version.h
@@ -36,7 +36,7 @@
 /*
  * Development Build Macro Definitions
  */
-#define OS_BUILD_NUMBER   32
+#define OS_BUILD_NUMBER   42
 #define OS_BUILD_BASELINE "v6.0.0-rc4"
 
 /*

diff --git a/src/os/portable/os-impl-bsd-select.c b/src/os/portable/os-impl-bsd-select.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file   os-impl-bsd-select.c
+ * \file
  * \author [email protected]
  *
  * Purpose: This file contains wrappers around the select() system call
@@ -126,9 +126,10 @@ static int32 OS_FdSet_ConvertIn_Impl(int *os_maxfd, fd_set *os_set, const OS_FdS
  *
  * This un-sets bits in OSAL_set that are set in the OS_set
  *
- * \param[in]      OS_set   The fd_set from select
- * \param[in, out] OSAL_set The OS_FdSet updated by this helper
- *-----------------------------------------------------------------*/
+ * \param[in]     OS_set   The fd_set from select
+ * \param[in,out] OSAL_set The OS_FdSet updated by this helper
+ */
+/*-----------------------------------------------------------------*/
 static void OS_FdSet_ConvertOut_Impl(fd_set *OS_set, OS_FdSet *OSAL_set)
 {
     size_t       offset;

diff --git a/src/os/portable/os-impl-bsd-sockets.c b/src/os/portable/os-impl-bsd-sockets.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file   os-impl-bsd-sockets.c
+ * \file
  * \author [email protected]
  *
  * Purpose: This file contains the network functionality for

diff --git a/src/os/portable/os-impl-console-bsp.c b/src/os/portable/os-impl-console-bsp.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file   os-impl-console-bsp.c
+ * \file
  * \author [email protected]
  *
  * Purpose:

diff --git a/src/os/portable/os-impl-no-loader.c b/src/os/portable/os-impl-no-loader.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-no-loader.c
+ * \file
  * \author   [email protected]
  *
  * This file contains a module loader implementation for systems

diff --git a/src/os/portable/os-impl-no-network.c b/src/os/portable/os-impl-no-network.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-no-network.c
+ * \file
  * \author   [email protected]
  *
  * This file contains the network implementation for

diff --git a/src/os/portable/os-impl-no-shell.c b/src/os/portable/os-impl-no-shell.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-no-shell.c
+ * \file
  *
  * No shell implementation, returns OS_ERR_NOT_IMPLEMENTED for calls
  */

diff --git a/src/os/portable/os-impl-no-sockets.c b/src/os/portable/os-impl-no-sockets.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file   os-impl-no-sockets.c
+ * \file
  * \author [email protected]
  *
  * Purpose: All functions return OS_ERR_NOT_IMPLEMENTED.

diff --git a/src/os/portable/os-impl-no-symtab.c b/src/os/portable/os-impl-no-symtab.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-no-symtab.c
+ * \file
  * \author   [email protected]
  *
  * This file contains a symbol table implementation for systems

diff --git a/src/os/portable/os-impl-posix-dirs.c b/src/os/portable/os-impl-posix-dirs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-posix-dirs.c
+ * \file
  * \author   [email protected]
  *
  * This file Contains all of the api calls for manipulating files

diff --git a/src/os/portable/os-impl-posix-dl-loader.c b/src/os/portable/os-impl-posix-dl-loader.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-posix-dl-loader.c
+ * \file
  * \author   [email protected]
  *
  * This file contains a module loader implementation for systems

diff --git a/src/os/portable/os-impl-posix-dl-symtab.c b/src/os/portable/os-impl-posix-dl-symtab.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file   os-impl-posix-dl-symtab.c
+ * \file
  * \author [email protected]
  *
  * This file contains a module loader implementation for systems

diff --git a/src/os/portable/os-impl-posix-files.c b/src/os/portable/os-impl-posix-files.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file   os-impl-posix-files.c
+ * \file
  * \author [email protected]
  *
  * This file Contains all of the api calls for manipulating files

diff --git a/src/os/portable/os-impl-posix-gettime.c b/src/os/portable/os-impl-posix-gettime.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file   os-impl-posix-gettime.c
+ * \file
  * \author [email protected]
  *
  * This file contains implementation for OS_GetLocalTime() and OS_SetLocalTime()

diff --git a/src/os/portable/os-impl-posix-io.c b/src/os/portable/os-impl-posix-io.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file   os-impl-posix-io.c
+ * \file
  * \author [email protected]
  *
  * This file contains generic calls for manipulating filehandles

diff --git a/src/os/portable/os-impl-posix-network.c b/src/os/portable/os-impl-posix-network.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-posix-network.c
+ * \file
  * \author   [email protected]
  *
  * This file contains the network functionality for

diff --git a/src/os/posix/src/os-impl-binsem.c b/src/os/posix/src/os-impl-binsem.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-binsem.c
+ * \file
  * \ingroup  posix
  * \author   [email protected]
  *

diff --git a/src/os/posix/src/os-impl-common.c b/src/os/posix/src/os-impl-common.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-common.c
+ * \file
  * \ingroup  posix
  * \author   [email protected]
  *

diff --git a/src/os/posix/src/os-impl-console.c b/src/os/posix/src/os-impl-console.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-console.c
+ * \file
  * \ingroup  posix
  * \author   [email protected]
  *

diff --git a/src/os/posix/src/os-impl-countsem.c b/src/os/posix/src/os-impl-countsem.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-countsem.c
+ * \file
  * \ingroup  posix
  * \author   [email protected]
  *

diff --git a/src/os/posix/src/os-impl-dirs.c b/src/os/posix/src/os-impl-dirs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-dirs.c
+ * \file
  * \ingroup  posix
  * \author   [email protected]
  *

diff --git a/src/os/posix/src/os-impl-errors.c b/src/os/posix/src/os-impl-errors.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-errors.c
+ * \file
  * \ingroup  posix
  * \author   [email protected]
  *

diff --git a/src/os/posix/src/os-impl-files.c b/src/os/posix/src/os-impl-files.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-files.c
+ * \file
  * \ingroup  posix
  * \author   [email protected]
  *

diff --git a/src/os/posix/src/os-impl-filesys.c b/src/os/posix/src/os-impl-filesys.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-filesys.c
+ * \file
  * \ingroup  posix
  * \author   [email protected]
  *

diff --git a/src/os/posix/src/os-impl-heap.c b/src/os/posix/src/os-impl-heap.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-heap.c
+ * \file
  * \ingroup  posix
  * \author   [email protected]
  *

diff --git a/src/os/posix/src/os-impl-idmap.c b/src/os/posix/src/os-impl-idmap.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-idmap.c
+ * \file
  * \ingroup  posix
  * \author   [email protected]
  *

diff --git a/src/os/posix/src/os-impl-loader.c b/src/os/posix/src/os-impl-loader.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-loader.c
+ * \file
  * \ingroup  posix
  * \author   [email protected]
  *

diff --git a/src/os/posix/src/os-impl-mutex.c b/src/os/posix/src/os-impl-mutex.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-mutex.c
+ * \file
  * \ingroup  posix
  * \author   [email protected]
  *

diff --git a/src/os/posix/src/os-impl-no-module.c b/src/os/posix/src/os-impl-no-module.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-no-module.c
+ * \file
  * \ingroup  posix
  * \author   [email protected]
  *

diff --git a/src/os/posix/src/os-impl-queues.c b/src/os/posix/src/os-impl-queues.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-queues.c
+ * \file
  * \ingroup  posix
  * \author   [email protected]
  *

diff --git a/src/os/posix/src/os-impl-shell.c b/src/os/posix/src/os-impl-shell.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-shell.c
+ * \file
  * \ingroup  posix
  * \author   [email protected]
  *

diff --git a/src/os/posix/src/os-impl-tasks.c b/src/os/posix/src/os-impl-tasks.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-tasks.c
+ * \file
  * \ingroup  posix
  * \author   [email protected]
  *

diff --git a/src/os/posix/src/os-impl-timebase.c b/src/os/posix/src/os-impl-timebase.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-timebase.c
+ * \file
  * \ingroup  posix
  * \author   [email protected]
  *

diff --git a/src/os/rtems/src/os-impl-binsem.c b/src/os/rtems/src/os-impl-binsem.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-binsem.c
+ * \file
  * \ingroup  rtems
  * \author   [email protected]
  *

diff --git a/src/os/rtems/src/os-impl-common.c b/src/os/rtems/src/os-impl-common.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-common.c
+ * \file
  * \ingroup  rtems
  * \author   [email protected]
  *

diff --git a/src/os/rtems/src/os-impl-console.c b/src/os/rtems/src/os-impl-console.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-console.c
+ * \file
  * \ingroup  rtems
  * \author   [email protected]
  *

diff --git a/src/os/rtems/src/os-impl-countsem.c b/src/os/rtems/src/os-impl-countsem.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-countsem.c
+ * \file
  * \ingroup  rtems
  * \author   [email protected]
  *

diff --git a/src/os/rtems/src/os-impl-dirs.c b/src/os/rtems/src/os-impl-dirs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-dirs.c
+ * \file
  * \ingroup  rtems
  * \author   [email protected]
  *

diff --git a/src/os/rtems/src/os-impl-errors.c b/src/os/rtems/src/os-impl-errors.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-errors.c
+ * \file
  * \ingroup  rtems
  * \author   [email protected]
  *
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,7 @@ @@
      */
     /**
-     * \file     osapi-bsp.c
+     * \file
      * \author   [email protected]
      *
      * This file  contains some of the OS APIs abstraction layer code
@@ Expand Down @@