1b5975d6bSopenharmony_ciFrom cef780e9ef86b1d9545db892c6b8340488da21d9 Mon Sep 17 00:00:00 2001
2b5975d6bSopenharmony_ciFrom: Simon McVittie <smcv@collabora.com>
3b5975d6bSopenharmony_ciDate: Thu, 23 Jun 2022 10:12:44 +0100
4b5975d6bSopenharmony_ciSubject: [PATCH] giochannel: Add G_IO_FLAG_NONE
5b5975d6bSopenharmony_ci
6b5975d6bSopenharmony_ciThis makes the state where no flags are set a bit more self-documenting.
7b5975d6bSopenharmony_ci
8b5975d6bSopenharmony_ciSigned-off-by: Simon McVittie <smcv@collabora.com>
9b5975d6bSopenharmony_ci
10b5975d6bSopenharmony_ciConflict:NA
11b5975d6bSopenharmony_ciReference:https://gitlab.gnome.org/GNOME/glib/-/commit/cef780e9ef86b1d9545db892c6b8340488da21d9
12b5975d6bSopenharmony_ci
13b5975d6bSopenharmony_ci---
14b5975d6bSopenharmony_ci glib/giochannel.c | 1 +
15b5975d6bSopenharmony_ci glib/giochannel.h | 1 +
16b5975d6bSopenharmony_ci glib/giounix.c    | 2 +-
17b5975d6bSopenharmony_ci 3 files changed, 3 insertions(+), 1 deletion(-)
18b5975d6bSopenharmony_ci
19b5975d6bSopenharmony_cidiff --git a/glib/giochannel.c b/glib/giochannel.c
20b5975d6bSopenharmony_ciindex 6fec45f66d..25baf42c9a 100644
21b5975d6bSopenharmony_ci--- a/glib/giochannel.c
22b5975d6bSopenharmony_ci+++ b/glib/giochannel.c
23b5975d6bSopenharmony_ci@@ -946,6 +946,7 @@ g_io_channel_get_line_term (GIOChannel *channel,
24b5975d6bSopenharmony_ci  **/
25b5975d6bSopenharmony_ci /**
26b5975d6bSopenharmony_ci  * GIOFlags:
27b5975d6bSopenharmony_ci+ * @G_IO_FLAG_NONE: no special flags set. Since: 2.74
28b5975d6bSopenharmony_ci  * @G_IO_FLAG_APPEND: turns on append mode, corresponds to %O_APPEND
29b5975d6bSopenharmony_ci  *     (see the documentation of the UNIX open() syscall)
30b5975d6bSopenharmony_ci  * @G_IO_FLAG_NONBLOCK: turns on nonblocking mode, corresponds to
31b5975d6bSopenharmony_cidiff --git a/glib/giochannel.h b/glib/giochannel.h
32b5975d6bSopenharmony_ciindex 5a13449d58..dee3d7d055 100644
33b5975d6bSopenharmony_ci--- a/glib/giochannel.h
34b5975d6bSopenharmony_ci+++ b/glib/giochannel.h
35b5975d6bSopenharmony_ci@@ -85,6 +85,7 @@ typedef enum
36b5975d6bSopenharmony_ci 
37b5975d6bSopenharmony_ci typedef enum
38b5975d6bSopenharmony_ci {
39b5975d6bSopenharmony_ci+  G_IO_FLAG_NONE GLIB_AVAILABLE_ENUMERATOR_IN_2_74 = 0,
40b5975d6bSopenharmony_ci   G_IO_FLAG_APPEND = 1 << 0,
41b5975d6bSopenharmony_ci   G_IO_FLAG_NONBLOCK = 1 << 1,
42b5975d6bSopenharmony_ci   G_IO_FLAG_IS_READABLE = 1 << 2,	/* Read only flag */
43b5975d6bSopenharmony_cidiff --git a/glib/giounix.c b/glib/giounix.c
44b5975d6bSopenharmony_ciindex b6345b6c68..067cecf9ac 100644
45b5975d6bSopenharmony_ci--- a/glib/giounix.c
46b5975d6bSopenharmony_ci+++ b/glib/giounix.c
47b5975d6bSopenharmony_ci@@ -400,7 +400,7 @@ g_io_unix_set_flags (GIOChannel *channel,
48b5975d6bSopenharmony_ci static GIOFlags
49b5975d6bSopenharmony_ci g_io_unix_get_flags (GIOChannel *channel)
50b5975d6bSopenharmony_ci {
51b5975d6bSopenharmony_ci-  GIOFlags flags = 0;
52b5975d6bSopenharmony_ci+  GIOFlags flags = G_IO_FLAG_NONE;
53b5975d6bSopenharmony_ci   glong fcntl_flags;
54b5975d6bSopenharmony_ci   GIOUnixChannel *unix_channel = (GIOUnixChannel *) channel;
55b5975d6bSopenharmony_ci 
56b5975d6bSopenharmony_ci-- 
57b5975d6bSopenharmony_ciGitLab
58b5975d6bSopenharmony_ci
59