Mercurial > hg > octave-lojdl > gnulib-hg

changeset 2720:371aca49b63b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(ENAMETOOLONG): Define to an unlikely value if not defined. (xgethostname): Remove now-unnecessary #ifdef. Move declaration of `err' into loop where it's used.
author Jim Meyering <jim@meyering.net>
date Sun, 09 Jul 2000 07:26:34 +0000
parents c4ad5d90fff5
children 8f89acf3bc25
files lib/xgethostname.c
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/lib/xgethostname.c
+++ b/lib/xgethostname.c
@@ -30,6 +30,10 @@
 
 #include "error.h"
 
+#ifndef ENAMETOOLONG
+# define ENAMETOOLONG 9999
+#endif
+
 #ifndef EXIT_FAILURE
 # define EXIT_FAILURE 1
 #endif
@@ -47,7 +51,6 @@
 {
   char *hostname;
   size_t size;
-  int err;
 
   size = INITIAL_HOSTNAME_LENGTH;
   /* Use size + 1 here rather than size to work around the bug
@@ -57,17 +60,14 @@
   while (1)
     {
       int k = size - 1;
+      int err;
 
       errno = 0;
       hostname[k] = '\0';
       err = gethostname (hostname, size);
       if (err >= 0 && hostname[k] == '\0')
 	break;
-#ifdef ENAMETOOLONG
       else if (err < 0 && errno != ENAMETOOLONG && errno != 0)
-#else
-      else if (err < 0 && errno != 0)
-#endif
 	error (EXIT_FAILURE, errno, "gethostname");
       size *= 2;
       hostname = xrealloc (hostname, size + 1);