keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

app: Switch subcommands to use "base" RpmOstreeCommand struct

Browse Source 
They were just duplicates.  Prepartory cleanup for future patches.

Closes: #681
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-03-15 14:18:23 -04:00 committed by Atomic Bot
parent 24faf942df
commit 7e4f56a862
4 changed files with 12 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/rpmostree-builtin-compose.c
View File

@ -28,12 +28,7 @@
#include <glib/gi18n.h>
typedef struct {
const char *name;
int (*fn) (int argc, char **argv, GCancellable *cancellable, GError **error);
} RpmOstreeComposeCommand;
static RpmOstreeComposeCommand compose_subcommands[] = {
static RpmOstreeCommand compose_subcommands[] = {
{ "tree", rpmostree_compose_builtin_tree },
{ NULL, NULL }
};
@ -41,7 +36,7 @@ static RpmOstreeComposeCommand compose_subcommands[] = {
static GOptionContext *
compose_option_context_new_with_commands (void)
{
RpmOstreeComposeCommand *command = compose_subcommands;
RpmOstreeCommand *command = compose_subcommands;
GOptionContext *context;
GString *summary;
@ -65,7 +60,7 @@ compose_option_context_new_with_commands (void)
int
rpmostree_builtin_compose (int argc, char **argv, GCancellable *cancellable, GError **error)
{
RpmOstreeComposeCommand *subcommand;
RpmOstreeCommand *subcommand;
const char *subcommand_name = NULL;
g_autofree char *prgname = NULL;
int exit_status = EXIT_SUCCESS;

11
src/app/rpmostree-builtin-container.c
View File

@ -23,12 +23,7 @@
#include "rpmostree-container-builtins.h"
#include "rpmostree-rpm-util.h"
typedef struct {
const char *name;
int (*fn) (int argc, char **argv, GCancellable *cancellable, GError **error);
} RpmOstreeContainerCommand;
static RpmOstreeContainerCommand container_subcommands[] = {
static RpmOstreeCommand container_subcommands[] = {
{ "init", rpmostree_container_builtin_init },
{ "assemble", rpmostree_container_builtin_assemble },
/* { "start", rpmostree_container_builtin_start }, */
@ -39,7 +34,7 @@ static RpmOstreeContainerCommand container_subcommands[] = {
static GOptionContext *
container_option_context_new_with_commands (void)
{
RpmOstreeContainerCommand *command = container_subcommands;
RpmOstreeCommand *command = container_subcommands;
GOptionContext *context;
GString *summary;
@ -63,7 +58,7 @@ container_option_context_new_with_commands (void)
int
rpmostree_builtin_container (int argc, char **argv, GCancellable *cancellable, GError **error)
{
RpmOstreeContainerCommand *subcommand;
RpmOstreeCommand *subcommand;
const char *subcommand_name = NULL;
g_autofree char *prgname = NULL;
int exit_status = EXIT_SUCCESS;

11
src/app/rpmostree-builtin-db.c
View File

@ -23,12 +23,7 @@
#include "rpmostree-db-builtins.h"
#include "rpmostree-rpm-util.h"
typedef struct {
const char *name;
int (*fn) (int argc, char **argv, GCancellable *cancellable, GError **error);
} RpmOstreeDbCommand;
static RpmOstreeDbCommand rpm_subcommands[] = {
static RpmOstreeCommand rpm_subcommands[] = {
{ "diff", rpmostree_db_builtin_diff },
{ "list", rpmostree_db_builtin_list },
{ "version", rpmostree_db_builtin_version },
@ -45,7 +40,7 @@ static GOptionEntry global_entries[] = {
static GOptionContext *
rpm_option_context_new_with_commands (void)
{
RpmOstreeDbCommand *command = rpm_subcommands;
RpmOstreeCommand *command = rpm_subcommands;
GOptionContext *context;
GString *summary;
@ -127,7 +122,7 @@ out:
int
rpmostree_builtin_db (int argc, char **argv, GCancellable *cancellable, GError **error)
{
RpmOstreeDbCommand *subcommand;
RpmOstreeCommand *subcommand;
const char *subcommand_name = NULL;
g_autofree char *prgname = NULL;
int exit_status = EXIT_SUCCESS;

11
src/app/rpmostree-builtin-internals.c
View File

@ -23,12 +23,7 @@
#include "rpmostree-internals-builtins.h"
#include "rpmostree-rpm-util.h"
typedef struct {
const char *name;
int (*fn) (int argc, char **argv, GCancellable *cancellable, GError **error);
} RpmOstreeInternalsCommand;
static RpmOstreeInternalsCommand internals_subcommands[] = {
static RpmOstreeCommand internals_subcommands[] = {
{ "unpack", rpmostree_internals_builtin_unpack },
{ NULL, NULL }
};
@ -42,7 +37,7 @@ static GOptionEntry global_entries[] = {
static GOptionContext *
internals_option_context_new_with_commands (void)
{
RpmOstreeInternalsCommand *command = internals_subcommands;
RpmOstreeCommand *command = internals_subcommands;
GOptionContext *context;
GString *summary;
@ -66,7 +61,7 @@ internals_option_context_new_with_commands (void)
int
rpmostree_builtin_internals (int argc, char **argv, GCancellable *cancellable, GError **error)
{
RpmOstreeInternalsCommand *subcommand;
RpmOstreeCommand *subcommand;
const char *subcommand_name = NULL;
g_autofree char *prgname = NULL;
int exit_status = EXIT_SUCCESS;