Merge pull request #584 from jf2048/no-log-escaping-2

glib: Correctly cast log messages to C char types

Author: sdroege

glib/src/bridged_logging.rs

@@ -122,8 +122,8 @@ impl GlibLogger {
             crate::ffi::g_log(
                 domain.to_glib_none().0,
                 GlibLogger::level_to_glib(level),
-                b"%s\0".as_ptr() as *const i8,
-                ToGlibPtr::<*const i8>::to_glib_none(message).0,
+                b"%s\0".as_ptr() as *const _,
+                ToGlibPtr::<*const std::os::raw::c_char>::to_glib_none(message).0,
             );
         }
     }
@@ -153,8 +153,8 @@ impl GlibLogger {
                 file.to_glib_none().0,
                 line_str.to_glib_none().0,
                 func.to_glib_none().0,
-                b"%s\0".as_ptr() as *const i8,
-                ToGlibPtr::<*const i8>::to_glib_none(message).0,
+                b"%s\0".as_ptr() as *const _,
+                ToGlibPtr::<*const std::os::raw::c_char>::to_glib_none(message).0,
             );
         }
     }

glib/src/log.rs

@@ -347,8 +347,8 @@ macro_rules! g_log_inner {
                 $crate::ffi::g_log(
                     $log_domain,
                     $log_level.into_glib(),
-                    b"%s\0".as_ptr() as *const i8,
-                    ToGlibPtr::<*const i8>::to_glib_none(&w.into_string()).0,
+                    b"%s\0".as_ptr() as *const _,
+                    ToGlibPtr::<*const std::os::raw::c_char>::to_glib_none(&w.into_string()).0,
                 );
             }
         }
@@ -647,8 +647,8 @@ macro_rules! g_print_inner {
         if !std::write!(&mut w, $format, $($arg),*).is_err() {
             unsafe {
                 $crate::ffi::$func(
-                    b"%s\0".as_ptr() as *const i8,
-                    ToGlibPtr::<*const i8>::to_glib_none(&w.into_string()).0,
+                    b"%s\0".as_ptr() as *const _,
+                    ToGlibPtr::<*const std::os::raw::c_char>::to_glib_none(&w.into_string()).0,
                 );
             }
         }