marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid many copies of usage_error function 

No need to have the identical static function in every
builtin command.
tingping/wmclass
Matthias Clasen 2015-01-14 18:49:34 -05:00
parent 92f23cbde2
commit e295608165
9 changed files with 12 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xdg-app-builtins-add-repo.c
View File

@ -17,14 +17,6 @@ static GOptionEntry options[] = {
{ NULL }
};
static void
usage_error (GOptionContext *context, const char *message, GError **error)
{
gs_free gchar *help = g_option_context_get_help (context, TRUE, NULL);
g_printerr ("%s", help);
g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, message);
}
gboolean
xdg_app_builtin_add_repo (int argc, char **argv, GCancellable *cancellable, GError **error)
{

8
xdg-app-builtins-build-init.c
View File

@ -21,14 +21,6 @@ static GOptionEntry options[] = {
{ NULL }
};
static void
usage_error (GOptionContext *context, const char *message, GError **error)
{
gs_free gchar *help = g_option_context_get_help (context, TRUE, NULL);
g_printerr ("%s", help);
g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, message);
}
gboolean
xdg_app_builtin_build_init (int argc, char **argv, GCancellable *cancellable, GError **error)
{

8
xdg-app-builtins-build.c
View File

@ -22,14 +22,6 @@ static GOptionEntry options[] = {
{ NULL }
};
static void
usage_error (GOptionContext *context, const char *message, GError **error)
{
gs_free gchar *help = g_option_context_get_help (context, TRUE, NULL);
g_printerr ("%s", help);
g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, message);
}
gboolean
xdg_app_builtin_build (int argc, char **argv, GCancellable *cancellable, GError **error)
{

8
xdg-app-builtins-delete-repo.c
View File

@ -8,14 +8,6 @@
#include "xdg-app-builtins.h"
static void
usage_error (GOptionContext *context, const char *message, GError **error)
{
gs_free gchar *help = g_option_context_get_help (context, TRUE, NULL);
g_printerr ("%s", help);
g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, message);
}
gboolean
xdg_app_builtin_delete_repo (int argc, char **argv, GCancellable *cancellable, GError **error)
{

8
xdg-app-builtins-install.c
View File

@ -17,14 +17,6 @@ static GOptionEntry options[] = {
{ NULL }
};
static void
usage_error (GOptionContext *context, const char *message, GError **error)
{
gs_free gchar *help = g_option_context_get_help (context, TRUE, NULL);
g_printerr ("%s", help);
g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, message);
}
gboolean
xdg_app_builtin_install_runtime (int argc, char **argv, GCancellable *cancellable, GError **error)
{

8
xdg-app-builtins-run.c
View File

@ -24,14 +24,6 @@ static GOptionEntry options[] = {
{ NULL }
};
static void
usage_error (GOptionContext *context, const char *message, GError **error)
{
gs_free gchar *help = g_option_context_get_help (context, TRUE, NULL);
g_printerr ("%s", help);
g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, message);
}
static char *
extract_unix_path_from_dbus_addres (const char *address)
{

8
xdg-app-builtins-update.c
View File

@ -17,14 +17,6 @@ static GOptionEntry options[] = {
{ NULL }
};
static void
usage_error (GOptionContext *context, const char *message, GError **error)
{
gs_free gchar *help = g_option_context_get_help (context, TRUE, NULL);
g_printerr ("%s", help);
g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, message);
}
gboolean
xdg_app_builtin_update_runtime (int argc, char **argv, GCancellable *cancellable, GError **error)
{

4
xdg-app-builtins.h
View File

@ -22,6 +22,10 @@ gboolean xdg_app_option_context_parse (GOptionContext *context,
GCancellable *cancellable,
GError **error);
void usage_error (GOptionContext *context,
const char *message,
GError **error);
#define BUILTINPROTO(name) gboolean xdg_app_builtin_ ## name (int argc, char **argv, GCancellable *cancellable, GError **error)
BUILTINPROTO(add_repo);

8
xdg-app-main.c
View File

@ -153,6 +153,14 @@ xdg_app_option_context_parse (GOptionContext *context,
return success;
}
void
usage_error (GOptionContext *context, const char *message, GError **error)
{
gs_free gchar *help = g_option_context_get_help (context, TRUE, NULL);
g_printerr ("%s", help);
g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, message);
}
int
xdg_app_run (int argc,
char **argv,