Use G_MODULE_BIND_LAZY in g_module_open(). Remove unused and unreachable

2005-11-01  Kjartan Maraas  <kmaraas@gnome.org>

	* gconf/gconf-backend.c: (gconf_get_backend): Use
	G_MODULE_BIND_LAZY in g_module_open().
	* gconf/gconf-internals.c: (gconf_value_from_corba_value),
	(gconf_value_type_to_string), (gconf_unquote_string_inplace),
	(type_byte), (byte_type), (gconf_value_encode),
	(gconf_get_lock_or_current_holder): Remove unused and
	unreachable code.
	* gconf/gconf-listeners.c: (ltable_insert): Warning fix.
	* gconf/gconf-value.c: (gconf_value_compare): Same here.
	* gconf/gconf.c: (gconf_unescape_key),
	(corba_errno_to_gconf_errno), (gconf_server_broken),
	(gconf_handle_corba_exception): And here.
	* gconf/gconfd.c: (main): Missing closelog() call.

7 files changed, 21 insertions, 66 deletions

diff --git a/ChangeLog b/ChangeLog
index e2b33fac..2ef14a97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2005-11-01  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* gconf/gconf-backend.c: (gconf_get_backend): Use
+	G_MODULE_BIND_LAZY in g_module_open().
+	* gconf/gconf-internals.c: (gconf_value_from_corba_value),
+	(gconf_value_type_to_string), (gconf_unquote_string_inplace),
+	(type_byte), (byte_type), (gconf_value_encode),
+	(gconf_get_lock_or_current_holder): Remove unused and
+	unreachable code.
+	* gconf/gconf-listeners.c: (ltable_insert): Warning fix.
+	* gconf/gconf-value.c: (gconf_value_compare): Same here.
+	* gconf/gconf.c: (gconf_unescape_key),
+	(corba_errno_to_gconf_errno), (gconf_server_broken),
+	(gconf_handle_corba_exception): And here.
+	* gconf/gconfd.c: (main): Missing closelog() call.
+
 2005-10-28  Erdal Ronahi  <erdal.ronahi@gmail.com>
 
 	* configure.in: Added ku (Kurdish) to ALL_LINGUAS
diff --git a/gconf/gconf-backend.c b/gconf/gconf-backend.c
index 2c30be4e..3fd6ec86 100644
--- a/gconf/gconf-backend.c
+++ b/gconf/gconf-backend.c
@@ -336,7 +336,7 @@ gconf_get_backend(const gchar* address, GError** err)
           if (!g_module_supported())
             g_error(_("GConf won't work without dynamic module support (gmodule)"));
               
-          module = g_module_open(file, 0);
+          module = g_module_open(file, G_MODULE_BIND_LAZY);
               
           g_free(file);
           
diff --git a/gconf/gconf-internals.c b/gconf/gconf-internals.c
index 7df75c4f..03b396fc 100644
--- a/gconf/gconf-internals.c
+++ b/gconf/gconf-internals.c
@@ -162,7 +162,6 @@ gconf_value_from_corba_value(const ConfigValue* value)
     {
     case InvalidVal:
       return NULL;
-      break;
     case IntVal:
       type = GCONF_VALUE_INT;
       break;
@@ -641,32 +640,23 @@ gconf_value_type_to_string(GConfValueType type)
     {
     case GCONF_VALUE_INT:
       return "int";
-      break;
     case GCONF_VALUE_STRING:
       return "string";
-      break;
     case GCONF_VALUE_FLOAT:
       return "float";
-      break;
     case GCONF_VALUE_BOOL:
       return "bool";
-      break;
     case GCONF_VALUE_SCHEMA:
       return "schema";
-      break;
     case GCONF_VALUE_LIST:
       return "list";
-      break;
     case GCONF_VALUE_PAIR:
       return "pair";
-      break;
     case GCONF_VALUE_INVALID:
       return "*invalid*";
-      break;
     default:
       g_assert_not_reached();
       return NULL; /* for warnings */
-      break;
     }
 }
 
@@ -1730,7 +1720,6 @@ gconf_unquote_string_inplace (gchar* str, gchar** end, GError** err)
           ++s;
           *end = s;
           return;
-          break;
 
         case '\\':
           /* Possible escaped quote or \ */
