From ed8847a9cbaffc567a7e133f2402087e6f6650cf Mon Sep 17 00:00:00 2001
From: Willem Toorop <willem@nlnetlabs.nl>
Date: Tue, 9 Sep 2014 16:49:57 +0200
Subject: [PATCH] s/sbuffer/gbuffer/g

---
 src/gldns/{sbuffer.c => gbuffer.c} | 2 +-
 src/gldns/{sbuffer.h => gbuffer.h} | 2 +-
 src/gldns/import.sh                | 4 +++-
 src/gldns/parse.c                  | 2 +-
 src/gldns/str2wire.c               | 2 +-
 src/gldns/wire2str.c               | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)
 rename src/gldns/{sbuffer.c => gbuffer.c} (99%)
 rename src/gldns/{sbuffer.h => gbuffer.h} (99%)

diff --git a/src/gldns/sbuffer.c b/src/gldns/gbuffer.c
similarity index 99%
rename from src/gldns/sbuffer.c
rename to src/gldns/gbuffer.c
index db19ef42..26d092e5 100644
--- a/src/gldns/sbuffer.c
+++ b/src/gldns/gbuffer.c
@@ -12,7 +12,7 @@
  * This file contains the definition of gldns_buffer, and functions to manipulate those.
  */
 #include "config.h"
-#include "gldns/sbuffer.h"
+#include "gldns/gbuffer.h"
 #include <stdarg.h>
 
 gldns_buffer *
diff --git a/src/gldns/sbuffer.h b/src/gldns/gbuffer.h
similarity index 99%
rename from src/gldns/sbuffer.h
rename to src/gldns/gbuffer.h
index 01806310..70ef08b2 100644
--- a/src/gldns/sbuffer.h
+++ b/src/gldns/gbuffer.h
@@ -88,7 +88,7 @@ gldns_write_uint32(void *dst, uint32_t data)
 
 
 /**
- * \file sbuffer.h
+ * \file gbuffer.h
  *
  * This file contains the definition of gldns_buffer, and functions to manipulate those.
  */
diff --git a/src/gldns/import.sh b/src/gldns/import.sh
index af1c9904..c8223903 100755
--- a/src/gldns/import.sh
+++ b/src/gldns/import.sh
@@ -5,6 +5,8 @@
 svn co http://unbound.net/svn/trunk/ldns/
 for f in ldns/*.[ch]
 do
-	sed -e 's/sldns_/gldns_/g' -e 's/LDNS_/GLDNS_/g' -e 's/include "ldns/include "gldns/g' -e 's/<ldns\/rrdef\.h>/"gldns\/rrdef.h"/g' $f > ${f#ldns/}
+	sed -e 's/sldns_/gldns_/g' -e 's/LDNS_/GLDNS_/g' -e 's/include "ldns/include "gldns/g' -e 's/<ldns\/rrdef\.h>/"gldns\/rrdef.h"/g' -e 's/sbuffer\.h/gbuffer.h/g' $f > ${f#ldns/}
 done
+mv sbuffer.h gbuffer.h
+mv sbuffer.c gbuffer.c
 rm -r ldns
diff --git a/src/gldns/parse.c b/src/gldns/parse.c
index 7e1e4534..e15b4780 100644
--- a/src/gldns/parse.c
+++ b/src/gldns/parse.c
@@ -10,7 +10,7 @@
 #include "config.h"
 #include "gldns/parse.h"
 #include "gldns/parseutil.h"
-#include "gldns/sbuffer.h"
+#include "gldns/gbuffer.h"
 
 #include <limits.h>
 #include <strings.h>
diff --git a/src/gldns/str2wire.c b/src/gldns/str2wire.c
index e01e63ef..937c7c79 100644
--- a/src/gldns/str2wire.c
+++ b/src/gldns/str2wire.c
@@ -14,7 +14,7 @@
 #include "config.h"
 #include "gldns/str2wire.h"
 #include "gldns/wire2str.h"
-#include "gldns/sbuffer.h"
+#include "gldns/gbuffer.h"
 #include "gldns/parse.h"
 #include "gldns/parseutil.h"
 #include <ctype.h>
diff --git a/src/gldns/wire2str.c b/src/gldns/wire2str.c
index ca1381a2..fcd9e554 100644
--- a/src/gldns/wire2str.c
+++ b/src/gldns/wire2str.c
@@ -20,7 +20,7 @@
 #include "gldns/rrdef.h"
 #include "gldns/pkthdr.h"
 #include "gldns/parseutil.h"
-#include "gldns/sbuffer.h"
+#include "gldns/gbuffer.h"
 #include "gldns/keyraw.h"
 #ifdef HAVE_TIME_H
 #include <time.h>