Merge commit 'upstream/1.4.8'

Conflicts:
	debian/changelog
	debian/control
	debian/libconfig++9-dev.install
	debian/libconfig8.install
	debian/libconfig9-dev.install
	debian/rules

1 files changed, 24 insertions, 21 deletions

diff --git a/private.h b/lib/strbuf.h
index a0b1624..62cd782 100644
--- a/private.h
+++ b/lib/strbuf.h
@@ -1,37 +1,40 @@
 /* ----------------------------------------------------------------------------
-   libconfig - A structured configuration file parsing library
-   Copyright (C) 2005  Mark A Lindner
- 
+   libconfig - A library for processing structured configuration files
+   Copyright (C) 2005-2010  Mark A Lindner
+
    This file is part of libconfig.
-    
+
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public License
    as published by the Free Software Foundation; either version 2.1 of
    the License, or (at your option) any later version.
-    
+
    This library is distributed in the hope that it will be useful, but
    WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
-    
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+
+   You should have received a copy of the GNU Library General Public
+   License along with this library; if not, see
+   <http://www.gnu.org/licenses/>.
    ----------------------------------------------------------------------------
 */
 
-#ifndef __libconfig_private_h
-#define __libconfig_private_h
+#ifndef __libconfig_strbuf_h
+#define __libconfig_strbuf_h
 
-#include "libconfig.h"
+#include <string.h>
+#include <sys/types.h>
 
-struct parse_context
+typedef struct
 {
-  config_t *config;
-  config_setting_t *parent;
-  config_setting_t *setting;
-  char *name;
-};
-
-// ---------------------------------------------------------------------------
-#endif // __libconfig_private_h
+  char *string;
+  size_t length;
+  size_t capacity;
+} strbuf_t;
+
+char *strbuf_release(strbuf_t *buf);
+
+void strbuf_append(strbuf_t *buf, const char *text);
+
+#endif /* __libconfig_strbuf_h */