From 33fa5b5d0c512c72c1d50b9420a36431cd10eb5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Mon, 18 Feb 2019 22:39:56 +0100
Subject: Made to compile as C++.

---
 strbuf.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'strbuf.c')

diff --git a/strbuf.c b/strbuf.c
index 7193b134..f17de211 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -6,7 +6,7 @@
 #include "err.h"
 
 INIT_F(strbuf) {
-	INIT(strbuf, this, 1);
+	INIT(strbuf, self, 1);
 	return 0;
 }
 
@@ -14,27 +14,27 @@ INIT_F(strbuf) {
  * Giving len < 1 is an error.
  */
 INIT_F(strbuf, size_t len) {
-	this->mem   = calloc(sizeof(*this->mem), len);
-	this->alloc = len;
-	this->ptr   = 0;
-	this->len   = 0;
+	self->mem   = (char*) calloc(sizeof(*self->mem), len);
+	self->alloc = len;
+	self->ptr   = 0;
+	self->len   = 0;
 	return 0;
 }
 
 int strbuf_realloc(strbuf* str, size_t len) {
-	str->mem = realloc(str->mem, len);
+	str->mem = (char*) realloc(str->mem, len);
 	str->alloc = len;
 	return 0;
 }
 
 FREE_F(strbuf) {
 	/* has already been freed */
-	if (this->mem == NULL) return 1;
+	if (self->mem == NULL) return 1;
 
-	free (this->mem);
-	this->mem = NULL;
-	this->alloc = 0;
-	this->len = 0;
+	free (self->mem);
+	self->mem = NULL;
+	self->alloc = 0;
+	self->len = 0;
 	return 0;
 }
 
@@ -46,7 +46,7 @@ int strbuf_append(strbuf* s, char c) {
 
 	if (s->len + 1 > s->alloc) {
 		s->alloc <<= 1;
-		s->mem = realloc(s->mem, s->alloc);
+		s->mem = (char*) realloc(s->mem, s->alloc);
 		retval = 1;
 	}
 
@@ -124,15 +124,15 @@ int strbuf_soft_reset(strbuf* s) {
 	return 0;
 }
 
-strbuf* RESOLVE(strbuf)(strbuf* dest, strbuf* new) {
-	if (dest == NULL) return new;
+strbuf* RESOLVE(strbuf)(strbuf* dest, strbuf* new_) {
+	if (dest == NULL) return new_;
 	else return dest;
 }
 
 FMT_F(strbuf) {
-	return sprintf(buf, "%s", this->mem);
+	return sprintf(buf, "%s", self->mem);
 }
 
-int SIZE(strbuf)(strbuf* this) {
-	return this->len;
+int SIZE(strbuf)(strbuf* self) {
+	return self->len;
 }
-- 
cgit v1.2.3