nano

commit 5c878088a14163ae2af5b713395b21ace9f5fc3f
parent d4401008a4b5f6b24d9d9091add13b3a617d234d
Author: David Lawrence Ramsey <pooka109@gmail.com>
Date:   Wed, 21 Jun 2006 16:54:51 +0000

in update_line(), remove unneeded assert, and now-unused function
check_linenumbers()


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

Diffstat:
M
ChangeLog
 | 
6
++++++
M
src/proto.h
 | 
3
---
M
src/utils.c
 | 
16
----------------
M
src/winio.c
 | 
3
---

4 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -383,6 +383,10 @@ CVS code -
 	  This matches the manual page. (DLR)
   nperror()
 	- Simplify. (DLR)
+  check_linenumbers()
+	- Removed, as it's no longer used, and since there's no way to
+	  tell if its return value will be in int or ssize_t range.
+	  (DLR)
 - winio.c:
   parse_kbinput()
 	- If we get NANO_CONTROL_8, properly handle it in all cases.
@@ -416,6 +420,8 @@ CVS code -
 	  well as single-line ones.  This avoids a segfault when trying
 	  to color e.g. "start="$" end="$"". (DLR, found by Trevor
 	  Caira)
+  update_line()
+	- Remove unneeded assert. (DLR)
   edit_redraw()
 	- Fix problem where not all lines would be updated properly if
 	  we'd scrolled off the screen and the mark was on. (DLR)
diff --git a/src/proto.h b/src/proto.h
@@ -704,9 +704,6 @@ void mark_order(const filestruct **top, size_t *top_x, const filestruct
 	**bot, size_t *bot_x, bool *right_side_up);
 #endif
 size_t get_totsize(const filestruct *begin, const filestruct *end);
-#ifndef NDEBUG
-int check_linenumbers(const filestruct *fileptr);
-#endif
 #ifdef DEBUG
 void dump_filestruct(const filestruct *inptr);
 void dump_filestruct_reverse(void);
diff --git a/src/utils.c b/src/utils.c
@@ -581,22 +581,6 @@ size_t get_totsize(const filestruct *begin, const filestruct *end)
     return totsize;
 }
 
-#ifndef NDEBUG
-/* Return what the current line number should be, starting at edittop
- * and ending at fileptr. */
-int check_linenumbers(const filestruct *fileptr)
-{
-    int check_line = 0;
-    const filestruct *filetmp;
-
-    for (filetmp = openfile->edittop; filetmp != fileptr;
-	filetmp = filetmp->next)
-	check_line++;
-
-    return check_line;
-}
-#endif /* !NDEBUG */
-
 #ifdef DEBUG
 /* Dump the filestruct inptr to stderr. */
 void dump_filestruct(const filestruct *inptr)
diff --git a/src/winio.c b/src/winio.c
@@ -2635,9 +2635,6 @@ void update_line(const filestruct *fileptr, size_t index)
 
     line = fileptr->lineno - openfile->edittop->lineno;
 
-    /* We assume the line numbers are valid.  Is that really true? */
-    assert(line < 0 || line == check_linenumbers(fileptr));
-
     if (line < 0 || line >= editwinrows)
 	return;