[gnome-settings-daemon] smartcard: GCC 4.6 warning fixes
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon] smartcard: GCC 4.6 warning fixes
- Date: Wed, 2 Mar 2011 18:20:10 +0000 (UTC)
commit 9f94c39c5998572461b837cd679a2280c50e82e8
Author: Kjartan Maraas <kmaraas gnome org>
Date: Wed Mar 2 18:16:46 2011 +0000
smartcard: GCC 4.6 warning fixes
https://bugzilla.gnome.org/show_bug.cgi?id=642803
plugins/smartcard/gsd-smartcard-manager.c | 11 +----------
1 files changed, 1 insertions(+), 10 deletions(-)
---
diff --git a/plugins/smartcard/gsd-smartcard-manager.c b/plugins/smartcard/gsd-smartcard-manager.c
index 29e4ef9..b00bb90 100644
--- a/plugins/smartcard/gsd-smartcard-manager.c
+++ b/plugins/smartcard/gsd-smartcard-manager.c
@@ -432,9 +432,6 @@ static void
gsd_smartcard_manager_emit_smartcard_removed (GsdSmartcardManager *manager,
GsdSmartcard *card)
{
- GsdSmartcardManagerState old_state;
-
- old_state = manager->priv->state;
manager->priv->is_unstoppable = TRUE;
g_signal_emit (manager, gsd_smartcard_manager_signals[SMARTCARD_REMOVED], 0,
card);
@@ -868,7 +865,6 @@ start_worker (GsdSmartcardManager *manager,
{
GIOChannel *io_channel;
GSource *source;
- GIOFlags channel_flags;
GsdSmartcardManagerWorker *worker;
worker = gsd_smartcard_manager_create_worker (manager, module);
@@ -885,8 +881,6 @@ start_worker (GsdSmartcardManager *manager,
io_channel = g_io_channel_unix_new (worker->manager_fd);
- channel_flags = g_io_channel_get_flags (io_channel);
-
source = g_io_create_watch (io_channel, G_IO_IN | G_IO_HUP);
g_io_channel_unref (io_channel);
io_channel = NULL;
@@ -1227,9 +1221,6 @@ gsd_smartcard_manager_worker_emit_smartcard_inserted (GsdSmartcardManagerWorker
GsdSmartcard *card,
GError **error)
{
- GError *write_error;
-
- write_error = NULL;
g_debug ("card '%s' inserted!", gsd_smartcard_get_name (card));
if (!write_bytes (worker->fd, "I", 1)) {
goto error_out;
@@ -1253,7 +1244,7 @@ gsd_smartcard_manager_worker_watch_for_and_process_event (GsdSmartcardManagerWor
GError **error)
{
PK11SlotInfo *slot;
- CK_SLOT_ID slot_id, *key;
+ CK_SLOT_ID slot_id, *key = NULL;
int slot_series, card_slot_series;
GsdSmartcard *card;
GError *processing_error;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]