summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2014-06-08 07:56:14 -0400
committerColin Walters <walters@verbum.org>2014-06-09 14:04:53 -0400
commit9f734494ff8a7b0750e1c01f48298d70e6cc8c56 (patch)
tree580b9c9aab763d543a7b7af8d635d960e488f067
parent51bf1fab0f96c4b40bbe9048a1fb81f9037ee5b6 (diff)
downloadostree-9f734494ff8a7b0750e1c01f48298d70e6cc8c56.tar.gz
libostree: Make OstreeLibarchiveInputStream explicitly private
We weren't installing the headers, but at the moment all symbols starting with ostree_ were being exported. Fix that by prefixing non-static symbols with '_'. https://bugzilla.gnome.org/show_bug.cgi?id=731369
-rw-r--r--src/libostree/ostree-libarchive-input-stream.c10
-rw-r--r--src/libostree/ostree-libarchive-input-stream.h6
-rw-r--r--src/libostree/ostree-repo-libarchive.c2
3 files changed, 9 insertions, 9 deletions
diff --git a/src/libostree/ostree-libarchive-input-stream.c b/src/libostree/ostree-libarchive-input-stream.c
index 701591e8..0b81c355 100644
--- a/src/libostree/ostree-libarchive-input-stream.c
+++ b/src/libostree/ostree-libarchive-input-stream.c
@@ -31,7 +31,7 @@ enum {
PROP_ARCHIVE
};
-G_DEFINE_TYPE (OstreeLibarchiveInputStream, ostree_libarchive_input_stream, G_TYPE_INPUT_STREAM)
+G_DEFINE_TYPE (OstreeLibarchiveInputStream, _ostree_libarchive_input_stream, G_TYPE_INPUT_STREAM)
struct _OstreeLibarchiveInputStreamPrivate {
struct archive *archive;
@@ -57,11 +57,11 @@ static gboolean ostree_libarchive_input_stream_close (GInputStream
static void
ostree_libarchive_input_stream_finalize (GObject *object)
{
- G_OBJECT_CLASS (ostree_libarchive_input_stream_parent_class)->finalize (object);
+ G_OBJECT_CLASS (_ostree_libarchive_input_stream_parent_class)->finalize (object);
}
static void
-ostree_libarchive_input_stream_class_init (OstreeLibarchiveInputStreamClass *klass)
+_ostree_libarchive_input_stream_class_init (OstreeLibarchiveInputStreamClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
GInputStreamClass *stream_class = G_INPUT_STREAM_CLASS (klass);
@@ -132,7 +132,7 @@ ostree_libarchive_input_stream_get_property (GObject *object,
}
static void
-ostree_libarchive_input_stream_init (OstreeLibarchiveInputStream *self)
+_ostree_libarchive_input_stream_init (OstreeLibarchiveInputStream *self)
{
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
OSTREE_TYPE_LIBARCHIVE_INPUT_STREAM,
@@ -141,7 +141,7 @@ ostree_libarchive_input_stream_init (OstreeLibarchiveInputStream *self)
}
GInputStream *
-ostree_libarchive_input_stream_new (struct archive *a)
+_ostree_libarchive_input_stream_new (struct archive *a)
{
OstreeLibarchiveInputStream *stream;
diff --git a/src/libostree/ostree-libarchive-input-stream.h b/src/libostree/ostree-libarchive-input-stream.h
index df18c054..ce6c0a2a 100644
--- a/src/libostree/ostree-libarchive-input-stream.h
+++ b/src/libostree/ostree-libarchive-input-stream.h
@@ -26,7 +26,7 @@
G_BEGIN_DECLS
-#define OSTREE_TYPE_LIBARCHIVE_INPUT_STREAM (ostree_libarchive_input_stream_get_type ())
+#define OSTREE_TYPE_LIBARCHIVE_INPUT_STREAM (_ostree_libarchive_input_stream_get_type ())
#define OSTREE_LIBARCHIVE_INPUT_STREAM(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), OSTREE_TYPE_LIBARCHIVE_INPUT_STREAM, OstreeLibarchiveInputStream))
#define OSTREE_LIBARCHIVE_INPUT_STREAM_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), OSTREE_TYPE_LIBARCHIVE_INPUT_STREAM, OstreeLibarchiveInputStreamClass))
#define OSTREE_IS_LIBARCHIVE_INPUT_STREAM(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), OSTREE_TYPE_LIBARCHIVE_INPUT_STREAM))
@@ -58,9 +58,9 @@ struct _OstreeLibarchiveInputStreamClass
void (*_g_reserved5) (void);
};
-GType ostree_libarchive_input_stream_get_type (void) G_GNUC_CONST;
+GType _ostree_libarchive_input_stream_get_type (void) G_GNUC_CONST;
-GInputStream * ostree_libarchive_input_stream_new (struct archive *a);
+GInputStream * _ostree_libarchive_input_stream_new (struct archive *a);
G_END_DECLS
diff --git a/src/libostree/ostree-repo-libarchive.c b/src/libostree/ostree-repo-libarchive.c
index b7efaac7..90517d20 100644
--- a/src/libostree/ostree-repo-libarchive.c
+++ b/src/libostree/ostree-repo-libarchive.c
@@ -100,7 +100,7 @@ import_libarchive_entry_file (OstreeRepo *self,
return FALSE;
if (g_file_info_get_file_type (file_info) == G_FILE_TYPE_REGULAR)
- archive_stream = ostree_libarchive_input_stream_new (a);
+ archive_stream = _ostree_libarchive_input_stream_new (a);
if (!ostree_raw_file_to_content_stream (archive_stream, file_info, NULL,
&file_object_input, &length, cancellable, error))