XML: removed some obsolete parameters

diff --git a/sherlock/xml/source.c b/sherlock/xml/source.c
index af70644d9ead1d13bc1ad45858f1e979cf40c4fa..657268df3f07e4a765243ad29eb042dfada0e6b4 100644 (file)
--- a/sherlock/xml/source.c
+++ b/sherlock/xml/source.c
@@ -80,7 +80,7 @@ xml_push_source(struct xml_context *ctx)
   src->next = ctx->src;
   src->saved_depth = ctx->depth;
   ctx->src = src;
-  ctx->flags &= ~(XML_SRC_EOF | XML_SRC_EXPECTED_DECL | XML_SRC_NEW_LINE | XML_SRC_SURROUND | XML_SRC_DOCUMENT);
+  ctx->flags &= ~(XML_SRC_EOF | XML_SRC_EXPECTED_DECL | XML_SRC_NEW_LINE | XML_SRC_DOCUMENT);
   ctx->bstop = ctx->bptr = src->buf;
   ctx->depth = 0;
   return src;
@@ -218,8 +218,6 @@ void xml_parse_decl(struct xml_context *ctx);
       else                                                                             \
         {                                                                              \
          /* EOF */                                                                     \
-         if (f & XML_SRC_SURROUND)                                                     \
-           xml_add_char(&bstop, 0x20);                                                 \
           f |= XML_SRC_EOF;                                                            \
           break;                                                                       \
        }                                                                               \

diff --git a/sherlock/xml/xml.h b/sherlock/xml/xml.h
index bd4f9ffe522eadabacd46580b243e817e367e4ce..6a327ec1bd56c886e896da0a76360681bb0c4352 100644 (file)
--- a/sherlock/xml/xml.h
+++ b/sherlock/xml/xml.h
@@ -89,9 +89,8 @@ enum xml_flags {
   XML_SRC_EOF =                                0x00100000,     /* EOF reached */
   XML_SRC_EXPECTED_DECL =              0x00200000,     /* Just before optional or required XMLDecl/TextDecl */
   XML_SRC_NEW_LINE =                   0x00400000,     /* The last read character is 0xD */
-  XML_SRC_SURROUND =                   0x00800000,     /* Surround the text with 0x20 (references to parameter entities) */
-  XML_SRC_DOCUMENT =                   0x01000000,     /* The document entity */
-  XML_SRC_EXTERNAL =                   0x02000000,     /* An external entity */
+  XML_SRC_DOCUMENT =                   0x00800000,     /* The document entity */
+  XML_SRC_EXTERNAL =                   0x01000000,     /* An external entity */
 };
 
 enum xml_node_type {
@@ -211,11 +210,6 @@ struct xml_context {
   struct xml_dtd *dtd;                                 /* The DTD structure (or NULL) */
   uns state;                                           /* Current state for the PULL interface (XML_STATE_x) */
   uns pull;                                            /* Parameters for the PULL interface (XML_PULL_x) */
-
-  void (*start_entity)(struct xml_context *ctx);
-  void (*end_entity)(struct xml_context *ctx);
-  void (*notation_decl)(struct xml_context *ctx);
-  void (*unparsed_entity_decl)(struct xml_context *ctx);
 };
 
 /* Initialize XML context */