@@ -1814,40 +1803,31 @@ static gchar type_byte(GConfValueType type)
     {
     case GCONF_VALUE_INT:
       return 'i';
-      break;
         
     case GCONF_VALUE_BOOL:
       return 'b';
-      break;
 
     case GCONF_VALUE_FLOAT:
       return 'f';
-      break;
 
     case GCONF_VALUE_STRING:
       return 's';
-      break;
 
     case GCONF_VALUE_SCHEMA:
       return 'c';
-      break;
 
     case GCONF_VALUE_LIST:
       return 'l';
-      break;
 
     case GCONF_VALUE_PAIR:
       return 'p';
-      break;
 
     case GCONF_VALUE_INVALID:
       return 'v';
-      break;
       
     default:
       g_assert_not_reached();
       return '\0';
-      break;
     }
 }
 
@@ -1858,39 +1838,30 @@ byte_type(gchar byte)
     {
     case 'i':
       return GCONF_VALUE_INT;
-      break;
 
     case 'b':
       return GCONF_VALUE_BOOL;
-      break;
 
     case 's':
       return GCONF_VALUE_STRING;
-      break;
 
     case 'c':
       return GCONF_VALUE_SCHEMA;
-      break;
 
     case 'f':
       return GCONF_VALUE_FLOAT;
-      break;
 
     case 'l':
       return GCONF_VALUE_LIST;
-      break;
 
     case 'p':
       return GCONF_VALUE_PAIR;
-      break;
       
     case 'v':
       return GCONF_VALUE_INVALID;
-      break;
 
     default:
       return GCONF_VALUE_INVALID;
-      break;
     }
 }
 
