shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-01-09 01:18:35 +03:00
Code Issues Projects Releases Wiki Activity

libostree: mark ostree_repo_checkout_tree_at as deprecated

Browse Source 
and move its definition to a separate file.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

Closes: #417
Approved by: cgwalters
This commit is contained in:
Giuseppe Scrivano 2016-07-27 11:11:13 +02:00 committed by Atomic Bot
parent 30963766c7
commit 8867693240
5 changed files with 79 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile-libostree-defines.am
View File

@ -35,4 +35,5 @@ libostree_public_headers = \
src/libostree/ostree-sysroot-upgrader.h \
src/libostree/ostree-deployment.h \
src/libostree/ostree-bootconfig-parser.h \
src/libostree/ostree-repo-deprecated.h \
$(NULL)

3
Makefile-libostree.am
View File

@ -205,7 +205,8 @@ gpgreadmedir = $(pkgdatadir)/trusted.gpg.d
EXTRA_DIST += src/libostree/README-gpg src/libostree/bupsplit.h \
src/libostree/ostree-enumtypes.h.template \
src/libostree/ostree-enumtypes.c.template \
src/libostree/ostree-deployment-private.h
src/libostree/ostree-deployment-private.h \
src/libostree/ostree-repo-deprecated.h
install-mkdir-remotes-d-hook:
mkdir -p $(DESTDIR)$(sysconfdir)/ostree/remotes.d

2
src/libostree/ostree-repo-checkout.c
View File

@ -844,6 +844,8 @@ ostree_repo_checkout_tree (OstreeRepo *self,
* Note in addition that unlike ostree_repo_checkout_tree(), the
* default is not to use the repository-internal uncompressed objects
* cache.
*
* This function is deprecated. Use ostree_repo_checkout_at() instead.
*/
gboolean
ostree_repo_checkout_tree_at (OstreeRepo *self,

69
src/libostree/ostree-repo-deprecated.h Normal file
View File

@ -0,0 +1,69 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
*
* Copyright (C) 2016 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#pragma once
#include "ostree-core.h"
#include "ostree-types.h"
#ifndef G_GNUC_DEPRECATED_FOR
# define G_GNUC_DEPRECATED_FOR(x)
#endif
G_BEGIN_DECLS
/**
* OstreeRepoCheckoutOptions: (skip)
*
* An extensible options structure controlling checkout. Ensure that
* you have entirely zeroed the structure, then set just the desired
* options. This is used by ostree_repo_checkout_tree_at() which
* supercedes previous separate enumeration usage in
* ostree_repo_checkout_tree().
*/
typedef struct {
OstreeRepoCheckoutMode mode;
OstreeRepoCheckoutOverwriteMode overwrite_mode;
guint enable_uncompressed_cache : 1;
guint disable_fsync : 1;
guint process_whiteouts : 1;
guint no_copy_fallback : 1;
guint reserved : 28;
const char *subpath;
OstreeRepoDevInoCache *devino_to_csum_cache;
guint unused_uints[6];
gpointer unused_ptrs[7];
} OstreeRepoCheckoutOptions;
_OSTREE_PUBLIC
gboolean ostree_repo_checkout_tree_at (OstreeRepo *self,
OstreeRepoCheckoutOptions *options,
int destination_dfd,
const char *destination_path,
const char *commit,
GCancellable *cancellable,
GError **error)
G_GNUC_DEPRECATED_FOR(ostree_repo_checkout_at);
G_END_DECLS

41
src/libostree/ostree-repo.h
View File

@ -735,33 +735,6 @@ ostree_repo_checkout_tree (OstreeRepo *self,
GCancellable *cancellable,
GError **error);
/**
* OstreeRepoCheckoutOptions: (skip)
*
* An extensible options structure controlling checkout. Ensure that
* you have entirely zeroed the structure, then set just the desired
* options. This is used by ostree_repo_checkout_tree_at() which
* supercedes previous separate enumeration usage in
* ostree_repo_checkout_tree().
*/
typedef struct {
OstreeRepoCheckoutMode mode;
OstreeRepoCheckoutOverwriteMode overwrite_mode;
guint enable_uncompressed_cache : 1;
guint disable_fsync : 1;
guint process_whiteouts : 1;
guint no_copy_fallback : 1;
guint reserved : 28;
const char *subpath;
OstreeRepoDevInoCache *devino_to_csum_cache;
guint unused_uints[6];
gpointer unused_ptrs[7];
} OstreeRepoCheckoutOptions;
/**
* OstreeRepoCheckoutAtOptions:
*
@ -797,15 +770,6 @@ OstreeRepoDevInoCache * ostree_repo_devino_cache_ref (OstreeRepoDevInoCache *cac
_OSTREE_PUBLIC
void ostree_repo_devino_cache_unref (OstreeRepoDevInoCache *cache);
_OSTREE_PUBLIC
gboolean ostree_repo_checkout_tree_at (OstreeRepo *self,
OstreeRepoCheckoutOptions *options,
int destination_dfd,
const char *destination_path,
const char *commit,
GCancellable *cancellable,
GError **error);
_OSTREE_PUBLIC
gboolean ostree_repo_checkout_at (OstreeRepo *self,
OstreeRepoCheckoutAtOptions *options,
@ -1123,3 +1087,8 @@ gboolean ostree_repo_regenerate_summary (OstreeRepo *self,
G_END_DECLS
/* Include here as the functions defined before should not depend on anything which
is defined in -deprecated.h. */
#include "ostree-repo-deprecated.h"