[SCM] UID Wrapper Repository - branch master updated
Andreas Schneider
asn at samba.org
Mon Aug 13 10:05:52 UTC 2018
The branch, master has been updated
via 77f7ce8 ctest: Move to new dashboard
via 9d79861 Rename COPYING to LICENSE
via 4918b93 uwrap: Suppress fall through warnings
via 30e36d7 cpack: Do not package build dirs in source tarball
via a71c89f cmake: Replace deprecated get_target_property()
from 1c793e1 uwrap: Improve parsing IDs from env variables
https://git.samba.org/?p=uid_wrapper.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 77f7ce8d54dcf44fe63a3290943d8987adc26a9a
Author: Andreas Schneider <asn at samba.org>
Date: Thu Jul 5 10:15:50 2018 +0200
ctest: Move to new dashboard
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 9d79861ed979a2ca01e4a97cf66385c759332a74
Author: Andreas Schneider <asn at samba.org>
Date: Fri Jun 22 08:50:38 2018 +0200
Rename COPYING to LICENSE
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 4918b93a26d9f82290e00bd15614a48963b23e3a
Author: Andreas Schneider <asn at samba.org>
Date: Thu Aug 3 10:48:45 2017 +0200
uwrap: Suppress fall through warnings
Suppress fall through warning in switch statement where the fall trough
is intentional.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 30e36d7feb38ad2d8dad07e8b4acc6b23149a3d1
Author: Andreas Schneider <asn at samba.org>
Date: Fri Jun 22 08:59:32 2018 +0200
cpack: Do not package build dirs in source tarball
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit a71c89f1ba48acaebff743853d10a02757ad1a0b
Author: Andreas Schneider <asn at samba.org>
Date: Fri Jun 22 08:56:02 2018 +0200
cmake: Replace deprecated get_target_property()
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
-----------------------------------------------------------------------
Summary of changes:
CPackConfig.cmake | 4 ++--
CTestConfig.cmake | 6 +++---
ConfigureChecks.cmake | 27 +++++++++++++++++++++++++++
COPYING => LICENSE | 0
config.h.cmake | 1 +
src/CMakeLists.txt | 7 +------
src/uid_wrapper.c | 12 ++++++++++--
7 files changed, 44 insertions(+), 13 deletions(-)
rename COPYING => LICENSE (100%)
Changeset truncated at 500 lines:
diff --git a/CPackConfig.cmake b/CPackConfig.cmake
index 6c40f4d..e1b83ac 100644
--- a/CPackConfig.cmake
+++ b/CPackConfig.cmake
@@ -7,7 +7,7 @@ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The SSH library")
set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README")
set(CPACK_PACKAGE_VENDOR "The SSH Library Development Team")
set(CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME})
-set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
### versions
@@ -19,7 +19,7 @@ set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSIO
### source generator
set(CPACK_SOURCE_GENERATOR "TGZ")
-set(CPACK_SOURCE_IGNORE_FILES "~$;[.]swp$;/[.]svn/;/[.]git/;.gitignore;/build/;/obj*/;tags;cscope.*")
+set(CPACK_SOURCE_IGNORE_FILES "~$;[.]swp$;/[.]svn/;/[.]git/;.gitignore;/build*;/obj*;tags;cscope.*")
set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
if (WIN32)
diff --git a/CTestConfig.cmake b/CTestConfig.cmake
index 19bd287..7ba804c 100644
--- a/CTestConfig.cmake
+++ b/CTestConfig.cmake
@@ -1,9 +1,9 @@
set(UPDATE_TYPE "true")
set(CTEST_PROJECT_NAME "uid_wrapper")
-set(CTEST_NIGHTLY_START_TIME "01:00:00 CET")
+set(CTEST_NIGHTLY_START_TIME "01:00:00 UTC")
set(CTEST_DROP_METHOD "https")
-set(CTEST_DROP_SITE "mock.cryptomilk.org")
-set(CTEST_DROP_LOCATION "/submit.php?project=uidwrapper")
+set(CTEST_DROP_SITE "test.cmocka.org")
+set(CTEST_DROP_LOCATION "/submit.php?project=${CTEST_PROJECT_NAME}")
set(CTEST_DROP_SITE_CDASH TRUE)
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 150d89b..910a255 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -188,6 +188,33 @@ int main(void) {
return 0;
}" HAVE_FUNCTION_ATTRIBUTE_FORMAT)
+check_c_source_compiles("
+#define FALL_THROUGH __attribute__((fallthrough))
+
+enum direction_e {
+ UP = 0,
+ DOWN,
+};
+
+int main(void) {
+ enum direction_e key = UP;
+ int i = 10;
+ int j = 0;
+
+ switch (key) {
+ case UP:
+ i = 5;
+ FALL_THROUGH;
+ case DOWN:
+ j = i * 2;
+ break;
+ default:
+ break;
+ }
+
+ return 0;
+}" HAVE_FALLTHROUGH_ATTRIBUTE)
+
# SYSTEM LIBRARIES
check_library_exists(dl dlopen "" HAVE_LIBDL)
diff --git a/COPYING b/LICENSE
similarity index 100%
rename from COPYING
rename to LICENSE
diff --git a/config.h.cmake b/config.h.cmake
index b862048..c32af7b 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -68,6 +68,7 @@
#cmakedefine HAVE_DESTRUCTOR_ATTRIBUTE 1
#cmakedefine HAVE_ADDRESS_SANITIZER_ATTRIBUTE 1
#cmakedefine HAVE_FUNCTION_ATTRIBUTE_FORMAT 1
+#cmakedefine HAVE_FALLTHROUGH_ATTRIBUTE 1
/*************************** ENDIAN *****************************/
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9dbfb75..b5a0604 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -21,9 +21,4 @@ install(
ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
)
-# This needs to be at the end
-if (POLICY CMP0026)
- cmake_policy(SET CMP0026 OLD)
-endif()
-get_target_property(UWRAP_LOCATION uid_wrapper LOCATION)
-set(UID_WRAPPER_LOCATION ${UWRAP_LOCATION} PARENT_SCOPE)
+set(UID_WRAPPER_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}uid_wrapper${CMAKE_SHARED_LIBRARY_SUFFIX}" PARENT_SCOPE)
diff --git a/src/uid_wrapper.c b/src/uid_wrapper.c
index 9c4b0ee..c362d41 100644
--- a/src/uid_wrapper.c
+++ b/src/uid_wrapper.c
@@ -88,6 +88,14 @@
#define PRINTF_ATTRIBUTE(a,b)
#endif /* HAVE_FUNCTION_ATTRIBUTE_FORMAT */
+#ifndef FALL_THROUGH
+# ifdef HAVE_FALLTHROUGH_ATTRIBUTE
+# define FALL_THROUGH __attribute__ ((fallthrough))
+# else /* HAVE_FALLTHROUGH_ATTRIBUTE */
+# define FALL_THROUGH
+# endif /* HAVE_FALLTHROUGH_ATTRIBUTE */
+#endif /* FALL_THROUGH */
+
#define UWRAP_DLIST_ADD(list,item) do { \
if (!(list)) { \
(item)->prev = NULL; \
@@ -392,9 +400,9 @@ static void *uwrap_load_lib_handle(enum uwrap_lib lib)
switch (lib) {
case UWRAP_LIBNSL:
- /* FALL TROUGH */
+ FALL_THROUGH;
case UWRAP_LIBSOCKET:
- /* FALL TROUGH */
+ FALL_THROUGH;
case UWRAP_LIBC:
handle = uwrap.libc.handle;
if (handle == NULL) {
--
UID Wrapper Repository
More information about the samba-cvs
mailing list