s/sbuffer/gbuffer/g

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 *

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.
  */

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

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>

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>

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>