ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove unneeded assert in do_rcfile() 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3082 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2005-11-04 04:10:09 +00:00
parent 29bf57ff67
commit cf0efaab5d
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -48,6 +48,9 @@ CVS code -
do_gotolinecolumn(), do_delete(), and find_paragraph(). (DLR) do_gotolinecolumn(), do_delete(), and find_paragraph(). (DLR)
- nano.h: - nano.h:
- Readd MIN_EDITOR_COLS #define. (DLR) - Readd MIN_EDITOR_COLS #define. (DLR)
- rcfile.c:
do_rcfile()
- Remove unneeded assert. (DLR)
- winio.c: - winio.c:
nanoget_repaint() nanoget_repaint()
- Rename parameter inputbuf to buf, for consistency. (DLR) - Rename parameter inputbuf to buf, for consistency. (DLR)

5
src/rcfile.c
View File

@ -733,14 +733,13 @@ void parse_rcfile(FILE *rcstream)
return; 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) void do_rcfile(void)
{ {
FILE *rcstream; FILE *rcstream;
#ifdef SYSCONFDIR #ifdef SYSCONFDIR
assert(sizeof(SYSCONFDIR) == strlen(SYSCONFDIR) + 1);
nanorc = mallocstrcpy(nanorc, SYSCONFDIR "/nanorc"); nanorc = mallocstrcpy(nanorc, SYSCONFDIR "/nanorc");
/* Try to open the system-wide nanorc. */ /* Try to open the system-wide nanorc. */
rcstream = fopen(nanorc, "r"); rcstream = fopen(nanorc, "r");