Skip to content

Commit

Permalink
Merge pull request #3101 from cgwalters/drop-redundant-includes
Browse files Browse the repository at this point in the history 
main: Drop some redundant includes of `ot-main.h`
  • Loading branch information
@jmarrero
jmarrero authored Nov 28, 2023
2 parents 12cbb3d + 0c85e1f commit d24714e
Show file tree
Hide file tree
Showing 66 changed files with 2 additions and 69 deletions.
1 change: 0 additions & 1 deletion src/ostree/ostree-trivial-httpd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@

#include "ostree.h"
#include "ot-builtins.h"
#include "ot-main.h"
#include "otutil.h"

#include <err.h>
Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-admin-builtin-boot-complete.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include "ostree.h"
#include "ot-admin-builtins.h"
#include "ot-admin-functions.h"
#include "ot-main.h"
#include "otutil.h"

#include "ostree-cmd-private.h"
Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-admin-builtin-cleanup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include "ostree.h"
#include "ot-admin-builtins.h"
#include "ot-admin-functions.h"
#include "ot-main.h"

#include <glib/gi18n.h>

Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-admin-builtin-deploy.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
#include "ostree.h"
#include "ot-admin-builtins.h"
#include "ot-admin-functions.h"
#include "ot-main.h"
#include "otutil.h"

#include <glib/gi18n.h>
Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-admin-builtin-diff.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include "ostree.h"
#include "ot-admin-builtins.h"
#include "ot-admin-functions.h"
#include "ot-main.h"

#include <glib/gi18n.h>

Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-admin-builtin-finalize-staged.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
#include "ostree.h"
#include "ot-admin-builtins.h"
#include "ot-admin-functions.h"
#include "ot-main.h"
#include "otutil.h"

#include "ostree-cmd-private.h"
Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-admin-builtin-init-fs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

#include "ot-admin-builtins.h"
#include "ot-admin-functions.h"
#include "ot-main.h"
#include "otutil.h"

#include <glib/gi18n.h>
Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-admin-builtin-instutil.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include "ot-admin-functions.h"
#include "ot-admin-instutil-builtins.h"
#include "ot-builtins.h"
#include "ot-main.h"

#include <glib/gi18n.h>

Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-admin-builtin-kargs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include "ot-admin-builtins.h"
#include "ot-admin-functions.h"
#include "ot-admin-kargs-builtins.h"
#include "ot-main.h"
#include "otutil.h"

#include <glib/gi18n.h>
Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-admin-builtin-lock-finalization.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include "ostree.h"
#include "ot-admin-builtins.h"
#include "ot-admin-functions.h"
#include "ot-main.h"
#include "otutil.h"

#include <glib/gi18n.h>
Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-admin-builtin-os-init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

#include "ot-admin-builtins.h"
#include "ot-admin-functions.h"
#include "ot-main.h"
#include "otutil.h"

#include <glib/gi18n.h>
Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-admin-builtin-pin.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include "ostree.h"
#include "ot-admin-builtins.h"
#include "ot-admin-functions.h"
#include "ot-main.h"
#include "otutil.h"

static gboolean opt_unpin;
Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-admin-builtin-post-copy.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include "ostree.h"
#include "ot-admin-builtins.h"
#include "ot-admin-functions.h"
#include "ot-main.h"
#include "otutil.h"

#include <glib/gi18n.h>
Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-admin-builtin-set-default.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#include "ostree.h"
#include "ot-admin-builtins.h"
#include "ot-admin-functions.h"
#include "ot-main.h"
#include "otutil.h"

static GOptionEntry options[] = { { NULL } };
Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-admin-builtin-set-origin.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#include "ostree.h"
#include "ot-admin-builtins.h"
#include "ot-admin-functions.h"
#include "ot-main.h"
#include "otutil.h"

#include <glib/gi18n.h>
Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-admin-builtin-status.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
#include "ostree.h"
#include "ot-admin-builtins.h"
#include "ot-admin-functions.h"
#include "ot-main.h"

#include <glib/gi18n.h>

Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-admin-builtin-switch.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#include "ostree.h"
#include "ot-admin-builtins.h"
#include "ot-admin-functions.h"
#include "ot-main.h"
#include "otutil.h"

#include <glib/gi18n.h>
Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-admin-builtin-undeploy.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include "ostree.h"
#include "ot-admin-builtins.h"
#include "ot-admin-functions.h"
#include "ot-main.h"
#include "otutil.h"

static GOptionEntry options[] = { { NULL } };
Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-admin-builtin-unlock.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#include "ostree.h"
#include "ot-admin-builtins.h"
#include "ot-admin-functions.h"
#include "ot-main.h"
#include "otutil.h"

#include <err.h>
Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-admin-builtin-upgrade.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include "ostree.h"
#include "ot-admin-builtins.h"
#include "ot-admin-functions.h"
#include "ot-main.h"
#include "otutil.h"

#include <glib/gi18n.h>
Expand Down
3 changes: 1 addition & 2 deletions src/ostree/ot-admin-functions.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@

#pragma once

#include <gio/gio.h>
#include <ostree.h>
#include "ot-main.h"

G_BEGIN_DECLS

Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-admin-instutil-builtin-grub2-generate.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

#include "ostree-cmd-private.h"
#include "ot-admin-instutil-builtins.h"
#include "ot-main.h"

