From: David Lawrence Ramsey <pooka109@gmail.com>
Date: Wed, 5 Jul 2006 05:14:11 +0000 (+0000)
Subject: still more miscellaneous minor fixes
X-Git-Tag: v1.9.99pre1~113
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=f1a8e7221dca21a4071c47d881d01e0590358433;p=nano.git

still more miscellaneous minor fixes


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3748 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---

diff --git a/src/browser.c b/src/browser.c
index 1fe963aa..d1d9a978 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -434,15 +434,14 @@ char *do_browse_from(const char *inpath)
 /* Set filelist to the list of files contained in the directory path,
  * set filelist_len to the number of files in that list, set longest to
  * the width in columns of the longest filename in that list (between 15
- * and COLS, and at least 15), and set width to the number of files that
- * we can display per line.  longest needs to be at least 15 columns in
- * order to display ".. (parent dir)", as Pico does.  Assume path exists
- * and is a directory. */
+ * and COLS), and set width to the number of files that we can display
+ * per line.  longest needs to be at least 15 columns in order to
+ * display ".. (parent dir)", as Pico does.  Assume path exists and is a
+ * directory. */
 void browser_init(const char *path, DIR *dir)
 {
     const struct dirent *nextdir;
-    size_t i = 0;
-    size_t path_len = strlen(path);
+    size_t i = 0, path_len = strlen(path);
     int col = 0;
 	/* The maximum number of columns that the filenames will take
 	 * up. */
@@ -501,11 +500,11 @@ void browser_init(const char *path, DIR *dir)
 
     closedir(dir);
 
-    /* Make sure longest is between 15 and COLS, and at least 15. */
-    if (longest > COLS)
-	longest = COLS;
+    /* Make sure longest is between 15 and COLS. */
     if (longest < 15)
 	longest = 15;
+    if (longest > COLS)
+	longest = COLS;
 
     /* Set width to zero, just before we initialize it. */
     width = 0;