Bug#742437: libinfinity: fails to build with clang instead of gcc

[Nicolas Sévelin-Radiguet]

Source: libinfinity
Version: 0.5.5-1
Severity: minor
Tags: patch
User: pkg-llvm-t...@lists.alioth.debian.org
Usertags: clang-ftbfs

Dear Maintainer,

Your package fails to build with clang instead of gcc. [-Wreturn-type]
The attached patch fixes it.
Buildlogs and patch are here:
https://github.com/nonas/debian-clang/tree/master/buildlogs/libinfinity

Regards,
Nicolas

-- System Information:
Debian Release: jessie/sid
  APT prefers testing-updates
  APT policy: (500, 'testing-updates'), (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.13-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Description: fix FTBFS with clang instead of gcc
Author: Nicolas Sévelin-Radiguet <nic...@free.fr>
Last-Update: 2014-03-23

--- a/libinfinity/communication/inf-communication-method.c
+++ b/libinfinity/communication/inf-communication-method.c
@@ -299,13 +299,13 @@
 {
   InfCommunicationMethodIface* iface;
 
-  g_return_if_fail(INF_COMMUNICATION_IS_METHOD(method));
-  g_return_if_fail(INF_IS_XML_CONNECTION(connection));
-  g_return_if_fail(inf_communication_method_is_member(method, connection));
-  g_return_if_fail(xml != NULL);
+  g_return_val_if_fail(INF_COMMUNICATION_IS_METHOD(method), NULL);
+  g_return_val_if_fail(INF_IS_XML_CONNECTION(connection), NULL);
+  g_return_val_if_fail(inf_communication_method_is_member(method, connection), NULL);
+  g_return_val_if_fail(xml != NULL, NULL);
 
   iface = INF_COMMUNICATION_METHOD_GET_IFACE(method);
-  g_return_if_fail(iface->received != NULL);
+  g_return_val_if_fail(iface->received != NULL, NULL);
 
   return iface->received(method, connection, xml);
 }