[epiphany] ephy-string: Remove dead code

[Michael Catanzaro <mcatanzaro src gnome org>]

commit db994dd473a84f28611d409f84f591a50fb808db
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Mon Jun 29 20:51:31 2015 -0500

    ephy-string: Remove dead code
    
    https://bugzilla.gnome.org/show_bug.cgi?id=751692

 lib/ephy-string.c |  286 -----------------------------------------------------
 lib/ephy-string.h |   16 ---
 2 files changed, 0 insertions(+), 302 deletions(-)
---
diff --git a/lib/ephy-string.c b/lib/ephy-string.c
index 47d8f5a..00a9f88 100644
--- a/lib/ephy-string.c
+++ b/lib/ephy-string.c
@@ -173,260 +173,6 @@ ephy_string_collate_key_for_domain (const char *str,
   return g_string_free (result, FALSE);
 }
 
-guint
-ephy_string_flags_from_string (GType type,
-                               const char *flags_string)
-{
-  GFlagsClass *flags_class;
-  const GFlagsValue *value;
-  gchar **flags;
-  guint retval = 0, i;
-
-  g_return_val_if_fail (flags_string != NULL, 0);
-
-  flags = g_strsplit (flags_string, "|", -1);
-  if (!flags) return 0;
-
-  flags_class = g_type_class_ref (type);
-
-  for (i = 0; flags[i] != NULL; ++i) {
-    value = g_flags_get_value_by_nick (flags_class, flags[i]);
-
-    if (value != NULL)
-      retval |= value->value;
-  }
-
-  g_type_class_unref (flags_class);
-
-  return retval;
-}
-
-char *
-ephy_string_flags_to_string (GType type,
-                             guint flags_value)
-{
-  GFlagsClass *flags_class;
-  GString *string;
-  gboolean first = TRUE;
-  guint i;
-
-  string = g_string_sized_new (128);
-
-  flags_class = g_type_class_ref (type);
-
-  for (i = 0; i < flags_class->n_values; ++i) {
-    if (flags_value & flags_class->values[i].value) {
-      if (!first)
-        g_string_append_c (string, '|');
-
-      first = FALSE;
-      g_string_append (string, flags_class->values[i].value_nick);
-    }
-  }
-
-  g_type_class_unref (flags_class);
-
-  return g_string_free (string, FALSE);
-}
-
-guint
-ephy_string_enum_from_string (GType type,
-                              const char *enum_string)
-{
-  GEnumClass *enum_class;
-  const GEnumValue *value;
-  guint retval = 0;
-
-  g_return_val_if_fail (enum_string != NULL, 0);
-
-  enum_class = g_type_class_ref (type);
-  value = g_enum_get_value_by_nick (enum_class, enum_string);
-
-  if (value != NULL)
-    retval = value->value;
-
-  g_type_class_unref (enum_class);
-
-  return retval;
-}
-
-char *
-ephy_string_enum_to_string (GType type,
-                            guint enum_value)
-{
-  GEnumClass *enum_class;
-  GEnumValue *value;
-  char *retval = NULL;
-
-  enum_class = g_type_class_ref (type);
-
-  value = g_enum_get_value (enum_class, enum_value);
-
-  if (value)
-    retval = g_strdup (value->value_nick);
-
-  g_type_class_unref (enum_class);
-
-  return retval;
-}
-
-/* Following code copied from gnome-vfs-private-utils.c */
-
-static int
-find_next_slash (const char *path, int current_offset)
-{
-  const char *match;
-  
-  g_assert (current_offset <= strlen (path));
-  
-  match = strchr (path + current_offset, G_DIR_SEPARATOR);
-  return match == NULL ? -1 : match - path;
-}
-
-static int
-find_slash_before_offset (const char *path, int to)
-{
-  int result;
-  int next_offset;
-
-  result = -1;
-  next_offset = 0;
-
-  for (;;) {
-    next_offset = find_next_slash (path, next_offset);
-
-    if (next_offset < 0 || next_offset >= to)
-      break;
-
-    result = next_offset;
-    next_offset++;
-  }
-
-  return result;
-}
-
-static void
-collapse_slash_runs (char *path, int from_offset)
-{
-  int i;
-  /* Collapse multiple `/'s in a row. */
-  for (i = from_offset;; i++) {
-    if (path[i] != G_DIR_SEPARATOR)
-      break;
-  }
-
-  if (from_offset < i) {
-    memmove (path + from_offset, path + i, strlen (path + i) + 1);
-    i = from_offset + 1;
-  }
-}
-
-/* Canonicalize path, and return a new path.  Do everything in situ.  The new
-   path differs from path in:
-
-   Multiple `/'s are collapsed to a single `/'.
-   Leading `./'s and trailing `/.'s are removed.
-   Non-leading `../'s and trailing `..'s are handled by removing
-   portions of the path.  */
-char *
-ephy_string_canonicalize_pathname (const char *cpath)
-{
-  char *path;
-  int i, marker;
-  
-  path = g_strdup (cpath);
-
-  if (path == NULL || strlen (path) == 0)
-    return "";
-
-  /* Walk along path looking for things to compact. */
-  for (i = 0, marker = 0;;) {
-    if (!path[i])
-      break;
-
-    /* Check for `../', `./' or trailing `.' by itself. */
-    if (path[i] == '.') {
-      /* Handle trailing `.' by itself. */
-      if (path[i + 1] == '\0') {
-        if (i > 1 && path[i - 1] == G_DIR_SEPARATOR) {
-          /* strip the trailing /. */
-          path[i - 1] = '\0';
-        } else {
-          /* convert path "/." to "/" */
-          path[i] = '\0';
-        }
-        break;
-      }
-
-      /* Handle `./'. */
-      if (path[i + 1] == G_DIR_SEPARATOR) {
-        memmove (path + i, path + i + 2, 
-           strlen (path + i + 2) + 1);
-        if (i == 0) {
-          /* don't leave leading '/' for paths that started
-           * as relative (.//foo)
-           */
-          collapse_slash_runs (path, i);
-          marker = 0;
-        }
-        continue;
-      }
-
-      /* Handle `../' or trailing `..' by itself. 
-       * Remove the previous xxx/ part 
-       */
-      if (path[i + 1] == '.'
-          && (path[i + 2] == G_DIR_SEPARATOR
-        || path[i + 2] == '\0')) {
-
-        /* ignore ../ at the beginning of a path */
-        if (i != 0) {
-          marker = find_slash_before_offset (path, i - 1);
-
-          /* Either advance past '/' or point to the first character */
-          marker ++;
-          if (path [i + 2] == '\0' && marker > 1) {
-            /* If we are looking at a /.. at the end of the uri and we
-             * need to eat the last '/' too.
-             */
-             marker--;
-          }
-          g_assert(marker < i);
-          
-          if (path[i + 2] == G_DIR_SEPARATOR) {
-            /* strip the entire ../ string */
-            i++;
-          }
-
-          memmove (path + marker, path + i + 2,
-             strlen (path + i + 2) + 1);
-          i = marker;
-        } else {
-          i = 2;
-          if (path[i] == G_DIR_SEPARATOR) {
-            i++;
-          }
-        }
-        collapse_slash_runs (path, i);
-        continue;
-      }
-    }
-    
-    /* advance to the next '/' */
-    i = find_next_slash (path, i);
-
-    /* If we didn't find any slashes, then there is nothing left to do. */
-    if (i < 0)
-      break;
-
-    marker = i++;
-    collapse_slash_runs (path, i);
-  }
-  return path;
-}
-
-/* End of copied code */
-
 char *
 ephy_string_get_host_name (const char *url)
 {
@@ -457,38 +203,6 @@ ephy_string_get_host_name (const char *url)
   return ret;
 }
 
