[aravis] chunk_parser: don't leak error quark API



commit f46c32bb63bcf6b17230330a40402b8cab71b8ba
Author: Emmanuel Pacaud <emmanuel gnome org>
Date:   Tue Aug 19 18:57:53 2014 +0200

    chunk_parser: don't leak error quark API

 docs/reference/aravis/Makefile.am         |    7 ++++---
 docs/reference/aravis/aravis-sections.txt |    1 -
 src/Makefile.am                           |    3 ++-
 src/arvchunkparser.c                      |    2 +-
 src/arvchunkparser.h                      |    4 ----
 src/arvgcport.c                           |    2 +-
 6 files changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/docs/reference/aravis/Makefile.am b/docs/reference/aravis/Makefile.am
index b1e826c..b0f9f9c 100644
--- a/docs/reference/aravis/Makefile.am
+++ b/docs/reference/aravis/Makefile.am
@@ -61,9 +61,10 @@ EXTRA_HFILES=
 # Header files to ignore when scanning. Use base file name, no paths
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
 IGNORE_HFILES=\
-       arvenumtypes.h          \
-       arvconfig.h             \
-       arvbufferprivate.h      \
+       arvenumtypes.h                  \
+       arvconfig.h                     \
+       arvbufferprivate.h              \
+       arvchunkparserprivate.h         \
        arv.h
 
 # Images to copy into HTML directory.
diff --git a/docs/reference/aravis/aravis-sections.txt b/docs/reference/aravis/aravis-sections.txt
index afd1053..1f30c1b 100644
--- a/docs/reference/aravis/aravis-sections.txt
+++ b/docs/reference/aravis/aravis-sections.txt
@@ -301,7 +301,6 @@ ARV_TYPE_CHUNK_PARSER
 <SUBSECTION Private>
 ArvChunkParserPrivate
 ARV_CHUNK_PARSER_ERROR
-arv_chunk_parser_error_quark
 </SECTION>
 
 <SECTION>
diff --git a/src/Makefile.am b/src/Makefile.am
index 0497017..8ac9930 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -148,7 +148,8 @@ ARAVIS_HDRS_NO_INTRO =                              \
        arvgvsp.h
 
 noinst_HEADERS =                               \
-       arvbufferprivate.h
+       arvbufferprivate.h                      \
+       arvchunkparserprivate.h
 
 arv_fake_cameradir = $(aravis_datadir)
 arv_fake_camera_DATA = arv-fake-camera.xml
diff --git a/src/arvchunkparser.c b/src/arvchunkparser.c
index 719ca52..d8df3cc 100644
--- a/src/arvchunkparser.c
+++ b/src/arvchunkparser.c
@@ -28,7 +28,7 @@
  * for the extraction of chunk data stored in the stream payload.
  */
 
-#include <arvchunkparser.h>
+#include <arvchunkparserprivate.h>
 #include <arvbuffer.h>
 #include <arvgcinteger.h>
 #include <arvgcfloat.h>
diff --git a/src/arvchunkparser.h b/src/arvchunkparser.h
index 801eadc..13c29b9 100644
--- a/src/arvchunkparser.h
+++ b/src/arvchunkparser.h
@@ -28,8 +28,6 @@
 
 G_BEGIN_DECLS
 
-#define ARV_CHUNK_PARSER_ERROR arv_chunk_parser_error_quark()
-
 /**
  * ArvChunkParserStatus:
  * @ARV_CHUNK_PARSER_STATUS_UNKNOWN: unknown status
@@ -67,8 +65,6 @@ struct _ArvChunkParserClass {
 
 GType arv_chunk_parser_get_type (void);
 
-GQuark                         arv_chunk_parser_error_quark            (void);
-
 ArvChunkParser *       arv_chunk_parser_new                    (const char *xml, gsize size);
 const char *           arv_chunk_parser_get_string_value       (ArvChunkParser *parser, ArvBuffer *buffer, 
const char *chunk);
 gint64                 arv_chunk_parser_get_integer_value      (ArvChunkParser *parser, ArvBuffer *buffer, 
const char *chunk); 
diff --git a/src/arvgcport.c b/src/arvgcport.c
index 147ea8d..9010874 100644
--- a/src/arvgcport.c
+++ b/src/arvgcport.c
@@ -28,7 +28,7 @@
 #include <arvgcport.h>
 #include <arvgcregisterdescriptionnode.h>
 #include <arvdevice.h>
-#include <arvchunkparser.h>
+#include <arvchunkparserprivate.h>
 #include <arvbuffer.h>
 #include <arvgcpropertynode.h>
 #include <arvgc.h>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]