diff options
| author | kwm <kwm@FreeBSD.org> | 2012-07-13 19:46:26 +0800 |
|---|---|---|
| committer | kwm <kwm@FreeBSD.org> | 2012-07-13 19:46:26 +0800 |
| commit | 7d657c6dc1bde5e4d13bfe93358cb99e2d3a31bd (patch) | |
| tree | 1db5dc3a3d5b2e2cde0722fdf3448a15cbc6d3e1 /databases | |
| parent | c5ab8fd529f64850cb2685a8d0de3c67f41d26e2 (diff) | |
| download | freebsd-ports-gnome-7d657c6dc1bde5e4d13bfe93358cb99e2d3a31bd.tar.gz freebsd-ports-gnome-7d657c6dc1bde5e4d13bfe93358cb99e2d3a31bd.tar.zst freebsd-ports-gnome-7d657c6dc1bde5e4d13bfe93358cb99e2d3a31bd.zip | |
Fix the build with clang.
PR: ports/169381
Submitted by: pawel@
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/libgda/files/patch-lib_gda-server_gda-server-connection.c | 41 | ||||
| -rw-r--r-- | databases/libgda/files/patch-providers_gda-default-server_gda-default-recordset.c | 11 |
2 files changed, 52 insertions, 0 deletions
diff --git a/databases/libgda/files/patch-lib_gda-server_gda-server-connection.c b/databases/libgda/files/patch-lib_gda-server_gda-server-connection.c new file mode 100644 index 000000000000..c585f4f4a484 --- /dev/null +++ b/databases/libgda/files/patch-lib_gda-server_gda-server-connection.c @@ -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 --git a/databases/libgda/files/patch-providers_gda-default-server_gda-default-recordset.c b/databases/libgda/files/patch-providers_gda-default-server_gda-default-recordset.c new file mode 100644 index 000000000000..695c33a46419 --- /dev/null +++ b/databases/libgda/files/patch-providers_gda-default-server_gda-default-recordset.c @@ -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) {
\ No newline at end of file |