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

tweaks: drop a handful of unhelpful asserts

master
Benno Schulenberg 2018-03-23 11:08:04 +01:00
parent bf1a080923
commit 0f1f53a441
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/nano.c
View File

@ -204,12 +204,7 @@ void renumber(filestruct *line)
partition *partition_filestruct(filestruct *top, size_t top_x, partition *partition_filestruct(filestruct *top, size_t top_x,
filestruct *bot, size_t bot_x) filestruct *bot, size_t bot_x)
{ {
partition *p; partition *p = nmalloc(sizeof(partition));
assert(top != NULL && bot != NULL && openfile->fileage != NULL && openfile->filebot != NULL);
/* Initialize the partition. */
p = (partition *)nmalloc(sizeof(partition));
/* If the top and bottom of the partition are different from the top /* If the top and bottom of the partition are different from the top
* and bottom of the buffer, save the latter and then set them * and bottom of the buffer, save the latter and then set them
@ -252,8 +247,6 @@ partition *partition_filestruct(filestruct *top, size_t top_x,
* to (filebot, $) again. */ * to (filebot, $) again. */
void unpartition_filestruct(partition **p) void unpartition_filestruct(partition **p)
{ {
assert(p != NULL && openfile->fileage != NULL && openfile->filebot != NULL);
/* Reattach the line above the top of the partition, and restore the /* Reattach the line above the top of the partition, and restore the
* text before top_x from top_data. Free top_data when we're done * text before top_x from top_data. Free top_data when we're done
* with it. */ * with it. */
@ -304,8 +297,6 @@ void extract_buffer(filestruct **file_top, filestruct **file_bot,
bool same_line = FALSE; bool same_line = FALSE;
#endif #endif
assert(file_top != NULL && file_bot != NULL && top != NULL && bot != NULL);
/* If (top, top_x)-(bot, bot_x) doesn't cover any text, get out. */ /* If (top, top_x)-(bot, bot_x) doesn't cover any text, get out. */
if (top == bot && top_x == bot_x) if (top == bot && top_x == bot_x)
return; return;
@ -417,8 +408,6 @@ void ingraft_buffer(filestruct *somebuffer)
bool right_side_up = FALSE, single_line = FALSE; bool right_side_up = FALSE, single_line = FALSE;
#endif #endif
assert(somebuffer != NULL);
#ifndef NANO_TINY #ifndef NANO_TINY
/* Keep track of whether the mark begins inside the partition and /* Keep track of whether the mark begins inside the partition and
* will need adjustment. */ * will need adjustment. */
@ -516,8 +505,6 @@ openfilestruct *make_new_opennode(void)
/* Unlink a node from the rest of the circular list, and delete it. */ /* Unlink a node from the rest of the circular list, and delete it. */
void unlink_opennode(openfilestruct *fileptr) void unlink_opennode(openfilestruct *fileptr)
{ {
assert(fileptr != fileptr->prev && fileptr != fileptr->next);
#ifdef ENABLE_MULTIBUFFER #ifdef ENABLE_MULTIBUFFER
if (fileptr == firstfile) if (fileptr == firstfile)
firstfile = firstfile->next; firstfile = firstfile->next;