README.md

@@ -41,7 +41,7 @@ TODO: signed integer writing
     }
     
     static void on_exit_element(EBMLReader *reader) {
-      // If needed, the exitee element ID can be found at `reader->idStack[reader->currentDepth - 1]`.
+      // If needed, the current element ID can be found at `reader->inside.id`.
       
       // Use accumulated buffer here.
       

eebie/reader.h

@@ -5,10 +5,6 @@
 
 #include"ebml.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include<stddef.h>
 #include<stdint.h>
 
@@ -46,11 +42,7 @@ typedef struct EBMLReader {
 	void *ud;
 } EBMLReader;
 
-void ebml_reader_init(EBMLReader*);
-int ebml_reader_feed(EBMLReader*, const uint8_t *data, size_t length);
-
-#ifdef __cplusplus
-}
-#endif
+void ebml_reader_init(EBMLReader *this);
+int ebml_reader_feed(EBMLReader *this, const uint8_t *data, size_t length);
 
 #endif

eebie/writer.h

@@ -6,10 +6,6 @@
 #include<stddef.h>
 #include<stdbool.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define EBML_WRITE_MAXIMUM_DEPTH 128
 
 struct EBMLWriter;
@@ -31,19 +27,15 @@ typedef struct EBMLWriter {
 	void *ud;
 } EBMLWriter;
 
-void ebml_writer_init(EBMLWriter*);
-void ebml_writer_free(EBMLWriter*);
+void ebml_writer_init(EBMLWriter *this);
+void ebml_writer_free(EBMLWriter *this);
 
-void ebml_writer_push_ind(EBMLWriter*, uint64_t id);
-void ebml_writer_push(EBMLWriter*, uint64_t id);
-void ebml_writer_pop(EBMLWriter*);
+void ebml_writer_push_ind(EBMLWriter *this, uint64_t id);
+void ebml_writer_push(EBMLWriter *this, uint64_t id);
+void ebml_writer_pop(EBMLWriter *this);
 
-bool ebml_writer_flush(EBMLWriter*);
+bool ebml_writer_flush(EBMLWriter *this);
 
-void ebml_writer_put(EBMLWriter*, uint64_t id, EBMLElementType type, EBMLPrimitive primitive);
-
-#ifdef __cplusplus
-}
-#endif
+void ebml_writer_put(EBMLWriter *this, uint64_t id, EBMLElementType type, EBMLPrimitive primitive);
 
 #endif