packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tree-wide: Squash a few warnings when building with no features 

Noticed these since I had a local configured build with no features for testing
the PAPR context for it.

Closes: #1201
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-09-21 11:01:29 -04:00 committed by Atomic Bot
parent f639f8f4c0
commit 3f8f878fa3
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ostree/ot-builtin-commit.c
View File

@ -224,6 +224,7 @@ commit_filter (OstreeRepo *self,
return OSTREE_REPO_COMMIT_FILTER_ALLOW; return OSTREE_REPO_COMMIT_FILTER_ALLOW;
} }
#ifdef HAVE_LIBARCHIVE
typedef struct { typedef struct {
GRegex *regex; GRegex *regex;
const char *replacement; const char *replacement;
@ -245,6 +246,7 @@ handle_translate_pathname (OstreeRepo *repo,
g_assert (ret); g_assert (ret);
return ret; return ret;
} }
#endif
static gboolean static gboolean
commit_editor (OstreeRepo *repo, commit_editor (OstreeRepo *repo,

4
src/ostree/ot-builtin-export.c
View File

@ -68,15 +68,15 @@ ostree_builtin_export (int argc, char **argv, GCancellable *cancellable, GError
g_autoptr(GOptionContext) context = NULL; g_autoptr(GOptionContext) context = NULL;
g_autoptr(OstreeRepo) repo = NULL; g_autoptr(OstreeRepo) repo = NULL;
gboolean ret = FALSE; gboolean ret = FALSE;
const char *rev;
g_autoptr(GFile) root = NULL; g_autoptr(GFile) root = NULL;
g_autoptr(GFile) subtree = NULL; g_autoptr(GFile) subtree = NULL;
g_autofree char *commit = NULL; g_autofree char *commit = NULL;
g_autoptr(GVariant) commit_data = NULL; g_autoptr(GVariant) commit_data = NULL;
#ifdef HAVE_LIBARCHIVE #ifdef HAVE_LIBARCHIVE
const char *rev;
g_autoptr(OtAutoArchiveWrite) a = NULL; g_autoptr(OtAutoArchiveWrite) a = NULL;
#endif
OstreeRepoExportArchiveOptions opts = { 0, }; OstreeRepoExportArchiveOptions opts = { 0, };
#endif
context = g_option_context_new ("COMMIT - Stream COMMIT to stdout in tar format"); context = g_option_context_new ("COMMIT - Stream COMMIT to stdout in tar format");