[QA] Use a library function to get the number of items in a string array.

diff --git a/src/modules.c b/src/modules.c
index f9eba24e1a8a9b811a109b8af5afb3a5c6c2eac9..a73f08e75b4cc534fc389f7da049e3d1f76f2559 100644 (file)
--- a/src/modules.c
+++ b/src/modules.c
@@ -175,19 +175,13 @@ modules_load_config(void)
      But our logic is to load all existing files and overwrite
      overlapping config with last recent one.
      So, we have to process directories in reverse order. */
      But our logic is to load all existing files and overwrite
      overlapping config with last recent one.
      So, we have to process directories in reverse order. */

-  /* First: find the last element */
-  gchar * * ptr = data_dirs;
-  while (*ptr != NULL) ptr++;
-  /* Second: deduce the number of directories */
-  int nb_data_dirs = 0;
-  nb_data_dirs = ptr - data_dirs;
-  /* Last: parse them in reverse order */
+  int nb_data_dirs = g_strv_length ( data_dirs );

   for (; nb_data_dirs > 0 ; nb_data_dirs--)
   {
     modules_load_config_dir(data_dirs[nb_data_dirs-1]);
   }
   g_strfreev(data_dirs);
   for (; nb_data_dirs > 0 ; nb_data_dirs--)
   {
     modules_load_config_dir(data_dirs[nb_data_dirs-1]);
   }
   g_strfreev(data_dirs);

-       
+

   /* Check if system config is set */
   modules_load_config_dir(VIKING_SYSCONFDIR);
 
   /* Check if system config is set */
   modules_load_config_dir(VIKING_SYSCONFDIR);
 


@@ -196,7 +190,7 @@ modules_load_config(void)
   {
     modules_load_config_dir(data_home);
   }
   {
     modules_load_config_dir(data_home);
   }

-       
+

   /* Check user's home config */
   modules_load_config_dir(a_get_viking_dir());
 }
   /* Check user's home config */
   modules_load_config_dir(a_get_viking_dir());
 }