summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/piece-table-internals.h18
-rw-r--r--src/piece-table.c64
2 files changed, 41 insertions, 41 deletions
diff --git a/src/piece-table-internals.h b/src/piece-table-internals.h
index b6e32db..ef344ed 100644
--- a/src/piece-table-internals.h
+++ b/src/piece-table-internals.h
@@ -38,20 +38,20 @@ typedef struct _piece
}
piece;
-typedef struct _piece_buffer
+typedef struct _piece_pool
{
size_t used;
size_t size;
- struct _piece_buffer *next;
+ struct _piece_pool *next;
piece *start;
}
-piece_buffer;
+piece_pool;
typedef struct _piece_table
{
const char *orig;
text_buffer add;
- piece_buffer *pieces;
+ piece_pool *pieces;
piece *sentinel;
piece *empty;
size_t length;
@@ -61,11 +61,11 @@ typedef struct _piece_table
}
piece_table;
-/* piece_buffer */
-piece_buffer *piece_buffer_create (size_t size);
-void piece_buffer_destroy (piece_buffer *pb);
-void piece_buffer_empty (piece_buffer *pb);
-piece *piece_buffer_bump (piece_buffer *pb);
+/* piece_pool */
+piece_pool *piece_pool_create (size_t size);
+void piece_pool_destroy (piece_pool *pp);
+void piece_pool_empty (piece_pool *pp);
+piece *piece_pool_bump (piece_pool *pp);
/* piece_table */
void piece_table_piece_mark_empty (piece_table *pt, piece *p);
diff --git a/src/piece-table.c b/src/piece-table.c
index 851e45b..512294d 100644
--- a/src/piece-table.c
+++ b/src/piece-table.c
@@ -22,55 +22,55 @@
#include <assert.h>
#include "piece-table-internals.h"
-/* piece_buffer */
+/* piece_pool */
-piece_buffer *
-piece_buffer_create (size_t size)
+piece_pool *
+piece_pool_create (size_t size)
{
- piece_buffer *pb;
- size_t s = sizeof (piece_buffer) + sizeof (piece) * size;
- pb = malloc (s);
- pb->start = (piece *)pb+1;
- pb->used = 0;
- pb->size = size;
- pb->next = NULL;
- return pb;
+ piece_pool *pp;
+ size_t s = sizeof (piece_pool) + sizeof (piece) * size;
+ pp = malloc (s);
+ pp->start = (piece *)pp+1;
+ pp->used = 0;
+ pp->size = size;
+ pp->next = NULL;
+ return pp;
}
void
-piece_buffer_destroy (piece_buffer *pb)
+piece_pool_destroy (piece_pool *pp)
{
- piece_buffer *next;
+ piece_pool *next;
do
{
- next = pb->next;
- free (pb);
- pb = next;
+ next = pp->next;
+ free (pp);
+ pp = next;
}
- while (pb != NULL);
+ while (pp != NULL);
}
void
-piece_buffer_empty (piece_buffer *pb)
+piece_pool_empty (piece_pool *pp)
{
- piece_buffer_destroy (pb->next);
- pb->next = NULL;
- pb->used = 0;
+ piece_pool_destroy (pp->next);
+ pp->next = NULL;
+ pp->used = 0;
}
piece *
-piece_buffer_bump (piece_buffer *pb)
+piece_pool_bump (piece_pool *pp)
{
- while (pb->next != NULL)
+ while (pp->next != NULL)
{
- pb = pb->next;
+ pp = pp->next;
}
- if (pb->used == pb->size)
+ if (pp->used == pp->size)
{
- pb->next = piece_buffer_create (1024);
+ pp->next = piece_pool_create (1024);
}
- return &pb->start[pb->used++];
+ return &pp->start[pp->used++];
}
@@ -93,7 +93,7 @@ piece_table_piece_new (piece_table *pt)
pt->empty = pt->empty->next;
return p;
}
- return piece_buffer_bump (pt->pieces);
+ return piece_pool_bump (pt->pieces);
}
@@ -286,10 +286,10 @@ piece_table_create_from_str (const char *orig, size_t size)
/* Add buffer */
text_buffer_init (&pt->add);
- pt->pieces = piece_buffer_create (1024);
+ pt->pieces = piece_pool_create (1024);
- pt->sentinel = piece_buffer_bump (pt->pieces);
- original = piece_buffer_bump (pt->pieces);
+ pt->sentinel = piece_pool_bump (pt->pieces);
+ original = piece_pool_bump (pt->pieces);
original->type = PIECE_ORIG;
original->start = 0;
original->length = pt->length;
@@ -314,7 +314,7 @@ void
piece_table_destroy (piece_table *pt)
{
text_buffer_clear (&pt->add);
- piece_buffer_destroy (pt->pieces);
+ piece_pool_destroy (pt->pieces);
free (pt);
}