summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/piece-table.c60
1 files changed, 32 insertions, 28 deletions
diff --git a/src/piece-table.c b/src/piece-table.c
index 85966f7..53a9088 100644
--- a/src/piece-table.c
+++ b/src/piece-table.c
@@ -77,12 +77,13 @@ text_buffer_append (text_buffer *tb, char c)
size_t base_size = 1024;
if (tb->size == 0)
{
- tb->contents = malloc (sizeof(*tb->contents) * base_size);
+ tb->contents = malloc (sizeof (*tb->contents) * base_size);
tb->size = base_size;
}
else if (tb->size == tb->used)
{
- tb->contents = realloc (tb->contents, sizeof(*tb->contents) * tb->used*2);
+ tb->contents = realloc (tb->contents,
+ sizeof (*tb->contents) * tb->used*2);
}
tb->contents[tb->used++] = c;
}
@@ -187,13 +188,13 @@ piece_table_piece_new (piece_table *pt)
piece *
-piece_table_piece_split(piece_table *pt, piece *p, size_t pos)
+piece_table_piece_split (piece_table *pt, piece *p, size_t pos)
{
/* Returns the first piece */
piece *second;
- assert(pos < p->length);
- assert(p->buffer != NULL); /* Not a sentinel piece */
- assert(p->length != 0); /* Not an empty piece (they should not exist) */
+ assert (pos < p->length);
+ assert (p->buffer != NULL); /* Not a sentinel piece */
+ assert (p->length != 0); /* Not an empty piece (they should not exist) */
if ( pos == 0 )
{
return p->prev;
@@ -211,10 +212,10 @@ piece_table_piece_split(piece_table *pt, piece *p, size_t pos)
}
void
-piece_find_by_pos(piece_table *pt, size_t pos)
+piece_find_by_pos (piece_table *pt, size_t pos)
{
piece *cur;
- assert(pos < pt->length);
+ assert (pos < pt->length);
if ( pos >= pt->cached_offset )
{
/* Search forward */
@@ -223,7 +224,7 @@ piece_find_by_pos(piece_table *pt, size_t pos)
if ( pt->cached_offset + cur->length > pos )
{
pt->cached = cur;
- assert(pt->cached != pt->sentinel);
+ assert (pt->cached != pt->sentinel);
return;
}
pt->cached_offset += cur->length;
@@ -238,7 +239,7 @@ piece_find_by_pos(piece_table *pt, size_t pos)
if ( pt->cached_offset <= pos )
{
pt->cached = cur;
- assert(pt->cached != pt->sentinel);
+ assert (pt->cached != pt->sentinel);
return;
}
}
@@ -252,8 +253,8 @@ piece_table_insert (piece_table *pt, size_t pos, char *in, size_t len)
piece *start, *end, *new;
size_t i;
- assert( pos <= pt->length );
- assert( len > 0 );
+ assert ( pos <= pt->length );
+ assert ( len > 0 );
for (i = 0; i<len; i++)
{
@@ -272,8 +273,9 @@ piece_table_insert (piece_table *pt, size_t pos, char *in, size_t len)
}
else
{
- piece_find_by_pos(pt, pos);
- start = piece_table_piece_split(pt, pt->cached, pos - pt->cached_offset);
+ piece_find_by_pos (pt, pos);
+ start = piece_table_piece_split (pt, pt->cached,
+ pos - pt->cached_offset);
}
end = start->next;
@@ -301,7 +303,7 @@ piece_table_insert (piece_table *pt, size_t pos, char *in, size_t len)
/* Make a new piece and insert it */
- new = piece_buffer_bump(pt->pieces);
+ new = piece_buffer_bump (pt->pieces);
new->buffer = &pt->add;
new->start = pt->add.used - len;
new->length = len;
@@ -314,12 +316,12 @@ piece_table_insert (piece_table *pt, size_t pos, char *in, size_t len)
}
void
-piece_table_delete(piece_table *pt, size_t pos, size_t len)
+piece_table_delete (piece_table *pt, size_t pos, size_t len)
{
piece *cur, *next, *start, *end;
size_t off_start;
- assert( pos + len <= pt->length );
- assert( len > 0 );
+ assert ( pos + len <= pt->length );
+ assert ( len > 0 );
if ( pos == 0 )
{
@@ -328,9 +330,10 @@ piece_table_delete(piece_table *pt, size_t pos, size_t len)
}
else
{
- piece_find_by_pos(pt, pos);
+ piece_find_by_pos (pt, pos);
off_start = pt->cached_offset;
- start = piece_table_piece_split(pt, pt->cached, pos - pt->cached_offset);
+ start = piece_table_piece_split (pt, pt->cached,
+ pos - pt->cached_offset);
}
if ( pos + len == pt->length )
@@ -339,8 +342,9 @@ piece_table_delete(piece_table *pt, size_t pos, size_t len)
}
else
{
- piece_find_by_pos(pt, pos + len);
- end = piece_table_piece_split(pt, pt->cached, pos + len - pt->cached_offset)->next;
+ piece_find_by_pos (pt, pos + len);
+ end = piece_table_piece_split (pt, pt->cached,
+ pos + len - pt->cached_offset)->next;
}
/* Update cache to before the start */
@@ -371,11 +375,11 @@ piece_table_create_from (char *orig, size_t size)
pt->length = size;
/* Original buffer */
- text_buffer_init(&pt->orig);
- text_buffer_fill(&pt->orig, orig, size);
+ text_buffer_init (&pt->orig);
+ text_buffer_fill (&pt->orig, orig, size);
/* Add buffer */
- text_buffer_init(&pt->add);
+ text_buffer_init (&pt->add);
pt->pieces = piece_buffer_create (1024);
@@ -414,9 +418,9 @@ piece_table_destroy (piece_table *pt)
char
piece_table_index (piece_table *pt, size_t pos)
{
- assert(pos < pt->length);
- piece_find_by_pos(pt, pos);
- return text_buffer_index(pt->cached->buffer,
+ assert (pos < pt->length);
+ piece_find_by_pos (pt, pos);
+ return text_buffer_index (pt->cached->buffer,
pt->cached->start + pos - pt->cached_offset);
}