diff --git a/src/adverb.c b/src/adverb.c index 02c3796df99a1540a9275007ee063ece60612c76..4bf717d23f02a39c8ae7e114da07b51031cff989 100644 --- a/src/adverb.c +++ b/src/adverb.c @@ -317,24 +317,6 @@ cli_log_func (const gchar *log_domain, g_printerr ("%s: %s\n", (const char *) user_data, message); } -static gboolean -boolean_environment (const gchar *name, - gboolean def) -{ - const gchar *value = g_getenv (name); - - if (g_strcmp0 (value, "1") == 0) - return TRUE; - - if (g_strcmp0 (value, "") == 0 || g_strcmp0 (value, "0") == 0) - return FALSE; - - if (value != NULL) - g_warning ("Unrecognised value \"%s\" for $%s", value, name); - - return def; -} - int main (int argc, char *argv[]) @@ -370,7 +352,7 @@ main (int argc, g_option_context_add_main_entries (context, options, NULL); - opt_verbose = boolean_environment ("PRESSURE_VESSEL_VERBOSE", FALSE); + opt_verbose = pv_boolean_environment ("PRESSURE_VESSEL_VERBOSE", FALSE); if (!g_option_context_parse (context, &argc, &argv, error)) { diff --git a/src/utils.c b/src/utils.c index 701906c642938cf07233f4aa5200ae76e7ea0873..025fe1e4261809fbcf92122cc2de51f06b42eb72 100644 --- a/src/utils.c +++ b/src/utils.c @@ -449,6 +449,24 @@ pv_rm_rf (const char *directory) return TRUE; } +gboolean +pv_boolean_environment (const gchar *name, + gboolean def) +{ + const gchar *value = g_getenv (name); + + if (g_strcmp0 (value, "1") == 0) + return TRUE; + + if (g_strcmp0 (value, "") == 0 || g_strcmp0 (value, "0") == 0) + return FALSE; + + if (value != NULL) + g_warning ("Unrecognised value \"%s\" for $%s", value, name); + + return def; +} + /** * pv_divert_stdout_to_stderr: * @error: Used to raise an error on failure diff --git a/src/utils.h b/src/utils.h index 9633e1f4ef79ab2e9d93386c68b538eeb89bb2d3..021a60dc5833ff38d98e3c6c485dc7257a652b3b 100644 --- a/src/utils.h +++ b/src/utils.h @@ -51,4 +51,7 @@ gboolean pv_cheap_tree_copy (const char *source_root, gboolean pv_rm_rf (const char *directory); +gboolean pv_boolean_environment (const gchar *name, + gboolean def); + FILE *pv_divert_stdout_to_stderr (GError **error); diff --git a/src/wrap.c b/src/wrap.c index 5901ff97ff7be3e82c1f06a6c31f24c7fda8463e..94d4e9a9525a37094b0af8e9908791d3c3880b4b 100644 --- a/src/wrap.c +++ b/src/wrap.c @@ -696,24 +696,6 @@ static GOptionEntry options[] = { NULL } }; -static gboolean -boolean_environment (const gchar *name, - gboolean def) -{ - const gchar *value = g_getenv (name); - - if (g_strcmp0 (value, "1") == 0) - return TRUE; - - if (g_strcmp0 (value, "") == 0 || g_strcmp0 (value, "0") == 0) - return FALSE; - - if (value != NULL) - g_warning ("Unrecognised value \"%s\" for $%s", value, name); - - return def; -} - static Tristate tristate_environment (const gchar *name) { @@ -789,7 +771,7 @@ main (int argc, } /* Set defaults */ - opt_batch = boolean_environment ("PRESSURE_VESSEL_BATCH", FALSE); + opt_batch = pv_boolean_environment ("PRESSURE_VESSEL_BATCH", FALSE); opt_freedesktop_app_id = g_strdup (g_getenv ("PRESSURE_VESSEL_FDO_APP_ID")); @@ -801,15 +783,15 @@ main (int argc, if (opt_home != NULL && opt_home[0] == '\0') g_clear_pointer (&opt_home, g_free); - opt_remove_game_overlay = boolean_environment ("PRESSURE_VESSEL_REMOVE_GAME_OVERLAY", - FALSE); + opt_remove_game_overlay = pv_boolean_environment ("PRESSURE_VESSEL_REMOVE_GAME_OVERLAY", + FALSE); opt_share_home = tristate_environment ("PRESSURE_VESSEL_SHARE_HOME"); - opt_gc_runtimes = boolean_environment ("PRESSURE_VESSEL_GC_RUNTIMES", TRUE); - opt_generate_locales = boolean_environment ("PRESSURE_VESSEL_GENERATE_LOCALES", TRUE); - opt_host_graphics = boolean_environment ("PRESSURE_VESSEL_HOST_GRAPHICS", - TRUE); - opt_share_pid = boolean_environment ("PRESSURE_VESSEL_SHARE_PID", TRUE); - opt_verbose = boolean_environment ("PRESSURE_VESSEL_VERBOSE", FALSE); + opt_gc_runtimes = pv_boolean_environment ("PRESSURE_VESSEL_GC_RUNTIMES", TRUE); + opt_generate_locales = pv_boolean_environment ("PRESSURE_VESSEL_GENERATE_LOCALES", TRUE); + opt_host_graphics = pv_boolean_environment ("PRESSURE_VESSEL_HOST_GRAPHICS", + TRUE); + opt_share_pid = pv_boolean_environment ("PRESSURE_VESSEL_SHARE_PID", TRUE); + opt_verbose = pv_boolean_environment ("PRESSURE_VESSEL_VERBOSE", FALSE); if (!opt_shell_cb ("$PRESSURE_VESSEL_SHELL", g_getenv ("PRESSURE_VESSEL_SHELL"), NULL, error))