-char *
-ephy_string_expand_initial_tilde (const char *path)
-{
-  char *slash_after_user_name, *user_name;
-  struct passwd *passwd_file_entry;
-
-  g_return_val_if_fail (path != NULL, NULL);
-
-  if (path[0] != '~')
-    return g_strdup (path);
-  
-  if (path[1] == '/' || path[1] == '\0')
-    return g_strconcat (g_get_home_dir (), &path[1], NULL);
-
-  slash_after_user_name = strchr (&path[1], '/');
-  if (slash_after_user_name == NULL) {
-    user_name = g_strdup (&path[1]);
-  } else {
-    user_name = g_strndup (&path[1],
-                           slash_after_user_name - &path[1]);
-  }
-  passwd_file_entry = getpwnam (user_name);
-  g_free (user_name);
-
-  if (passwd_file_entry == NULL || passwd_file_entry->pw_dir == NULL)
-    return g_strdup (path);
-
-  return g_strconcat (passwd_file_entry->pw_dir,
-                      slash_after_user_name,
-                      NULL);
-}
-
 /**
  * ephy_string_commandline_args_to_uris:
  * @arguments: a %NULL-terminated array of chars.
diff --git a/lib/ephy-string.h b/lib/ephy-string.h
index 1f5f986..3fe2ae9 100644
--- a/lib/ephy-string.h
+++ b/lib/ephy-string.h
@@ -40,24 +40,8 @@ char  *ephy_string_shorten   (char *str,
 char    *ephy_string_collate_key_for_domain    (const char *host,
                                                 gssize len);
 
-guint    ephy_string_flags_from_string (GType type,
-                                        const char *flags_string);
-
-char     *ephy_string_flags_to_string  (GType type,
-                                        guint flags_value);
-
-guint    ephy_string_enum_from_string  (GType type,
-                                        const char *enum_string);
-
-char     *ephy_string_enum_to_string   (GType type,
-                                        guint enum_value);
-
-char     *ephy_string_canonicalize_pathname (const char *cpath);
-
 char     *ephy_string_get_host_name (const char *url);
 
-char     *ephy_string_expand_initial_tilde (const char *path);
-
 char    **ephy_string_commandline_args_to_uris (char **arguments, GError **error);