libgda r3266 - in trunk: . libgda libgda/sqlite providers/skel-implementation/capi
- From: murrayc svn gnome org
- To: svn-commits-list gnome org
- Subject: libgda r3266 - in trunk: . libgda libgda/sqlite providers/skel-implementation/capi
- Date: Mon, 15 Dec 2008 12:43:10 +0000 (UTC)
Author: murrayc
Date: Mon Dec 15 12:43:10 2008
New Revision: 3266
URL: http://svn.gnome.org/viewvc/libgda?rev=3266&view=rev
Log:
2008-12-15 Murray Cumming <murrayc murrayc com>
* libgda/gda-connection.h:
* libgda/gda-data-comparator.h:
* libgda/gda-meta-store.h: Removed trailing , in enums to avoid
warnings.
* libgda/gda-connection.c:
* libgda/sqlite/gda-sqlite-provider.c:
* providers/skel-implementation/capi/gda-capi-provider.c: Corrected
g_set_error() calls to avoid warnings because I had the parameters in
the wrong order.
Modified:
trunk/ChangeLog
trunk/libgda/gda-connection.c
trunk/libgda/gda-connection.h
trunk/libgda/gda-data-comparator.h
trunk/libgda/gda-meta-store.h
trunk/libgda/sqlite/gda-sqlite-provider.c
trunk/providers/skel-implementation/capi/gda-capi-provider.c
Modified: trunk/libgda/gda-connection.c
==============================================================================
--- trunk/libgda/gda-connection.c (original)
+++ trunk/libgda/gda-connection.c Mon Dec 15 12:43:10 2008
@@ -870,7 +870,7 @@
if (gda_connection_event_get_event_type (event) == GDA_CONNECTION_EVENT_ERROR) {
if (error && !(*error))
g_set_error (error, GDA_CONNECTION_ERROR, GDA_CONNECTION_OPEN_ERROR,
- gda_connection_event_get_description (event));
+ "%s", gda_connection_event_get_description (event));
}
}
}
@@ -3467,10 +3467,7 @@
#endif
}
else {
- gchar *str;
- str = g_strdup_printf (_("Connection transaction status tracking: no transaction exists for %s"), "ROLLBACK");
- g_warning (str);
- g_free (str);
+ g_warning (_("Connection transaction status tracking: no transaction exists for %s"), "ROLLBACK");
}
#ifdef GDA_DEBUG_NO
if (cnc->priv->trans_status)
@@ -3512,10 +3509,7 @@
#endif
}
else {
- gchar *str;
- str = g_strdup_printf (_("Connection transaction status tracking: no transaction exists for %s"), "COMMIT");
- g_warning (str);
- g_free (str);
+ g_warning (_("Connection transaction status tracking: no transaction exists for %s"), "COMMIT");
}
#ifdef GDA_DEBUG_NO
if (cnc->priv->trans_status)
@@ -3547,10 +3541,7 @@
#endif
}
else {
- gchar *str;
- str = g_strdup_printf (_("Connection transaction status tracking: no transaction exists for %s"), "ADD SAVEPOINT");
- g_warning (str);
- g_free (str);
+ g_warning (_("Connection transaction status tracking: no transaction exists for %s"), "ADD SAVEPOINT");
}
#ifdef GDA_DEBUG_NO
if (cnc->priv->trans_status)
@@ -3583,10 +3574,7 @@
#endif
}
else {
- gchar *str;
- str = g_strdup_printf (_("Connection transaction status tracking: no transaction exists for %s"), "ROLLBACK SAVEPOINT");
- g_warning (str);
- g_free (str);
+ g_warning (_("Connection transaction status tracking: no transaction exists for %s"), "ROLLBACK SAVEPOINT");
}
#ifdef GDA_DEBUG_NO
if (cnc->priv->trans_status)
@@ -3619,10 +3607,7 @@
#endif
}
else {
- gchar *str;
- str = g_strdup_printf (_("Connection transaction status tracking: no transaction exists for %s"), "REMOVE SAVEPOINT");
- g_warning (str);
- g_free (str);
+ g_warning (_("Connection transaction status tracking: no transaction exists for %s"), "REMOVE SAVEPOINT");
}
#ifdef GDA_DEBUG_NO
if (cnc->priv->trans_status)
Modified: trunk/libgda/gda-connection.h
==============================================================================
--- trunk/libgda/gda-connection.h (original)
+++ trunk/libgda/gda-connection.h Mon Dec 15 12:43:10 2008
@@ -79,7 +79,7 @@
typedef enum {
GDA_CONNECTION_OPTIONS_NONE = 0,
- GDA_CONNECTION_OPTIONS_READ_ONLY = 1 << 0,
+ GDA_CONNECTION_OPTIONS_READ_ONLY = 1 << 0
} GdaConnectionOptions;
typedef enum {
Modified: trunk/libgda/gda-data-comparator.h
==============================================================================
--- trunk/libgda/gda-data-comparator.h (original)
+++ trunk/libgda/gda-data-comparator.h Mon Dec 15 12:43:10 2008
@@ -51,7 +51,7 @@
typedef enum {
GDA_DIFF_ADD_ROW,
GDA_DIFF_REMOVE_ROW,
- GDA_DIFF_MODIFY_ROW,
+ GDA_DIFF_MODIFY_ROW
} GdaDiffType;
typedef struct {
Modified: trunk/libgda/gda-meta-store.h
==============================================================================
--- trunk/libgda/gda-meta-store.h (original)
+++ trunk/libgda/gda-meta-store.h Mon Dec 15 12:43:10 2008
@@ -58,8 +58,9 @@
typedef enum {
GDA_META_STORE_ADD,
GDA_META_STORE_REMOVE,
- GDA_META_STORE_MODIFY,
+ GDA_META_STORE_MODIFY
} GdaMetaStoreChangeType;
+
typedef struct {
/* change general information */
GdaMetaStoreChangeType c_type;
Modified: trunk/libgda/sqlite/gda-sqlite-provider.c
==============================================================================
--- trunk/libgda/sqlite/gda-sqlite-provider.c (original)
+++ trunk/libgda/sqlite/gda-sqlite-provider.c Mon Dec 15 12:43:10 2008
@@ -1973,7 +1973,7 @@
event = gda_connection_event_new (GDA_CONNECTION_EVENT_ERROR);
gda_connection_event_set_description (event, str);
g_set_error (error, GDA_SERVER_PROVIDER_ERROR,
- "%s", GDA_SERVER_PROVIDER_MISSING_PARAM_ERROR, str);
+ GDA_SERVER_PROVIDER_MISSING_PARAM_ERROR, "%s", str);
g_free (str);
break;
}
@@ -1992,7 +1992,7 @@
event = gda_connection_event_new (GDA_CONNECTION_EVENT_ERROR);
gda_connection_event_set_description (event, str);
g_set_error (error, GDA_SERVER_PROVIDER_ERROR,
- "%s", GDA_SERVER_PROVIDER_MISSING_PARAM_ERROR, str);
+ GDA_SERVER_PROVIDER_MISSING_PARAM_ERROR, "%s", str);
g_free (str);
break;
}
@@ -2086,7 +2086,7 @@
event = gda_connection_event_new (GDA_CONNECTION_EVENT_ERROR);
gda_connection_event_set_description (event, str);
g_set_error (error, GDA_SERVER_PROVIDER_ERROR,
- "%s", GDA_SERVER_PROVIDER_MISSING_PARAM_ERROR, str);
+ GDA_SERVER_PROVIDER_MISSING_PARAM_ERROR, "%s", str);
g_free (str);
break;
}
@@ -2140,7 +2140,7 @@
event = gda_connection_event_new (GDA_CONNECTION_EVENT_ERROR);
gda_connection_event_set_description (event, errmsg);
g_set_error (error, GDA_SERVER_PROVIDER_ERROR,
- "%s", GDA_SERVER_PROVIDER_STATEMENT_EXEC_ERROR, errmsg);
+ GDA_SERVER_PROVIDER_STATEMENT_EXEC_ERROR, "%s", errmsg);
sqlite3_reset (ps->sqlite_stmt);
gda_connection_add_event (cnc, event);
gda_connection_internal_statement_executed (cnc, stmt, params, event);
Modified: trunk/providers/skel-implementation/capi/gda-capi-provider.c
==============================================================================
--- trunk/providers/skel-implementation/capi/gda-capi-provider.c (original)
+++ trunk/providers/skel-implementation/capi/gda-capi-provider.c Mon Dec 15 12:43:10 2008
@@ -1106,7 +1106,7 @@
event = gda_connection_event_new (GDA_CONNECTION_EVENT_ERROR);
gda_connection_event_set_description (event, str);
g_set_error (error, GDA_SERVER_PROVIDER_ERROR,
- "%s", GDA_SERVER_PROVIDER_MISSING_PARAM_ERROR, str);
+ GDA_SERVER_PROVIDER_MISSING_PARAM_ERROR, "%s", str);
g_free (str);
break;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]