luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sane-fixes' into 'master'

Browse Source 
tree: Fix various ableist language

See merge request GNOME/glib!1546
This commit is contained in:
Sebastian Dröge 2020-06-23 10:41:28 +00:00
commit 50ce2792ff
16 changed files with 52 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/glocalfile.c
View File

@ -1518,7 +1518,7 @@ g_local_file_delete (GFile *file,
{
int errsv = errno;
/* Posix allows EEXIST too, but the more sane error
/* Posix allows EEXIST too, but the clearer error
is G_IO_ERROR_NOT_FOUND, and it's what nautilus
expects */
if (errsv == EEXIST)

4
gio/gmenumodel.c
View File

@ -309,7 +309,7 @@ g_menu_model_real_iterate_item_attributes (GMenuModel *model,
else
{
g_critical ("GMenuModel implementation '%s' doesn't override iterate_item_attributes() "
"and fails to return sane values from get_item_attributes()",
"and fails to return valid values from get_item_attributes()",
G_OBJECT_TYPE_NAME (model));
result = NULL;
}
@ -373,7 +373,7 @@ g_menu_model_real_iterate_item_links (GMenuModel *model,
else
{
g_critical ("GMenuModel implementation '%s' doesn't override iterate_item_links() "
"and fails to return sane values from get_item_links()",
"and fails to return valid values from get_item_links()",
G_OBJECT_TYPE_NAME (model));
result = NULL;
}

2
glib/gcharset.c
View File

@ -315,7 +315,7 @@ g_get_console_charset (const char **charset)
g_free (emsg);
}
}
/* fall-back to UTF-8 if the rest failed (it's a sane and universal default) */
/* fall-back to UTF-8 if the rest failed (it's a universal default) */
if (raw == NULL)
raw = "UTF-8";

2
glib/gconstructor.h
View File

@ -1,6 +1,6 @@
/*
If G_HAS_CONSTRUCTORS is true then the compiler support *both* constructors and
destructors, in a sane way, including e.g. on library unload. If not you're on
destructors, in a usable way, including e.g. on library unload. If not you're on
your own.
Some compilers need #pragma to handle this, which does not work with macros,

12
glib/gdate.c
View File

@ -83,8 +83,8 @@
*
* #GDate is simple to use. First you need a "blank" date; you can get a
* dynamically allocated date from g_date_new(), or you can declare an
* automatic variable or array and initialize it to a sane state by
* calling g_date_clear(). A cleared date is sane; it's safe to call
* automatic variable or array and initialize it by
* calling g_date_clear(). A cleared date is safe; it's safe to call
* g_date_set_dmy() and the other mutator functions to initialize the
* value of a cleared date. However, a cleared date is initially
* invalid, meaning that it doesn't represent a day that exists.
@ -146,7 +146,7 @@
*
* If it's declared on the stack, it will contain garbage so must be
* initialized with g_date_clear(). g_date_clear() makes the date invalid
* but sane. An invalid date doesn't represent a day, it's "empty." A date
* but safe. An invalid date doesn't represent a day, it's "empty." A date
* becomes valid after you set it to a Julian day or you set a day, month,
* and year.
*/
@ -259,7 +259,7 @@
* g_date_new:
*
* Allocates a #GDate and initializes
* it to a sane state. The new date will
* it to a safe state. The new date will
* be cleared (as if you'd called g_date_clear()) but invalid (it won't
* represent an existing day). Free the return value with g_date_free().
*
@ -862,7 +862,7 @@ g_date_days_between (const GDate *d1,
* @date: pointer to one or more dates to clear
* @n_dates: number of dates to clear
*
* Initializes one or more #GDate structs to a sane but invalid
* Initializes one or more #GDate structs to a safe but invalid
* state. The cleared dates will not represent an existing date, but will
* not contain garbage. Useful to init a date declared on the stack.
* Validity can be tested with g_date_valid().
@ -2056,7 +2056,7 @@ g_date_compare (const GDate *lhs,
* @tm: (not nullable): struct tm to fill
*
* Fills in the date-related bits of a struct tm using the @date value.
* Initializes the non-date parts with something sane but meaningless.
* Initializes the non-date parts with something safe but meaningless.
*/
void
g_date_to_struct_tm (const GDate *d,

2
glib/gdate.h
View File

@ -178,7 +178,7 @@ GLIB_AVAILABLE_IN_ALL
guint g_date_get_iso8601_week_of_year (const GDate *date);
/* If you create a static date struct you need to clear it to get it
* in a sane state before use. You can clear a whole array at
* in a safe state before use. You can clear a whole array at
* once with the ndates argument.
*/
GLIB_AVAILABLE_IN_ALL

5
glib/gdatetime.c
View File

@ -935,9 +935,8 @@ g_date_time_new_from_unix (GTimeZone *tz,
* time zone @tz. The time is as accurate as the system allows, to a
* maximum accuracy of 1 microsecond.
*
* This function will always succeed unless the system clock is set to
* truly insane values (or unless GLib is still being used after the
* year 9999).
* This function will always succeed unless GLib is still being used after the
* year 9999.
*
* You should release the return value by calling g_date_time_unref()
* when you are done with it.

36
glib/gspawn.c
View File

@ -1126,7 +1126,7 @@ set_cloexec (void *data, gint fd)
}
static gint
sane_close (gint fd)
safe_close (gint fd)
{
gint ret;
@ -1141,7 +1141,7 @@ G_GNUC_UNUSED static int
close_func (void *data, int fd)
{
if (fd >= GPOINTER_TO_INT (data))
(void) sane_close (fd);
(void) safe_close (fd);
return 0;
}
@ -1232,7 +1232,7 @@ safe_fdwalk (int (*cb)(void *data, int fd), void *data)
}
}
sane_close (dir_fd);
safe_close (dir_fd);
return res;
}
@ -1290,7 +1290,7 @@ safe_closefrom (int lowfd)
}
static gint
sane_dup2 (gint fd1, gint fd2)
safe_dup2 (gint fd1, gint fd2)
{
gint ret;
@ -1302,7 +1302,7 @@ sane_dup2 (gint fd1, gint fd2)
}
static gint
sane_open (const char *path, gint mode)
safe_open (const char *path, gint mode)
{
gint ret;
@ -1349,7 +1349,7 @@ do_exec (gint child_err_report_fd,
{
/* dup2 can't actually fail here I don't think */
if (sane_dup2 (stdin_fd, 0) < 0)
if (safe_dup2 (stdin_fd, 0) < 0)
write_err_and_exit (child_err_report_fd,
CHILD_DUP2_FAILED);
@ -1358,9 +1358,9 @@ do_exec (gint child_err_report_fd,
else if (!child_inherits_stdin)
{
/* Keep process from blocking on a read of stdin */
gint read_null = sane_open ("/dev/null", O_RDONLY);
gint read_null = safe_open ("/dev/null", O_RDONLY);
g_assert (read_null != -1);
sane_dup2 (read_null, 0);
safe_dup2 (read_null, 0);
close_and_invalidate (&read_null);
}
@ -1368,7 +1368,7 @@ do_exec (gint child_err_report_fd,
{
/* dup2 can't actually fail here I don't think */
if (sane_dup2 (stdout_fd, 1) < 0)
if (safe_dup2 (stdout_fd, 1) < 0)
write_err_and_exit (child_err_report_fd,
CHILD_DUP2_FAILED);
@ -1376,9 +1376,9 @@ do_exec (gint child_err_report_fd,
}
else if (stdout_to_null)
{
gint write_null = sane_open ("/dev/null", O_WRONLY);
gint write_null = safe_open ("/dev/null", O_WRONLY);
g_assert (write_null != -1);
sane_dup2 (write_null, 1);
safe_dup2 (write_null, 1);
close_and_invalidate (&write_null);
}
@ -1386,7 +1386,7 @@ do_exec (gint child_err_report_fd,
{
/* dup2 can't actually fail here I don't think */
if (sane_dup2 (stderr_fd, 2) < 0)
if (safe_dup2 (stderr_fd, 2) < 0)
write_err_and_exit (child_err_report_fd,
CHILD_DUP2_FAILED);
@ -1394,8 +1394,8 @@ do_exec (gint child_err_report_fd,
}
else if (stderr_to_null)
{
gint write_null = sane_open ("/dev/null", O_WRONLY);
sane_dup2 (write_null, 2);
gint write_null = safe_open ("/dev/null", O_WRONLY);
safe_dup2 (write_null, 2);
close_and_invalidate (&write_null);
}
@ -1408,7 +1408,7 @@ do_exec (gint child_err_report_fd,
{
if (child_setup == NULL)
{
sane_dup2 (child_err_report_fd, 3);
safe_dup2 (child_err_report_fd, 3);
set_cloexec (GINT_TO_POINTER (0), 3);
safe_closefrom (4);
child_err_report_fd = 3;
@ -1565,7 +1565,7 @@ do_posix_spawn (gchar **argv,
else if (!child_inherits_stdin)
{
/* Keep process from blocking on a read of stdin */
gint read_null = sane_open ("/dev/null", O_RDONLY | O_CLOEXEC);
gint read_null = safe_open ("/dev/null", O_RDONLY | O_CLOEXEC);
g_assert (read_null != -1);
parent_close_fds[num_parent_close_fds++] = read_null;
@ -1589,7 +1589,7 @@ do_posix_spawn (gchar **argv,
}
else if (stdout_to_null)
{
gint write_null = sane_open ("/dev/null", O_WRONLY | O_CLOEXEC);
gint write_null = safe_open ("/dev/null", O_WRONLY | O_CLOEXEC);
g_assert (write_null != -1);
parent_close_fds[num_parent_close_fds++] = write_null;
@ -1613,7 +1613,7 @@ do_posix_spawn (gchar **argv,
}
else if (stderr_to_null)
{
gint write_null = sane_open ("/dev/null", O_WRONLY | O_CLOEXEC);
gint write_null = safe_open ("/dev/null", O_WRONLY | O_CLOEXEC);
g_assert (write_null != -1);
parent_close_fds[num_parent_close_fds++] = write_null;

4
glib/gtestutils.c
View File

@ -3083,7 +3083,7 @@ test_trap_clear (void)
#ifdef G_OS_UNIX
static int
sane_dup2 (int fd1,
safe_dup2 (int fd1,
int fd2)
{
int ret;
@ -3335,7 +3335,7 @@ g_test_trap_fork (guint64 usec_timeout,
if (fd0 < 0)
g_error ("failed to open /dev/null for stdin redirection");
}
if (sane_dup2 (stdout_pipe[1], 1) < 0 || sane_dup2 (stderr_pipe[1], 2) < 0 || (fd0 >= 0 && sane_dup2 (fd0, 0) < 0))
if (safe_dup2 (stdout_pipe[1], 1) < 0 || safe_dup2 (stderr_pipe[1], 2) < 0 || (fd0 >= 0 && safe_dup2 (fd0, 0) < 0))
{
errsv = errno;
g_error ("failed to dup2() in forked test program: %s", g_strerror (errsv));

2
glib/gutils.c
View File

@ -3102,7 +3102,7 @@ g_abort (void)
{
/* One call to break the debugger */
DebugBreak ();
/* One call in case CRT does get saner about abort() behaviour */
/* One call in case CRT changes its abort() behaviour */
abort ();
/* And one call to bind them all and terminate the program for sure */
ExitProcess (127);

2
glib/gvarianttype.c
View File

@ -1120,7 +1120,7 @@ g_variant_type_new_tuple_slow (const GVariantType * const *items,
{
/* the "slow" version is needed in case the static buffer of 1024
* bytes is exceeded when running the normal version. this will
* happen only in truly insane code, so it can be slow.
* happen only with very unusually large types, so it can be slow.
*/
GString *string;
gint i;

2
glib/tests/regex.c
View File

@ -2321,7 +2321,7 @@ main (int argc, char *argv[])
TEST_NEW_FAIL ("(*:0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEFG)XX", 0, G_REGEX_ERROR_NAME_TOO_LONG);
TEST_NEW_FAIL ("\\u0100", G_REGEX_RAW | G_REGEX_JAVASCRIPT_COMPAT, G_REGEX_ERROR_CHARACTER_VALUE_TOO_LARGE);
/* These errors can't really be tested sanely:
/* These errors can't really be tested easily:
* G_REGEX_ERROR_EXPRESSION_TOO_LARGE
* G_REGEX_ERROR_MEMORY_ERROR
* G_REGEX_ERROR_SUBPATTERN_NAME_TOO_LONG

14
glib/tests/spawn-singlethread.c
View File

@ -166,7 +166,7 @@ test_spawn_async (void)
* Routine if the file descriptor does not exist.
*/
static void
sane_close (int fd)
safe_close (int fd)
{
if (fd >= 0)
close (fd);
@ -252,10 +252,10 @@ test_spawn_async_with_fds (void)
test_pipe[0][0], test_pipe[1][1], test_pipe[2][1],
&error);
g_assert_no_error (error);
sane_close (test_pipe[0][0]);
sane_close (test_pipe[1][1]);
safe_close (test_pipe[0][0]);
safe_close (test_pipe[1][1]);
if (fd_info[2] != STDOUT_PIPE)
sane_close (test_pipe[2][1]);
safe_close (test_pipe[2][1]);
data.loop = loop;
data.stdout_done = FALSE;
@ -297,10 +297,10 @@ test_spawn_async_with_fds (void)
g_main_context_unref (context);
g_main_loop_unref (loop);
sane_close (test_pipe[0][1]);
sane_close (test_pipe[1][0]);
safe_close (test_pipe[0][1]);
safe_close (test_pipe[1][0]);
if (fd_info[2] != STDOUT_PIPE)
sane_close (test_pipe[2][0]);
safe_close (test_pipe[2][0]);
}
g_ptr_array_free (argv, TRUE);

2
gobject/gobject.c
View File

@ -1617,7 +1617,7 @@ object_interface_check_properties (gpointer check_data,
/* We do a number of checks on the properties of an interface to
* make sure that all classes implementing the interface are
* overriding the properties in a sane way.
* overriding the properties correctly.
*
* We do the checks in order of importance so that we can give
* more useful error messages first.

10
gobject/gsignal.c
View File

@ -2287,7 +2287,7 @@ g_signal_chain_from_overridden_handler (gpointer instance,
g_free (error);
/* we purposely leak the value here, it might not be
* in a sane state if an error condition occurred
* in a correct state if an error condition occurred
*/
while (i--)
g_value_unset (param_values + i);
@ -2343,7 +2343,7 @@ g_signal_chain_from_overridden_handler (gpointer instance,
g_free (error);
/* we purposely leak the value here, it might not be
* in a sane state if an error condition occurred
* in a correct state if an error condition occurred
*/
}
}
@ -3442,7 +3442,7 @@ g_signal_emit_valist (gpointer instance,
g_warning ("%s: %s", G_STRLOC, error);
g_free (error);
/* we purposely leak the value here, it might not be
* in a sane state if an error condition occurred
* in a correct state if an error condition occurred
*/
}
}
@ -3479,7 +3479,7 @@ g_signal_emit_valist (gpointer instance,
g_free (error);
/* we purposely leak the value here, it might not be
* in a sane state if an error condition occurred
* in a correct state if an error condition occurred
*/
while (i--)
g_value_unset (param_values + i);
@ -3515,7 +3515,7 @@ g_signal_emit_valist (gpointer instance,
g_free (error);
/* we purposely leak the value here, it might not be
* in a sane state if an error condition occurred
* in a correct state if an error condition occurred
*/
}
}

4
gobject/gvalue.c
View File

@ -376,7 +376,7 @@ g_value_set_instance (GValue *value,
g_free (error_msg);
/* we purposely leak the value here, it might not be
* in a sane state if an error condition occurred
* in a correct state if an error condition occurred
*/
value_meminit (value, g_type);
value_table->value_init (value);
@ -440,7 +440,7 @@ g_value_init_from_instance (GValue *value,
g_free (error_msg);
/* we purposely leak the value here, it might not be
* in a sane state if an error condition occurred
* in a correct state if an error condition occurred
*/
value_meminit (value, g_type);
value_table->value_init (value);