From b32adfc5cfadfa03f49ae79dac8d45fa8887bed3 Mon Sep 17 00:00:00 2001
From: Jeff Johnston <jjohnstn@redhat.com>
Date: Thu, 7 Jul 2005 17:29:13 +0000
Subject: *** empty log message ***

---
 newlib/libc/unix/ttyname.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'newlib/libc/unix')

diff --git a/newlib/libc/unix/ttyname.c b/newlib/libc/unix/ttyname.c
index 258ba25fe..558f70939 100644
--- a/newlib/libc/unix/ttyname.c
+++ b/newlib/libc/unix/ttyname.c
@@ -56,7 +56,6 @@ ttyname (fd)
   struct dirent *dirp;
   DIR *dp;
   struct stat dsb;
-  char *rval;
 
   /* Must be a terminal. */
   if (tcgetattr (fd, &tty) < 0)
@@ -69,7 +68,7 @@ ttyname (fd)
   if ((dp = _opendir (_PATH_DEV)) == NULL)
     return NULL;
 
-  for (rval = NULL; dirp = _readdir (dp);)
+  while ((dirp = _readdir (dp)) != NULL)
     {
       if (dirp->d_ino != sb.st_ino)
 	continue;
@@ -78,9 +77,8 @@ ttyname (fd)
 	  sb.st_ino != dsb.st_ino)
 	continue;
       (void) _closedir (dp);
-      rval = buf;
-      break;
+      return buf;
     }
   (void) _closedir (dp);
-  return rval;
+  return NULL;
 }
-- 
cgit v1.2.3