[gnome-db] [PATCH] gcc 3.4 compliance

[Jürg Billeter <j bitron ch>]

Hi

libgda and libgnomedb 1.1.2 don't compile with gcc 3.4.0; there occur
many "label at end of compund statement" errors. The attached patches
shall correct this build problem.

Jürg

diff -uNr libgda-1.1.2.orig/libgda/gda-util.c libgda-1.1.2/libgda/gda-util.c
--- libgda-1.1.2.orig/libgda/gda-util.c	2004-01-03 21:37:33.000000000 +0100
+++ libgda-1.1.2/libgda/gda-util.c	2004-05-05 17:36:26.160994650 +0200
@@ -60,7 +60,7 @@
 	case GDA_VALUE_TYPE_TIME : return "time";
 	case GDA_VALUE_TYPE_TIMESTAMP : return "timestamp";
 	case GDA_VALUE_TYPE_TINYINT : return "tinyint";
-	default:
+	default: ;
 	}
 
 	return "string";
diff -uNr libgda-1.1.2.orig/providers/ldap/gda-ldap-provider.c libgda-1.1.2/providers/ldap/gda-ldap-provider.c
--- libgda-1.1.2.orig/providers/ldap/gda-ldap-provider.c	2003-03-20 21:00:49.000000000 +0100
+++ libgda-1.1.2/providers/ldap/gda-ldap-provider.c	2004-05-05 17:44:12.245337555 +0200
@@ -275,7 +275,7 @@
 	switch (feature) {
 	case GDA_CONNECTION_FEATURE_SQL :
 		return TRUE;
-	default :
+	default : ;
 	}
 
 	return FALSE;
@@ -466,7 +466,7 @@
 		return get_ldap_tables (cnc, params);
 	case GDA_CONNECTION_SCHEMA_TYPES :
 		return get_ldap_types (cnc, params);
-	default :
+	default : ;
 	}
 
 	return NULL;
diff -uNr libgda-1.1.2.orig/providers/mdb/gda-mdb-provider.c libgda-1.1.2/providers/mdb/gda-mdb-provider.c
--- libgda-1.1.2.orig/providers/mdb/gda-mdb-provider.c	2003-11-26 22:08:33.000000000 +0100
+++ libgda-1.1.2/providers/mdb/gda-mdb-provider.c	2004-05-05 17:50:05.950346143 +0200
@@ -389,7 +389,7 @@
 			g_strfreev (arr);
 		}
 		break;
-	default :
+	default : ;
 	}
 
 	return reclist;
@@ -438,7 +438,7 @@
 	case GDA_CONNECTION_FEATURE_PROCEDURES :
 	case GDA_CONNECTION_FEATURE_SQL :
 		return TRUE;
-	default :
+	default : ;
 	}
 
 	return FALSE;
diff -uNr libgda-1.1.2.orig/providers/mysql/gda-mysql-provider.c libgda-1.1.2/providers/mysql/gda-mysql-provider.c
--- libgda-1.1.2.orig/providers/mysql/gda-mysql-provider.c	2003-10-18 18:46:26.000000000 +0200
+++ libgda-1.1.2/providers/mysql/gda-mysql-provider.c	2004-05-05 17:45:50.576108069 +0200
@@ -510,7 +510,7 @@
 
 		g_free (str);
 		break;
-	default:
+	default: ;
 	}
 
 	return reclist;
@@ -655,7 +655,7 @@
 	case GDA_CONNECTION_FEATURE_SQL :
 	case GDA_CONNECTION_FEATURE_TRANSACTIONS :
 		return TRUE;
-	default :
+	default : ;
 	}
 
 	return FALSE;
@@ -1186,7 +1186,7 @@
 		return get_mysql_tables (cnc, params);
 	case GDA_CONNECTION_SCHEMA_TYPES :
 		return get_mysql_types (cnc, params);
-	default :
+	default : ;
 	}
 
 	return NULL;
diff -uNr libgda-1.1.2.orig/providers/oracle/utils.c libgda-1.1.2/providers/oracle/utils.c
--- libgda-1.1.2.orig/providers/oracle/utils.c	2003-04-29 11:48:04.000000000 +0200
+++ libgda-1.1.2/providers/oracle/utils.c	2004-05-05 17:46:29.272326818 +0200
@@ -110,7 +110,7 @@
 			break;
 		case OCI_HTYPE_ENV:
 			gda_connection_add_error (cnc, gda_oracle_make_error (priv_data->henv, type, file, line));
-		default:
+		default: ;
 		}
 		break;
 	default:
diff -uNr libgda-1.1.2.orig/providers/sqlite/gda-sqlite-provider.c libgda-1.1.2/providers/sqlite/gda-sqlite-provider.c
--- libgda-1.1.2.orig/providers/sqlite/gda-sqlite-provider.c	2004-04-15 12:15:44.000000000 +0200
+++ libgda-1.1.2/providers/sqlite/gda-sqlite-provider.c	2004-05-05 17:39:48.563522751 +0200
@@ -624,7 +624,7 @@
 	case GDA_CONNECTION_FEATURE_TRIGGERS :
 	case GDA_CONNECTION_FEATURE_VIEWS :
 		return TRUE;
-	default:
+	default: ;
 	}
 
 	return FALSE;
@@ -810,7 +810,7 @@
 		return get_tables (cnc);
 	case GDA_CONNECTION_SCHEMA_TYPES :
 		return get_types ();
-	default:
+	default: ;
 	}
 
 	return NULL;
diff -uNr libgda-1.1.2.orig/providers/xml/gda-xml-provider.c libgda-1.1.2/providers/xml/gda-xml-provider.c
--- libgda-1.1.2.orig/providers/xml/gda-xml-provider.c	2003-09-02 01:44:07.000000000 +0200
+++ libgda-1.1.2/providers/xml/gda-xml-provider.c	2004-05-05 17:49:18.728624781 +0200
@@ -681,7 +681,7 @@
 		return get_tables (cnc, xmldb);
 	case GDA_CONNECTION_SCHEMA_TYPES :
 		return get_types (cnc);
-	default :
+	default : ;
 	}
 
 	return NULL;

diff -uNr libgnomedb-1.1.2.orig/libgnomedb/gnome-db-form.c libgnomedb-1.1.2/libgnomedb/gnome-db-form.c
--- libgnomedb-1.1.2.orig/libgnomedb/gnome-db-form.c	2004-01-15 12:58:48.000000000 +0100
+++ libgnomedb-1.1.2/libgnomedb/gnome-db-form.c	2004-05-05 18:00:11.317243086 +0200
@@ -582,6 +582,6 @@
 		form->priv->navigator_current_row = row;
 		show_navigator_row (form);
 		break;
-	case GNOME_DB_FORM_TYPE_LIST :
+	case GNOME_DB_FORM_TYPE_LIST : ;
 	}
 }