[ostree/wip/at-functions2: 3/4] core: Make ostree_set_xattrs() private
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ostree/wip/at-functions2: 3/4] core: Make ostree_set_xattrs() private
- Date: Sun, 8 Sep 2013 17:48:16 +0000 (UTC)
commit 76260531bf5af634def2a45fd53b04252c6f5d28
Author: Colin Walters <walters verbum org>
Date: Sat Sep 7 21:56:36 2013 -0400
core: Make ostree_set_xattrs() private
Nothing external uses it. We keep ostree_get_xattrs_for_file() public
because it's convenient for external consumers to get xattrs in
exactly the format we desire.
src/libostree/ostree-core-private.h | 4 ++++
src/libostree/ostree-core.c | 12 ++++++------
src/libostree/ostree-core.h | 3 ---
src/libostree/ostree-repo-checkout.c | 2 +-
src/libostree/ostree-repo-commit.c | 2 +-
5 files changed, 12 insertions(+), 11 deletions(-)
---
diff --git a/src/libostree/ostree-core-private.h b/src/libostree/ostree-core-private.h
index 3fe67f9..b564c21 100644
--- a/src/libostree/ostree-core-private.h
+++ b/src/libostree/ostree-core-private.h
@@ -80,6 +80,10 @@ _ostree_set_xattrs_fd (int fd,
GCancellable *cancellable,
GError **error);
+gboolean _ostree_set_xattrs (GFile *f, GVariant *xattrs,
+ GCancellable *cancellable, GError **error);
+
+
/* XX + / + checksum-2 + . + extension, but let's just use 256 for a
* bit of overkill.
*/
diff --git a/src/libostree/ostree-core.c b/src/libostree/ostree-core.c
index 185aa82..f43f58a 100644
--- a/src/libostree/ostree-core.c
+++ b/src/libostree/ostree-core.c
@@ -1073,8 +1073,8 @@ _ostree_set_xattrs_fd (int fd,
return ret;
}
-/**
- * ostree_set_xattrs:
+/*
+ * _ostree_set_xattrs:
* @f: a file
* @xattrs: Extended attribute list
* @cancellable: Cancellable
@@ -1085,10 +1085,10 @@ _ostree_set_xattrs_fd (int fd,
* attributes.
*/
gboolean
-ostree_set_xattrs (GFile *f,
- GVariant *xattrs,
- GCancellable *cancellable,
- GError **error)
+_ostree_set_xattrs (GFile *f,
+ GVariant *xattrs,
+ GCancellable *cancellable,
+ GError **error)
{
const char *path;
gboolean ret = FALSE;
diff --git a/src/libostree/ostree-core.h b/src/libostree/ostree-core.h
index 2a0a856..743ca8f 100644
--- a/src/libostree/ostree-core.h
+++ b/src/libostree/ostree-core.h
@@ -176,9 +176,6 @@ gboolean ostree_get_xattrs_for_file (GFile *f,
GCancellable *cancellable,
GError **error);
-gboolean ostree_set_xattrs (GFile *f, GVariant *xattrs,
- GCancellable *cancellable, GError **error);
-
gboolean
ostree_content_stream_parse (gboolean compressed,
GInputStream *input,
diff --git a/src/libostree/ostree-repo-checkout.c b/src/libostree/ostree-repo-checkout.c
index 82fdb70..a1f2c45 100644
--- a/src/libostree/ostree-repo-checkout.c
+++ b/src/libostree/ostree-repo-checkout.c
@@ -220,7 +220,7 @@ create_file_from_input (GFile *dest_file,
if (xattrs != NULL)
{
- if (!ostree_set_xattrs (dest_file, xattrs, cancellable, error))
+ if (!_ostree_set_xattrs (dest_file, xattrs, cancellable, error))
goto out;
}
diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c
index f43649b..3660250 100644
--- a/src/libostree/ostree-repo-commit.c
+++ b/src/libostree/ostree-repo-commit.c
@@ -91,7 +91,7 @@ commit_loose_object_trusted (OstreeRepo *self,
*/
if (xattrs != NULL)
{
- if (!ostree_set_xattrs (temp_file, xattrs, cancellable, error))
+ if (!_ostree_set_xattrs (temp_file, xattrs, cancellable, error))
goto out;
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]