[ostree] core: Delete some dead utility code
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ostree] core: Delete some dead utility code
- Date: Sat, 3 Dec 2011 00:55:23 +0000 (UTC)
commit 7545405b73f78f8dad5d72a9de9676e37a4b57c3
Author: Colin Walters <walters verbum org>
Date: Fri Dec 2 19:54:53 2011 -0500
core: Delete some dead utility code
src/libotutil/ot-unix-utils.c | 60 -----------------------------------------
src/libotutil/ot-unix-utils.h | 6 ----
2 files changed, 0 insertions(+), 66 deletions(-)
---
diff --git a/src/libotutil/ot-unix-utils.c b/src/libotutil/ot-unix-utils.c
index 444f620..2e4eaae 100644
--- a/src/libotutil/ot-unix-utils.c
+++ b/src/libotutil/ot-unix-utils.c
@@ -106,21 +106,6 @@ ot_util_sort_filenames_by_component_length (GPtrArray *files)
return array;
}
-int
-ot_util_count_filename_components (const char *path)
-{
- int i = 0;
-
- while (path)
- {
- i++;
- path = strchr (path, '/');
- if (path)
- path++;
- }
- return i;
-}
-
gboolean
ot_util_filename_has_dotdot (const char *path)
{
@@ -237,51 +222,6 @@ ot_util_set_error_from_errno (GError **error,
errno = saved_errno;
}
-int
-ot_util_open_file_read (const char *path, GError **error)
-{
- char *dirname = NULL;
- char *basename = NULL;
- DIR *dir = NULL;
- int fd = -1;
-
- dirname = g_path_get_dirname (path);
- basename = g_path_get_basename (path);
- dir = opendir (dirname);
- if (dir == NULL)
- {
- ot_util_set_error_from_errno (error, errno);
- goto out;
- }
-
- fd = ot_util_open_file_read_at (dirfd (dir), basename, error);
-
- out:
- g_free (basename);
- g_free (dirname);
- if (dir != NULL)
- closedir (dir);
- return fd;
-}
-
-int
-ot_util_open_file_read_at (int dirfd, const char *name, GError **error)
-{
- int fd;
- int flags = O_RDONLY;
-
-#ifdef O_CLOEXEC
- flags |= O_CLOEXEC;
-#endif
-#ifdef O_NOATIME
- flags |= O_NOATIME;
-#endif
- fd = openat (dirfd, name, flags);
- if (fd < 0)
- ot_util_set_error_from_errno (error, errno);
- return fd;
-}
-
void
ot_util_fatal_literal (const char *msg)
{
diff --git a/src/libotutil/ot-unix-utils.h b/src/libotutil/ot-unix-utils.h
index 59f8ef2..ad388ad 100644
--- a/src/libotutil/ot-unix-utils.h
+++ b/src/libotutil/ot-unix-utils.h
@@ -54,12 +54,6 @@ GPtrArray* ot_util_path_split (const char *path);
char *ot_util_path_join_n (const char *base, GPtrArray *components, int n);
-int ot_util_count_filename_components (const char *path);
-
-int ot_util_open_file_read (const char *path, GError **error);
-
-int ot_util_open_file_read_at (int dirfd, const char *name, GError **error);
-
void ot_util_set_error_from_errno (GError **error, gint saved_errno);
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]