[planner: 18/40] error: variable set but not used
- From: Mart Raudsepp <mraudsepp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [planner: 18/40] error: variable set but not used
- Date: Thu, 3 Jun 2021 16:28:55 +0000 (UTC)
commit 31cb2dd0e0bcad5e02a1e58b5d6cf74bc93aa453
Author: Ahmed Baïzid <ahmed baizid org>
Date: Thu May 11 23:03:50 2017 +0200
error: variable set but not used
https://bugzilla.gnome.org/show_bug.cgi?id=584556
libplanner/mrp-sql.c | 83 +++++++++++++++++++++++++++---------------------
src/planner-sql-plugin.c | 8 ++---
2 files changed, 49 insertions(+), 42 deletions(-)
---
diff --git a/libplanner/mrp-sql.c b/libplanner/mrp-sql.c
index 31a704cd..96538dff 100644
--- a/libplanner/mrp-sql.c
+++ b/libplanner/mrp-sql.c
@@ -33,8 +33,6 @@
#include "mrp-storage-sql.h"
#include "mrp-sql.h"
-#define d(x)
-
#define REVISION "sql-storage-revision"
#define CONNECTION_FORMAT_STRING "HOST=%s;DB_NAME=%s"
@@ -309,11 +307,13 @@ get_int (GdaDataModel *model, gint row, gint column)
GValue *value;
gchar *str;
gint i;
+ GError *error = NULL;
- value = (GValue *) gda_data_model_get_value_at (model, column, row, NULL);
+ value = (GValue *) gda_data_model_get_value_at (model, column, row, &error);
if (value == NULL) {
g_warning ("Failed to get a value: (%d,%d)", column, row);
- d(sql_show_result (model));
+ g_warning ("%s", error->message);
+ g_clear_error (&error);
return INT_MAX;
}
@@ -329,11 +329,13 @@ get_id (GdaDataModel *model, gint row, gint column)
GValue *value;
gchar *str;
gint i;
+ GError *error = NULL;
- value = (GValue *) gda_data_model_get_value_at (model, column, row, NULL);
+ value = (GValue *) gda_data_model_get_value_at (model, column, row, &error);
if (value == NULL) {
g_warning ("Failed to get a value: (%d,%d)", column, row);
- d(sql_show_result (model));
+ g_warning ("%s", error->message);
+ g_clear_error (&error);
return INT_MAX;
}
@@ -356,11 +358,13 @@ get_string (GdaDataModel *model, gint row, gint column)
gsize len;
gchar *ret;
gchar *str;
+ GError *error = NULL;
- value = (GValue *) gda_data_model_get_value_at (model, column, row, NULL);
+ value = (GValue *) gda_data_model_get_value_at (model, column, row, &error);
if (value == NULL) {
g_warning ("Failed to get a value: (%d,%d)", column, row);
- d(sql_show_result (model));
+ g_warning ("%s", error->message);
+ g_clear_error (&error);
return g_strdup ("");
}
@@ -393,11 +397,13 @@ static gboolean
get_boolean (GdaDataModel *model, gint row, gint column)
{
GValue *value;
+ GError *error = NULL;
- value = (GValue *) gda_data_model_get_value_at (model, column, row, NULL);
+ value = (GValue *) gda_data_model_get_value_at (model, column, row, &error);
if (value == NULL) {
g_warning ("Failed to get a value: (%d,%d)", column, row);
- d(sql_show_result (model));
+ g_warning ("%s", error->message);
+ g_clear_error (&error);
return FALSE;
}
@@ -410,12 +416,14 @@ get_float (GdaDataModel *model, gint row, gint column)
GValue *value;
gchar *str;
gdouble d;
+ GError *error = NULL;
- value = (GValue *) gda_data_model_get_value_at (model, column, row, NULL);
+ value = (GValue *) gda_data_model_get_value_at (model, column, row, &error);
if (value == NULL) {
g_warning ("Failed to get a value: (%d,%d)", column, row);
- d(sql_show_result (model));
+ g_warning ("%s", error->message);
+ g_clear_error (&error);
return -1;
}
@@ -1101,9 +1109,9 @@ sql_read_overriden_day_types (SQLData *data, gint calendar_id)
interval = mrp_interval_new (start, end);
day_type_data->intervals = g_list_append (day_type_data->intervals, interval);
- d(g_print ("Overridden intervals for day %d, on cal %d, %d - %d\n",
+ g_debug ("Overridden intervals for day %d, on cal %d, %d - %d\n",
day_type_id, calendar_id,
- (int)start, (int)end));
+ (int)start, (int)end);
}
g_object_unref (model);
model = NULL;
@@ -1171,13 +1179,15 @@ sql_read_overriden_days (SQLData *data, gint calendar_id)
for (j = 0; j < n; j++) {
if (is_field (model, j, "date_seconds")) {
date = get_int (model, i, j);
+ g_debug ("model(%d, %d) is date_seconds(%ld)\n", i, j, date);
}
else if (is_field (model, j, "dtype_id")) {
day_type_id = get_int (model, i, j);
+ g_debug ("model(%d, %d) is dtype_id(%d)\n", i, j, day_type_id);
}
}
- d(g_print ("Overridden for cal %d, on %s\n", calendar_id, mrp_time_format ("%a %e %b",
date)));
+ g_debug ("Overridden for cal %d, on %s\n", calendar_id, mrp_time_format ("%a %e %b", date));
/*data->days = g_list_prepend (data->days, day);*/
}
@@ -1257,7 +1267,7 @@ sql_read_day_types (SQLData *data)
}
}
- d(g_print ("Day type: %s, id: %d, work: %d, nonwork: %d\n", name, day_type_id, is_work,
is_nonwork));
+ g_debug ("Day type: %s, id: %d, work: %d, nonwork: %d\n", name, day_type_id, is_work,
is_nonwork);
if (is_work) {
day = mrp_day_get_work ();
@@ -1304,11 +1314,11 @@ sql_calendar_create (GNode *node,
/* Calendar directly under the root don't inherit from another
* calendar.
*/
- d(g_print ("Create new calendar: %s\n", cal_data->name));
+ g_debug ("Create new calendar: %s\n", cal_data->name);
calendar = mrp_calendar_new (cal_data->name, data->project);
} else {
- d(g_print ("Derive new calendar: %s\n", cal_data->name));
+ g_debug ("Derive new calendar: %s\n", cal_data->name);
parent = g_hash_table_lookup (data->calendar_id_hash, GINT_TO_POINTER (cal_data->parent_id));
calendar = mrp_calendar_derive (cal_data->name, parent);
@@ -1377,7 +1387,7 @@ dump_calendar_tree (GNode *node)
data = node->data;
- d(g_print ("%s%s\n", str, data ? data->name : "[Root]"));
+ g_debug ("%s%s\n", str, data ? data->name : "[Root]");
g_free (str);
for (child = node->children; child; child = child->next) {
@@ -1467,10 +1477,10 @@ sql_read_calendars (SQLData *data)
}
}
- d(g_print ("Calendar: %s, id: %d, parent: %d\n",
+ g_debug ("Calendar: %s, id: %d, parent: %d\n",
calendar_data->name,
calendar_data->id,
- calendar_data->parent_id));
+ calendar_data->parent_id);
calendars = g_list_prepend (calendars, node);
g_hash_table_insert (hash, GINT_TO_POINTER (calendar_data->id), node);
@@ -1961,7 +1971,7 @@ dump_task_tree (GNode *node)
if (data) {
g_object_get (data->task, "name", &name, NULL);
}
- d(g_print ("%s%s\n", str, data ? name : "[Root]"));
+ g_debug ("%s%s\n", str, data ? name : "[Root]");
g_free (name);
g_free (str);
@@ -2353,7 +2363,7 @@ mrp_sql_load_project (MrpStorageSQL *storage,
g_object_unref (data->con);
- d(g_print ("Read project, set rev to %d\n", data->revision));
+ g_debug ("Read project, set rev to %d\n", data->revision);
g_object_set_data (G_OBJECT (storage->project),
REVISION,
@@ -2438,7 +2448,7 @@ sql_write_project (MrpStorageSQL *storage,
sql_execute_command (data->con, "CLOSE mycursor");
/* Remove the old project. */
- d(g_print ("Got old project with id %d (rev %d), remove.\n", project_id, revision));
+ g_debug ("Got old project with id %d (rev %d), remove.\n", project_id, revision);
query = g_strdup_printf ("DELETE FROM project WHERE proj_id=%d", project_id);
success = sql_execute_command (data->con, query);
@@ -2450,7 +2460,7 @@ sql_write_project (MrpStorageSQL *storage,
goto out;
}
- d(g_print ("*** revision: %d, old revision: %d\n", revision, data->revision));
+ g_debug ("*** revision: %d, old revision: %d\n", revision, data->revision);
if (!force && data->revision > 0 && revision != data->revision) {
g_set_error (error,
@@ -2497,12 +2507,12 @@ sql_write_project (MrpStorageSQL *storage,
sql_quote_and_escape_string (data, &str, TRUE);
if (project_id != -1) {
- d(g_print ("Trying to insert project with id: %d\n", project_id));
+ g_debug ("Trying to insert project with id: %d\n", project_id);
query = g_strdup_printf ("INSERT INTO project(proj_id, name, company, manager, proj_start,
revision) "
"VALUES(%d, %s, %s, %s, %s, %d)",
project_id, name, company, manager, str, data->revision);
} else {
- d(g_print ("Trying to insert new project.\n"));
+ g_debug ("Trying to insert new project.\n");
query = g_strdup_printf ("INSERT INTO project(name, company, manager, proj_start, revision) "
"VALUES(%s, %s, %s, %s, %d)",
name, company, manager, str, data->revision);
@@ -2523,7 +2533,7 @@ sql_write_project (MrpStorageSQL *storage,
project_id = get_inserted_id (data, "project_proj_id_seq");
}
- d(g_print ("Inserted project %s, %d\n", name, project_id));
+ g_debug ("Inserted project %s, %d\n", name, project_id);
data->project_id = project_id;
@@ -2733,7 +2743,7 @@ sql_write_specific_property_specs (SQLData *data, GList *properties, const gchar
}
id = get_inserted_id (data, "property_type_proptype_id_seq");
- d(g_print ("Inserted property type '%s', %d\n", name, id));
+ g_debug ("Inserted property type '%s', %d\n", name, id);
g_hash_table_insert (data->property_type_hash, property, GINT_TO_POINTER (id));
}
@@ -2804,6 +2814,7 @@ sql_write_property_values (SQLData *data,
label = mrp_property_get_label (property);
description = mrp_property_get_description (property);
type = property_type_to_string (mrp_property_get_property_type (property));
+ g_debug ("'%s', '%s', '%s'\n", label, description, type);
property_type_id = get_hash_data_as_id (data->property_type_hash, property);
@@ -2829,7 +2840,7 @@ sql_write_property_values (SQLData *data,
}
id = get_inserted_id (data, "property_prop_id_seq");
- d(g_print ("Inserted property '%s', %d\n", name, id));
+ g_debug ("Inserted property '%s', %d\n", name, id);
if (object_type == MRP_TYPE_PROJECT) {
str = "project_to_property(proj_id, prop_id)";
@@ -2929,7 +2940,7 @@ sql_write_day_types (SQLData *data)
}
id = get_inserted_id (data, "daytype_dtype_id_seq");
- d(g_print ("Inserted day '%s', %d\n", mrp_day_get_name (day), id));
+ g_debug ("Inserted day '%s', %d\n", mrp_day_get_name (day), id);
g_hash_table_insert (data->day_hash, day, GINT_TO_POINTER (id));
}
@@ -3104,7 +3115,7 @@ sql_write_calendars_recurse (SQLData *data,
}
id = get_inserted_id (data, "calendar_cal_id_seq");
- d(g_print ("Inserted calendar %s, %d\n", name, id));
+ g_debug ("Inserted calendar %s, %d\n", name, id);
g_hash_table_insert (data->calendar_hash, calendar, GINT_TO_POINTER (id));
@@ -3238,7 +3249,7 @@ sql_write_groups (SQLData *data)
}
id = get_inserted_id (data, "resource_group_group_id_seq");
- d(g_print ("Inserted group %s, %d\n", name, id));
+ g_debug ("Inserted group %s, %d\n", name, id);
g_hash_table_insert (data->group_hash, group, GINT_TO_POINTER (id));
@@ -3373,7 +3384,7 @@ sql_write_resources (SQLData *data)
}
id = get_inserted_id (data, "resource_res_id_seq");
- d(g_print ("Inserted resource %s, %d\n", name, id));
+ g_debug ("Inserted resource %s, %d\n", name, id);
g_hash_table_insert (data->resource_hash, resource, GINT_TO_POINTER (id));
@@ -3543,7 +3554,7 @@ sql_write_tasks (SQLData *data)
}
id = get_inserted_id (data, "task_task_id_seq");
- d(g_print ("Inserted task %s, %d under %d\n", name, id, parent_id));
+ g_debug ("Inserted task %s, %d under %d\n", name, id, parent_id);
g_hash_table_insert (data->task_hash, task, GINT_TO_POINTER (id));
@@ -3790,7 +3801,7 @@ mrp_sql_save_project (MrpStorageSQL *storage,
sql_execute_command (data->con, "COMMIT");
- d(g_print ("Write project, set rev to %d\n", data->revision));
+ g_debug ("Write project, set rev to %d\n", data->revision);
g_object_set_data (G_OBJECT (data->project), REVISION, GINT_TO_POINTER (data->revision));
diff --git a/src/planner-sql-plugin.c b/src/planner-sql-plugin.c
index 12944977..5511a6e8 100644
--- a/src/planner-sql-plugin.c
+++ b/src/planner-sql-plugin.c
@@ -38,8 +38,6 @@
#include "planner-application.h"
#include "planner-plugin.h"
-#define d(x)
-
#define SERVER "sql-plugin-server"
#define DATABASE "sql-plugin-database"
#define REVISION "sql-plugin-revision"
@@ -358,7 +356,6 @@ show_error_dialog (PlannerPlugin *plugin,
{
GtkWindow *window;
GtkWidget *dialog;
- gint response;
window = GTK_WINDOW (plugin->main_window);
@@ -368,7 +365,7 @@ show_error_dialog (PlannerPlugin *plugin,
GTK_BUTTONS_CLOSE,
"%s", str);
- response = gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
}
@@ -969,7 +966,6 @@ sql_plugin_retrieve_db_values (PlannerPlugin *plugin,
gchar **login,
gchar **password)
{
- PlannerApplication *application;
gchar *filename;
GladeXML *gui;
GtkWidget *dialog;
@@ -981,7 +977,7 @@ sql_plugin_retrieve_db_values (PlannerPlugin *plugin,
GtkWidget *password_entry;
gboolean ret;
- application = planner_window_get_application (plugin->main_window);
+ planner_window_get_application (plugin->main_window);
filename = mrp_paths_get_glade_dir ("sql.glade");
gui = glade_xml_new (filename, "open_dialog" , NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
