[glib: 1/2] utils: Limit the scope of the variable `max`
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib: 1/2] utils: Limit the scope of the variable `max`
- Date: Wed, 23 Sep 2020 10:39:46 +0000 (UTC)
commit e64293d56c35db4ab8f787d809cafed200f11235
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date: Tue Sep 22 16:14:21 2020 -0400
utils: Limit the scope of the variable `max`
in g_get_host_name(), and avoid an unused-variable warning when
_SC_HOST_NAME_MAX is not defined.
glib/gutils.c | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/glib/gutils.c b/glib/gutils.c
index aff3ed442..15c0c0037 100644
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -982,7 +982,6 @@ g_get_host_name (void)
gchar *utmp;
#ifndef G_OS_WIN32
- glong max;
gsize size;
/* The number 256 * 256 is taken from the value of _POSIX_HOST_NAME_MAX,
* which is 255. Since we use _POSIX_HOST_NAME_MAX + 1 (= 256) in the
@@ -994,15 +993,19 @@ g_get_host_name (void)
gchar *tmp;
#ifdef _SC_HOST_NAME_MAX
- max = sysconf (_SC_HOST_NAME_MAX);
- if (max > 0 && (gsize) max <= G_MAXSIZE - 1)
- size = (gsize) max + 1;
- else
+ {
+ glong max;
+
+ max = sysconf (_SC_HOST_NAME_MAX);
+ if (max > 0 && (gsize) max <= G_MAXSIZE - 1)
+ size = (gsize) max + 1;
+ else
#ifdef HOST_NAME_MAX
- size = HOST_NAME_MAX + 1;
+ size = HOST_NAME_MAX + 1;
#else
- size = _POSIX_HOST_NAME_MAX + 1;
+ size = _POSIX_HOST_NAME_MAX + 1;
#endif /* HOST_NAME_MAX */
+ }
#else
/* Fallback to some reasonable value */
size = 256;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]