#include "otutil.h"

Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-admin-instutil-builtin-selinux-ensure-labeled.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
#include <string.h>

#include "ot-admin-instutil-builtins.h"
#include "ot-main.h"

#include "otutil.h"

Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-admin-instutil-builtin-set-kargs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
#include <string.h>

#include "ot-admin-instutil-builtins.h"
#include "ot-main.h"

#include "ostree.h"
#include "otutil.h"
Expand Down
3 changes: 0 additions & 3 deletions src/ostree/ot-admin-kargs-builtin-edit-in-place.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@
#include "config.h"

#include "ot-admin-kargs-builtins.h"
#include "ot-main.h"

#include "ostree.h"
#include "otutil.h"

static char **opt_kargs_edit_in_place_append;
Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-builtin-admin.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
#include "ot-admin-builtins.h"
#include "ot-admin-functions.h"
#include "ot-builtins.h"
#include "ot-main.h"

#include <glib/gi18n.h>

Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-builtin-cat.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

#include "ostree.h"
#include "ot-builtins.h"
#include "ot-main.h"
#include "otutil.h"

#include <gio/gunixoutputstream.h>
Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-builtin-checkout.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@

#include "ostree.h"
#include "ot-builtins.h"
#include "ot-main.h"
#include "otutil.h"

static gboolean opt_user_mode;
Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-builtin-checksum.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

#include "ostree.h"
#include "ot-builtins.h"
#include "ot-main.h"

#include <string.h>

Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-builtin-commit.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
#include "ostree.h"
#include "ot-builtins.h"
#include "ot-editor.h"
#include "ot-main.h"
#include "otutil.h"
#include "parse-datetime.h"

Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-builtin-config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

#include "ostree.h"
#include "ot-builtins.h"
#include "ot-main.h"
#include "otutil.h"

static char *opt_group;
Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-builtin-create-usb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

#include "ostree.h"
#include "ot-builtins.h"
#include "ot-main.h"
#include "otutil.h"

#include "ostree-remote-private.h"
Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-builtin-diff.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

#include "ostree.h"
#include "ot-builtins.h"
#include "ot-main.h"
#include "otutil.h"

static gboolean opt_stats;
Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-builtin-export.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include "ostree-repo-file.h"
#include "ostree.h"
#include "ot-builtins.h"
#include "ot-main.h"
#include "otutil.h"

#ifdef HAVE_LIBARCHIVE
Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-builtin-find-remotes.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

#include "ostree.h"
#include "ot-builtins.h"
#include "ot-main.h"
#include "otutil.h"

#include "ostree-remote-private.h"
Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-builtin-fsck.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
#include "ostree-cmd-private.h"
#include "ostree.h"
#include "ot-builtins.h"
#include "ot-main.h"
#include "otutil.h"

static gboolean opt_quiet;
Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-builtin-gpg-sign.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include "ostree-core-private.h"
#include "ostree.h"
#include "ot-builtins.h"
#include "ot-main.h"
#include "otutil.h"

static gboolean opt_delete;
Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-builtin-init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

#include "ostree.h"
#include "ot-builtins.h"
#include "ot-main.h"

static char *opt_mode = "bare";
static char *opt_collection_id = NULL;
Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-builtin-log.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include "ostree.h"
#include "ot-builtins.h"
#include "ot-dump.h"
#include "ot-main.h"
#include "otutil.h"

static gboolean opt_raw;
Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-builtin-ls.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include "ostree-repo-file.h"
#include "ostree.h"
#include "ot-builtins.h"
#include "ot-main.h"
#include "otutil.h"

static gboolean opt_dironly;
Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-builtin-prune.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

#include "ostree.h"
#include "ot-builtins.h"
#include "ot-main.h"
#include "otutil.h"
#include "parse-datetime.h"

Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-builtin-pull-local.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@

#include "ostree.h"
#include "ot-builtins.h"
#include "ot-main.h"
#include "otutil.h"

static char *opt_remote;
Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-builtin-pull.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

#include "ostree.h"
#include "ot-builtins.h"
#include "ot-main.h"
#include "otutil.h"

static gboolean opt_disable_fsync;
Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-builtin-refs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

#include "ostree.h"
#include "ot-builtins.h"
#include "ot-main.h"

static gboolean opt_delete;
static gboolean opt_list;
Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-builtin-remote.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#include "config.h"

#include "ot-builtins.h"
#include "ot-main.h"
#include "ot-remote-builtins.h"

static OstreeCommand remote_subcommands[] = {
Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-builtin-reset.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

#include "ostree.h"
#include "ot-builtins.h"
#include "ot-main.h"
#include "otutil.h"

/* ATTENTION:
Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-builtin-rev-parse.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

#include "ostree.h"
#include "ot-builtins.h"
#include "ot-main.h"
#include "otutil.h"
#include <stdbool.h>

Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-builtin-show.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include "ostree.h"
#include "ot-builtins.h"
#include "ot-dump.h"
#include "ot-main.h"
#include "otutil.h"

static gboolean opt_print_related;
Expand Down
1 change: 0 additions & 1 deletion src/ostree/ot-builtin-sign.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
#include "ostree-sign.h"
#include "ostree.h"
#include "ot-builtins.h"
#include "ot-main.h"
#include "otutil.h"

static gboolean opt_delete;
Expand Down
Loading

0 comments on commit d24714e

Please sign in to comment.