Mercurial > code

changeset 53:bbe0713e8e2a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename member to text, more useful
author David Demelier <markand@malikania.fr>
date Fri, 04 Nov 2011 13:32:47 +0100
parents 14c0b77f679b
children ebf1460c331e
files buffer.c buffer.h
diffstat 2 files changed, 19 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/buffer.c	Wed Nov 02 16:19:20 2011 +0100
+++ b/buffer.c	Fri Nov 04 13:32:47 2011 +0100
@@ -44,7 +44,7 @@
 	buf->size	= buf->bsize + 1;
 	buf->type	= type;
 
-	if ((buf->data = calloc(buf->size, 1)) == NULL) {
+	if ((buf->text = calloc(buf->size, 1)) == NULL) {
 		free(buf);
 		return NULL;
 	}
@@ -68,8 +68,8 @@
 	if (buf->type == BUFFER_AUTO)
 		length = buf->size - buf->length - 1;
 
-	strncpy(buf->data + buf->length, str, length);
-	buf->length = strlen(buf->data);
+	strncpy(buf->text + buf->length, str, length);
+	buf->length = strlen(buf->text);
 
 	return 0;
 }
@@ -87,8 +87,8 @@
 	if (buf->type != BUFFER_AUTO && buf->size - buf->length - 1 <= 2)
 		return -1;
 
-	buf->data[buf->length++]	= c;
-	buf->data[buf->length]		= '\0';
+	buf->text[buf->length++]	= c;
+	buf->text[buf->length]		= '\0';
 
 	return 0;
 }
@@ -107,7 +107,7 @@
 	if (buf->type == BUFFER_AUTO && size > (buf->size - buf->length - 1))
 		return -1;
 
-	memcpy(buf->data + buf->length, data, size);
+	memcpy(buf->text + buf->length, data, size);
 	buf->length += size;
 
 	return 0;
@@ -130,7 +130,7 @@
 	if (buf->type == BUFFER_AUTO) {
 		do {
 			va_copy(ap_save, ap);
-			nb = vsnprintf(buf->data + buf->length,
+			nb = vsnprintf(buf->text + buf->length,
 			    buf->size - buf->length - 1, fmt, ap_save);
 
 			if (nb == -1 || (size_t) nb >= buf->size - buf->length - 1) {
@@ -143,11 +143,11 @@
 		va_end(ap_save);
 	} else {
 		result = 0;
-		vsnprintf(buf->data + buf->length, buf->size - buf->length - 1,
+		vsnprintf(buf->text + buf->length, buf->size - buf->length - 1,
 		    fmt, ap);
 	}
 
-	buf->length = strlen(buf->data);
+	buf->length = strlen(buf->text);
 
 	return result;
 }
@@ -176,7 +176,7 @@
 int
 buffer_shrink(struct buffer *buf)
 {
-	if ((buf->data = realloc(buf->data, buf->length + 1)) == NULL) {
+	if ((buf->text = realloc(buf->text, buf->length + 1)) == NULL) {
 		buf->size = 0;
 		return -1;
 	}
@@ -193,13 +193,13 @@
 char *
 buffer_end(struct buffer *buf)
 {
-	char *data;
+	char *text;
 
 	buffer_shrink(buf);
-	data = buf->data;
+	text = buf->text;
 	free(buf);
 
-	return data;
+	return text;
 }
 
 /*
@@ -209,7 +209,7 @@
 void
 buffer_clear(struct buffer *buf)
 {
-	memset(buf->data, 0, buf->size);
+	memset(buf->text, 0, buf->size);
 	buf->length	= 0;
 }
 
@@ -218,8 +218,8 @@
 {
 	buffer_clear(buf);
 
-	if (buf->data)
-		free(buf->data);
+	if (buf->text)
+		free(buf->text);
 
 	free(buf);
 }
@@ -243,13 +243,13 @@
 		while (newlen - buf->length - 1 <= needed)
 			newlen += buf->bsize;
 
-		if ((buf->data = realloc(buf->data, newlen)) == NULL) {
+		if ((buf->text = realloc(buf->text, newlen)) == NULL) {
 			buf->size = 0;
 			return -1;
 		}
 
 		buf->size = newlen;
-		memset(buf->data + buf->length, 0, buf->size - buf->length);
+		memset(buf->text + buf->length, 0, buf->size - buf->length);
 	}
 
 	return 0;
--- a/buffer.h	Wed Nov 02 16:19:20 2011 +0100
+++ b/buffer.h	Fri Nov 04 13:32:47 2011 +0100
@@ -30,7 +30,7 @@
 
 struct buffer {
 	enum buffer_type type;		/* buffer type (default AUTO) */
-	char		*data;		/* string buffer */
+	char		*text;		/* string buffer */
 	size_t		length;		/* string's real length */
 	size_t		size;		/* current allocated size */
 	int		bsize;		/* initial length */