Changeset 14682

Timestamp:

Feb 23, 2016, 5:07:43 AM (6 years ago)

Author:

mikedld

Message:

Fix warning for when 2nd iconv() argument is const

Location:

trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• cmake/FindICONV.cmake (modified) (2 diffs)
• libtransmission/utils.c (modified) (1 diff)

trunk/CMakeLists.txt

@@ -515 +515 @@
 if(ICONV_FOUND)
     add_definitions(-DHAVE_ICONV)
+    if(ICONV_SECOND_ARGUMENT_IS_CONST)
+        add_definitions(-DICONV_SECOND_ARGUMENT_IS_CONST)
+    endif()
 endif()
 

trunk/cmake/FindICONV.cmake

@@ -23 +23 @@
     set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES})
 
-    check_c_source_compiles(
-        "
+    check_c_source_compiles("
         #include <iconv.h>
         int main ()
@@ -35 +34 @@
             iconv (conv, &in, &ilen, &out, &olen);
             return 0;
-        }" ICONV_SECOND_ARGUMENT_IS_CONST)
+        }"
+        ICONV_SECOND_ARGUMENT_IS_CONST
+        FAIL_REGEX "incompatible pointer type"
+        FAIL_REGEX "discards qualifiers in nested pointer types")
 
     set(CMAKE_REQUIRED_INCLUDES)

trunk/libtransmission/utils.c

@@ -1035 +1035 @@
   for (i=0; !ret && i<encoding_count; ++i)
     {
+#ifdef ICONV_SECOND_ARGUMENT_IS_CONST
+      const char * inbuf = in;
+#else
       char * inbuf = (char*) in;
+#endif
       char * outbuf = out;
       size_t inbytesleft = inlen;