* libmisc/ttytype.c: Avoid implicit conversion of pointers / integers to booleans.

	* libmisc/ttytype.c: Avoid assignments in comparisons.
	* libmisc/ttytype.c: Add brackets and parenthesis.
	* libmisc/ttytype.c: The return values of fclose is not checked on purpose.

diff --git a/ChangeLog b/ChangeLog
index 41dc9d63d60892da25d087ad9df005b3d00516c9..e65af62f3a9d1247c72e0dc678d4f53a9a8e5e41 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-05-26  Nicolas François  <nicolas.francois@centraliens.net>
+
+       * libmisc/ttytype.c: Avoid implicit conversion of pointers /
+       integers to booleans.
+       * libmisc/ttytype.c: Avoid assignments in comparisons.
+       * libmisc/ttytype.c: Add brackets and parenthesis.
+       * libmisc/ttytype.c: The return values of fclose is not checked on
+       purpose.
+
 2008-05-26  Nicolas François  <nicolas.francois@centraliens.net>
 
        * libmisc/mail.c: Avoid implicit conversion of pointers to

diff --git a/libmisc/ttytype.c b/libmisc/ttytype.c
index b50a770f673c7b83b4294cebf745c43c53b628e0..5c52c7354fef6d9599833d785026209a8371267c 100644 (file)
--- a/libmisc/ttytype.c
+++ b/libmisc/ttytype.c
@@ -53,26 +53,33 @@ void ttytype (const char *line)
                return;
        if ((typefile = getdef_str ("TTYTYPE_FILE")) == NULL)
                return;
-       if (access (typefile, F_OK))
+       if (access (typefile, F_OK) != 0)
                return;
 
-       if (!(fp = fopen (typefile, "r"))) {
+       fp = fopen (typefile, "r");
+       if (NULL == fp) {
                perror (typefile);
                return;
        }
-       while (fgets (buf, sizeof buf, fp)) {
-               if (buf[0] == '#')
+       while (fgets (buf, sizeof buf, fp) == buf) {
+               if (buf[0] == '#') {
                        continue;
+               }
 
-               if ((cp = strchr (buf, '\n')))
+               cp = strchr (buf, '\n');
+               if (NULL != cp) {
                        *cp = '\0';
+               }
 
-               if (sscanf (buf, "%s %s", type, port) == 2 &&
-                   strcmp (line, port) == 0)
+               if ((sscanf (buf, "%s %s", type, port) == 2) &&
+                   (strcmp (line, port) == 0)) {
                        break;
+               }
        }
-       if (!feof (fp) && !ferror (fp))
+       if ((feof (fp) == 0) && (ferror (fp) == 0)) {
                addenv ("TERM", type);
+       }
 
-       fclose (fp);
+       (void) fclose (fp);
 }
+