Date: Sun, 24 Jun 2012 18:12:40 GMT From: Pawel Pekala <pawel@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/169381: databases/libgda fix build with CLANG Message-ID: <201206241812.q5OICeEd009104@red.freebsd.org> Resent-Message-ID: <201206241820.q5OIK8pH023413@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 169381
>Category: ports
>Synopsis: databases/libgda fix build with CLANG
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Jun 24 18:20:08 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Pawel Pekala
>Release: 10.0-CURRENT
>Organization:
>Environment:
FreeBSD blaviken.slowicza.org 10.0-CURRENT FreeBSD 10.0-CURRENT #7: Sat Jun 23 10:34:22 CEST 2012 corn@blaviken.slowicza.org:/usr/obj/usr/src/sys/BLAVIKEN i386
>Description:
Add 2 patches fixing clang build all related to returning proper function return value.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -urN /usr/ports/databases/libgda/files/patch-lib_gda-server_gda-server-connection.c ./files/patch-lib_gda-server_gda-server-connection.c
--- /usr/ports/databases/libgda/files/patch-lib_gda-server_gda-server-connection.c 1970-01-01 01:00:00.000000000 +0100
+++ ./files/patch-lib_gda-server_gda-server-connection.c 2012-06-24 18:50:57.000000000 +0200
@@ -0,0 +1,41 @@
+--- lib/gda-server/gda-server-connection.c.orig 2012-06-24 18:42:20.000000000 +0200
++++ lib/gda-server/gda-server-connection.c 2012-06-24 18:47:17.000000000 +0200
+@@ -247,7 +247,7 @@
+ GdaServerConnection *cnc =
+ (GdaServerConnection *) bonobo_x_object (servant);
+
+- g_return_if_fail (GDA_IS_SERVER_CONNECTION (cnc));
++ g_return_val_if_fail (GDA_IS_SERVER_CONNECTION (cnc), NULL);
+
+ retval = gda_server_connection_create_table (cnc, (GDA_RowAttributes *) columns);
+ if (!retval)
+@@ -713,10 +713,10 @@
+ gchar *
+ gda_server_connection_sql2xml (GdaServerConnection * cnc, const gchar * sql)
+ {
+- g_return_if_fail (cnc != NULL);
+- g_return_if_fail (cnc->server_impl != NULL);
+- g_return_if_fail (cnc->server_impl->functions.connection_sql2xml !=
+- NULL);
++ g_return_val_if_fail (cnc != NULL, NULL);
++ g_return_val_if_fail (cnc->server_impl != NULL, NULL);
++ g_return_val_if_fail (cnc->server_impl->functions.connection_sql2xml !=
++ NULL, NULL);
+
+ return cnc->server_impl->functions.connection_sql2xml (cnc, sql);
+ }
+@@ -727,10 +727,10 @@
+ gchar *
+ gda_server_connection_xml2sql (GdaServerConnection * cnc, const gchar * xml)
+ {
+- g_return_if_fail (cnc != NULL);
+- g_return_if_fail (cnc->server_impl != NULL);
+- g_return_if_fail (cnc->server_impl->functions.connection_xml2sql !=
+- NULL);
++ g_return_val_if_fail (cnc != NULL, NULL);
++ g_return_val_if_fail (cnc->server_impl != NULL, NULL);
++ g_return_val_if_fail (cnc->server_impl->functions.connection_xml2sql !=
++ NULL, NULL);
+
+ return cnc->server_impl->functions.connection_xml2sql (cnc, xml);
+ }
diff -urN /usr/ports/databases/libgda/files/patch-providers_gda-default-server_gda-default-recordset.c ./files/patch-providers_gda-default-server_gda-default-recordset.c
--- /usr/ports/databases/libgda/files/patch-providers_gda-default-server_gda-default-recordset.c 1970-01-01 01:00:00.000000000 +0100
+++ ./files/patch-providers_gda-default-server_gda-default-recordset.c 2012-06-24 18:54:41.000000000 +0200
@@ -0,0 +1,11 @@
+--- providers/gda-default-server/gda-default-recordset.c.orig 2012-06-24 18:51:52.000000000 +0200
++++ providers/gda-default-server/gda-default-recordset.c 2012-06-24 18:52:59.000000000 +0200
+@@ -115,7 +115,7 @@
+ {
+ DEFAULT_Recordset *default_recset;
+
+- g_return_if_fail(recset != NULL);
++ g_return_val_if_fail(recset != NULL, -1);
+
+ default_recset = (DEFAULT_Recordset *) gda_server_recordset_get_user_data(recset);
+ if (default_recset) {
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206241812.q5OICeEd009104>