@@ -2122,7 +2093,6 @@ gconf_value_encode (GConfValue* val)
     case GCONF_VALUE_SCHEMA:
       {
         gchar* tmp;
-        gchar* retval;
         gchar* quoted;
         gchar* encoded;
         GConfSchema* sc;
@@ -2633,7 +2603,6 @@ gconf_get_lock_or_current_holder (const gchar  *lock_directory,
                                   ConfigServer *current_server,
                                   GError      **err)
 {
-  ConfigServer server;
   GConfLock* lock;
   
   g_return_val_if_fail(lock_directory != NULL, NULL);
@@ -2652,8 +2621,6 @@ gconf_get_lock_or_current_holder (const gchar  *lock_directory,
       return NULL;
     }
 
-  server = CORBA_OBJECT_NIL;
-    
   lock = g_new0 (GConfLock, 1);
 
   lock->lock_directory = g_strdup (lock_directory);
diff --git a/gconf/gconf-listeners.c b/gconf/gconf-listeners.c
index e44c23f6..84edceaf 100644
--- a/gconf/gconf-listeners.c
+++ b/gconf/gconf-listeners.c
@@ -366,7 +366,7 @@ ltable_insert(LTable* lt, const gchar* where, Listener* l)
 
       while (across != NULL)
         {
-          LTableEntry* lte = across->data;
+          lte = across->data;
           int cmp;
 
           cmp = strcmp(lte->name, dirnames[i]);
diff --git a/gconf/gconf-value.c b/gconf/gconf-value.c
index a628590f..e188cea2 100644
--- a/gconf/gconf-value.c
+++ b/gconf/gconf-value.c
@@ -1190,7 +1190,6 @@ gconf_value_compare (const GConfValue *value_a,
         return 1;
       else
         return 0;
-      break;
     case GCONF_VALUE_FLOAT:
       if (gconf_value_get_float (value_a) < gconf_value_get_float (value_b))
         return -1;
@@ -1198,11 +1197,9 @@ gconf_value_compare (const GConfValue *value_a,
         return 1;
       else
         return 0;
-      break;
     case GCONF_VALUE_STRING:
       return strcmp (gconf_value_get_string (value_a),
                      gconf_value_get_string (value_b));
-      break;
     case GCONF_VALUE_BOOL:
       if (gconf_value_get_bool (value_a) == gconf_value_get_bool (value_b))
         return 0;
@@ -1211,7 +1208,6 @@ gconf_value_compare (const GConfValue *value_a,
         return 1;
       else
         return -1;
-      break;
     case GCONF_VALUE_LIST:
       {
         GSList *list_a;
@@ -1240,7 +1236,6 @@ gconf_value_compare (const GConfValue *value_a,
         else
           return 0;
       }
-      break;
     case GCONF_VALUE_PAIR:
       {
         GConfValue *a_car, *b_car, *a_cdr, *b_cdr;
@@ -1277,10 +1272,8 @@ gconf_value_compare (const GConfValue *value_a,
 
         return 0;
       }
-      break;
     case GCONF_VALUE_INVALID:
       return 0;
-      break;
     case GCONF_VALUE_SCHEMA:
       {
         const char *locale_a, *locale_b;
@@ -1355,7 +1348,6 @@ gconf_value_compare (const GConfValue *value_a,
 
         return 0;
       }
-      break;
     }
 
   g_assert_not_reached ();
diff --git a/gconf/gconf.c b/gconf/gconf.c
index beb9c74d..c63dad30 100644
--- a/gconf/gconf.c
+++ b/gconf/gconf.c
@@ -2747,7 +2747,6 @@ gconf_unescape_key (const char *escaped_key,
           if (*p == '@')
             {
               /* *p is the @ that ends a seq */
-              char *end;
               guchar val;
               
               val = strtoul (start_seq, &end, 10);
@@ -3497,47 +3496,33 @@ corba_errno_to_gconf_errno(ConfigErrorType corba_err)
     {
     case ConfigFailed:
       return GCONF_ERROR_FAILED;
-      break;
     case ConfigNoPermission:
       return GCONF_ERROR_NO_PERMISSION;
-      break;
     case ConfigBadAddress:
       return GCONF_ERROR_BAD_ADDRESS;
-      break;
     case ConfigBadKey:
       return GCONF_ERROR_BAD_KEY;
-      break;
     case ConfigParseError:
       return GCONF_ERROR_PARSE_ERROR;
-      break;
     case ConfigCorrupt:
       return GCONF_ERROR_CORRUPT;
-      break;
     case ConfigTypeMismatch:
       return GCONF_ERROR_TYPE_MISMATCH;
-      break;
     case ConfigIsDir:
       return GCONF_ERROR_IS_DIR;
-      break;
     case ConfigIsKey:
       return GCONF_ERROR_IS_KEY;
-      break;
     case ConfigOverridden:
       return GCONF_ERROR_OVERRIDDEN;
-      break;
     case ConfigLockFailed:
       return GCONF_ERROR_LOCK_FAILED;
-      break;
     case ConfigNoWritableDatabase:
       return GCONF_ERROR_NO_WRITABLE_DATABASE;
-      break;
     case ConfigInShutdown:
       return GCONF_ERROR_IN_SHUTDOWN;
-      break;
     default:
       g_assert_not_reached();
       return GCONF_ERROR_SUCCESS; /* warnings */
-      break;
     }
 }
 
@@ -3548,7 +3533,6 @@ gconf_server_broken(CORBA_Environment* ev)
     {
     case CORBA_SYSTEM_EXCEPTION:
       return TRUE;
-      break;
 
     case CORBA_USER_EXCEPTION:
       {
@@ -3558,11 +3542,9 @@ gconf_server_broken(CORBA_Environment* ev)
 
         return ce->err_no == ConfigInShutdown;
       }
-      break;
       
     default:
       return FALSE;
-      break;
     }
 }
 
@@ -3574,14 +3556,12 @@ gconf_handle_corba_exception(CORBA_Environment* ev, GError** err)
     case CORBA_NO_EXCEPTION:
       CORBA_exception_free (ev);
       return FALSE;
-      break;
     case CORBA_SYSTEM_EXCEPTION:
       if (err)
         *err = gconf_error_new (GCONF_ERROR_NO_SERVER, _("CORBA error: %s"),
                                 CORBA_exception_id (ev));
       CORBA_exception_free (ev);
       return TRUE;
-      break;
     case CORBA_USER_EXCEPTION:
       {        
         ConfigException* ce;
@@ -3594,11 +3574,9 @@ gconf_handle_corba_exception(CORBA_Environment* ev, GError** err)
         CORBA_exception_free (ev);
         return TRUE;
       }
-      break;
     default:
       g_assert_not_reached();
       return TRUE;
-      break;
     }
 }
 
diff --git a/gconf/gconfd.c b/gconf/gconfd.c
index c05dad9b..5e49e05c 100644
--- a/gconf/gconfd.c
+++ b/gconf/gconfd.c
@@ -843,9 +843,11 @@ main(int argc, char** argv)
   
   gconf_log (GCL_INFO, _("Exiting"));
 
+  closelog ();
+
   /* Can't do this due to stupid atexit() handler that calls g_log stuff */
   /*   g_free (logname); */
-  
+
   return exit_code;
 }