[SCM] Socket Wrapper Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  25d0e92 echo_srv: Fix a build warning.
       via  04d0275 swrap: Don't build with swrap_str_lib() if NDEBUG is defined.
       via  48db034 cmake: Fix linking echo_srv on Solaris.
       via  26019f9 cmake: Increase required cmake version number.
      from  c01846d Fix formatting of variables of type pid_t

http://gitweb.samba.org/?p=socket_wrapper.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 25d0e92c8c4ca13b5275448a67e5f6c5690a1d0e
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Dec 12 09:07:54 2013 +0100

    echo_srv: Fix a build warning.

commit 04d0275dd1d7c937076857547aaa9fc6afb3c8a8
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Dec 12 09:05:55 2013 +0100

    swrap: Don't build with swrap_str_lib() if NDEBUG is defined.
    
    This fixes a compile warning on optimized builds.

commit 48db0346ceb93254ffbe7ffdf795e162867aa8e8
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Dec 12 08:50:43 2013 +0100

    cmake: Fix linking echo_srv on Solaris.

commit 26019f9dfaad0840742938d4aff904584eb01edf
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Dec 11 19:50:59 2013 +0100

    cmake: Increase required cmake version number.
    
    We need CheckPrototypeDefinition.

-----------------------------------------------------------------------

Summary of changes:
 CMakeLists.txt       |    2 +-
 src/socket_wrapper.c |    2 ++
 tests/CMakeLists.txt |    1 +
 tests/echo_srv.c     |    2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9dfe3ed..50674ba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 project(socket_wrapper C)
 
 # Required cmake version
-cmake_minimum_required(VERSION 2.8.0)
+cmake_minimum_required(VERSION 2.8.5)
 
 # global needed variables
 set(APPLICATION_NAME ${PROJECT_NAME})
diff --git a/src/socket_wrapper.c b/src/socket_wrapper.c
index addcc17..0fcdb99 100644
--- a/src/socket_wrapper.c
+++ b/src/socket_wrapper.c
@@ -355,6 +355,7 @@ enum swrap_lib {
     SWRAP_LIBSOCKET,
 };
 
+#ifndef NDEBUG
 static const char *swrap_str_lib(enum swrap_lib lib)
 {
 	switch (lib) {
@@ -369,6 +370,7 @@ static const char *swrap_str_lib(enum swrap_lib lib)
 	/* Compiler would warn us about unhandled enum value if we get here */
 	return "unknown";
 }
+#endif
 
 static void *swrap_load_lib_handle(enum swrap_lib lib)
 {
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 1154561..9de698e 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -10,6 +10,7 @@ set(TORTURE_LIBRARY torture)
 
 # RFC862 echo server
 add_executable(echo_srv echo_srv.c)
+target_link_libraries(echo_srv ${SWRAP_REQUIRED_LIBRARIES})
 
 add_library(${TORTURE_LIBRARY} STATIC torture.c)
 target_link_libraries(${TORTURE_LIBRARY}
diff --git a/tests/echo_srv.c b/tests/echo_srv.c
index b290ca8..dd6fafd 100644
--- a/tests/echo_srv.c
+++ b/tests/echo_srv.c
@@ -260,7 +260,7 @@ static void echo(int sock, struct echo_srv_opts *opts)
 int main(int argc, char **argv)
 {
     int ret;
-    int sock;
+    int sock = -1;
     struct echo_srv_opts opts;
     int opt;
     int optindex;


-- 
Socket Wrapper Repository