From cf0efaab5d04ee4317d767c78b2ed576e15e9c29 Mon Sep 17 00:00:00 2001
From: David Lawrence Ramsey <pooka109@gmail.com>
Date: Fri, 4 Nov 2005 04:10:09 +0000
Subject: [PATCH] remove unneeded assert in do_rcfile()
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3082 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---
ChangeLog | 3 +++
src/rcfile.c | 5 ++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7952ceb7..02d76381 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -48,6 +48,9 @@ CVS code -
do_gotolinecolumn(), do_delete(), and find_paragraph(). (DLR)
- nano.h:
- Readd MIN_EDITOR_COLS #define. (DLR)
+- rcfile.c:
+ do_rcfile()
+ - Remove unneeded assert. (DLR)
- winio.c:
nanoget_repaint()
- Rename parameter inputbuf to buf, for consistency. (DLR)
diff --git a/src/rcfile.c b/src/rcfile.c
index d5140c60..0852eec6 100644
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -733,14 +733,13 @@ void parse_rcfile(FILE *rcstream)
return;
}
-/* The main rc file function, tries to open the rc file */
+/* The main rcfile function. It tries to open the system-wide rcfile,
+ * followed by the local rcfile. */
void do_rcfile(void)
{
FILE *rcstream;
#ifdef SYSCONFDIR
- assert(sizeof(SYSCONFDIR) == strlen(SYSCONFDIR) + 1);
-
nanorc = mallocstrcpy(nanorc, SYSCONFDIR "/nanorc");
/* Try to open the system-wide nanorc. */
rcstream = fopen(nanorc, "r");
--
GitLab