1 files changed, 18 insertions, 12 deletions

diff --git a/src/main/extractor_datasource.h b/src/main/extractor_datasource.h
index 5037377..1769a72 100644
--- a/src/main/extractor_datasource.h
+++ b/src/main/extractor_datasource.h
@@ -30,10 +30,13 @@ struct EXTRACTOR_Datasource;
  * Create a datasource from a file on disk.
  *
  * @param filename name of the file on disk
- * @return handle to the datasource
+ * @param proc metadata callback to call with meta data found upon opening
+ * @param proc_cls callback cls
+ * @return handle to the datasource, NULL on error
  */
 struct EXTRACTOR_Datasource *
-EXTRACTOR_datasource_create_from_file_ (const char *filename);
+EXTRACTOR_datasource_create_from_file_ (const char *filename,
+                                        EXTRACTOR_MetaDataProcessor proc, void *proc_cls);
 
 
 /**
@@ -41,24 +44,27 @@ EXTRACTOR_datasource_create_from_file_ (const char *filename);
  *
  * @param buf data in memory
  * @param size number of bytes in 'buf'
- * @return handle to the datasource
+ * @param proc metadata callback to call with meta data found upon opening
+ * @param proc_cls callback cls
+ * @return handle to the datasource, NULL on error
  */
 struct EXTRACTOR_Datasource *
 EXTRACTOR_datasource_create_from_buffer_ (const char *buf,
-                                          size_t size);
+                                          size_t size,
+                                          EXTRACTOR_MetaDataProcessor proc, void *proc_cls);
 
 
 /**
  * Destroy a data source.
  *
- * @param datasource source to destroy
+ * @param ds source to destroy
  */
 void
-EXTRACTOR_datasource_destroy_ (struct EXTRACTOR_Datasource *datasource);
+EXTRACTOR_datasource_destroy_ (struct EXTRACTOR_Datasource *ds);
 
 
 /**
- * Make 'size' bytes of data from the data source available at '*data'.
+ * Make 'size' bytes of data from the data source available at 'data'.
  *
  * @param cls must be a 'struct EXTRACTOR_Datasource'
  * @param data where the data should be copied to
@@ -77,12 +83,12 @@ EXTRACTOR_datasource_read_ (void *cls,
  * obtain the current position in the file.
  * 
  * @param cls must be a 'struct EXTRACTOR_Datasource'
- * @param pos position to seek (see 'man lseek')
+ * @param pos position to seek (see 'man lseek')o
  * @param whence how to see (absolute to start, relative, absolute to end)
- * @return new absolute position, UINT64_MAX on error (i.e. desired position
+ * @return new absolute position, -1 on error (i.e. desired position
  *         does not exist)
  */
-uint64_t
+int64_t
 EXTRACTOR_datasource_seek_ (void *cls,
                             uint64_t pos,
                             int whence);
@@ -92,9 +98,9 @@ EXTRACTOR_datasource_seek_ (void *cls,
  * Determine the overall size of the data source (after compression).
  * 
  * @param cls must be a 'struct EXTRACTOR_Datasource'
- * @return overall file size, UINT64_MAX on error (i.e. IPC failure)
+ * @return overall file size, -1 on error or unknown
  */ 
-uint64_t 
+int64_t 
 EXTRACTOR_datasource_get_size_ (void *cls);