Skip to content
This repository has been archived by the owner on Sep 24, 2022. It is now read-only.

Commit

Permalink
Fix typos: dictio{ nn -> n }ar{y,ies}
Browse files Browse the repository at this point in the history
Signed-off-by: Jan Pokorný <[email protected]>
  • Loading branch information
jnpkrn authored and veillard committed Apr 15, 2016
1 parent 9811ce7 commit bb654fe
Show file tree
Hide file tree
Showing 20 changed files with 93 additions and 93 deletions.
24 changes: 12 additions & 12 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,7 @@ Thu Apr 24 13:56:53 CEST 2008 Daniel Veillard <[email protected]>

Tue Apr 22 10:27:17 CEST 2008 Daniel Veillard <[email protected]>

* dict.c: improvement on the hashing of the dictionnary, with visible
* dict.c: improvement on the hashing of the dictionary, with visible
speed up as the number of strings in the hash increases, work from
Stefan Behnel

Expand Down Expand Up @@ -5017,7 +5017,7 @@ Mon Jan 24 00:47:41 CET 2005 Daniel Veillard <[email protected]>
Sun Jan 23 23:54:39 CET 2005 Daniel Veillard <[email protected]>

* hash.c include/libxml/hash.h: added xmlHashCreateDict where
the hash reuses the dictionnary for internal strings
the hash reuses the dictionary for internal strings
* entities.c valid.c parser.c: reuse that new API, leads to a decent
speedup when parsing for example DocBook documents.

Expand Down Expand Up @@ -5371,7 +5371,7 @@ Fri Nov 26 11:44:36 CET 2004 Daniel Veillard <[email protected]>
Wed Nov 24 13:41:52 CET 2004 Daniel Veillard <[email protected]>

* dict.c include/libxml/dict.h: added xmlDictExists() to the
dictionnary interface.
dictionary interface.
* xmlreader.c: applying xmlTextReaderHasAttributes fix for namespaces
from Rob Richards

Expand Down Expand Up @@ -5697,7 +5697,7 @@ Tue Oct 26 23:57:02 CEST 2004 Daniel Veillard <[email protected]>
Tue Oct 26 18:09:59 CEST 2004 Daniel Veillard <[email protected]>

* debugXML.c include/libxml/xmlerror.h: added checking for names
values and dictionnaries generates a tons of errors
values and dictionaries generates a tons of errors
* SAX2.ccatalog.c parser.c relaxng.c tree.c xinclude.c xmlwriter.c
include/libxml/tree.h: fixing the errors in the regression tests

Expand Down Expand Up @@ -7746,14 +7746,14 @@ Fri Jan 23 14:03:21 CET 2004 Daniel Veillard <[email protected]>
make tests
* xpath.c include/libxml/xpath.h: added xmlXPathCtxtCompile() to
compile an XPath expression within a context, currently the goal
is to be able to reuse the XSLT stylesheet dictionnary, but this
is to be able to reuse the XSLT stylesheet dictionary, but this
opens the door to others possible optimizations.
* dict.c include/libxml/dict.h: added xmlDictCreateSub() which allows
to build a new dictionnary based on another read-only dictionnary.
This is needed for XSLT to keep the stylesheet dictionnary read-only
to build a new dictionary based on another read-only dictionary.
This is needed for XSLT to keep the stylesheet dictionary read-only
while being able to reuse the strings for the transformation
dictionnary.
* xinclude.c: fixed a dictionnar reference counting problem occuring
dictionary.
* xinclude.c: fixed a dictionary reference counting problem occuring
when document parsing failed.
* testSAX.c: adding option --repeat for timing 100times the parsing
* doc/* : rebuilt all the docs
Expand Down Expand Up @@ -7806,7 +7806,7 @@ Mon Jan 12 17:22:57 CET 2004 Daniel Veillard <[email protected]>
Thu Jan 8 17:57:50 CET 2004 Daniel Veillard <[email protected]>

* xmlschemas.c: removed a memory leak remaining from the switch
to a dictionnary for string allocations c.f. #130891
to a dictionary for string allocations c.f. #130891

Thu Jan 8 17:48:46 CET 2004 Daniel Veillard <[email protected]>

Expand Down Expand Up @@ -7928,7 +7928,7 @@ Fri Jan 2 22:58:29 HKT 2004 William Brack <[email protected]>
Fri Jan 2 11:40:06 CET 2004 Daniel Veillard <[email protected]>

* SAX2.c: found and fixed a bug misallocating some non
blank text node strings from the dictionnary.
blank text node strings from the dictionary.
* xmlmemory.c: fixed a problem with the memory debug mutex
release.

Expand Down Expand Up @@ -9386,7 +9386,7 @@ Sat Sep 27 01:25:39 CEST 2003 Daniel Veillard <[email protected]>

* parser.c: William's change allowed to spot a nasty bug in xmlDoRead
if the result is not well formed that ctxt->myDoc is not NULL
and uses the context dictionnary.
and uses the context dictionary.

Fri Sep 26 21:09:34 CEST 2003 Daniel Veillard <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion HTMLparser.c
Original file line number Diff line number Diff line change
Expand Up @@ -6537,7 +6537,7 @@ htmlNodeStatus(const htmlNodePtr node, int legacy) {
* DICT_FREE:
* @str: a string
*
* Free a string if it is not owned by the "dict" dictionnary in the
* Free a string if it is not owned by the "dict" dictionary in the
* current scope
*/
#define DICT_FREE(str) \
Expand Down
22 changes: 11 additions & 11 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -845,7 +845,7 @@ Gansterer),
- Improvement: switch parser to XML-1.0 5th edition, add parsing flags
for old versions, switch URI parsing to RFC 3986,
add xmlSchemaValidCtxtGetParserCtxt (Holger Kaelberer),
new hashing functions for dictionnaries (based on Stefan Behnel work),
new hashing functions for dictionaries (based on Stefan Behnel work),
improve handling of misplaced html/head/body in HTML parser, better
regression test tools and code coverage display, better algorithms
to detect various versions of the billion laughts attacks, make
Expand Down Expand Up @@ -1231,7 +1231,7 @@ Do not use or package 2.6.25
Bakefile support (Francesco Montorsi), Windows compilation (Joel Reed),
some gcc4 fixes, HP-UX portability fixes (Rick Jones).
- bug fixes: xmlSchemaElementDump namespace (Kasimier Buchcik), push and
xmlreader stopping on non-fatal errors, thread support for dictionnaries
xmlreader stopping on non-fatal errors, thread support for dictionaries
reference counting (Gary Coady), internal subset and push problem, URL
saved in xmlCopyDoc, various schemas bug fixes (Kasimier), Python paths
fixup (Stephane Bidoul), xmlGetNodePath and namespaces, xmlSetNsProp fix
Expand All @@ -1244,7 +1244,7 @@ Do not use or package 2.6.25
Hendricks), aliasing bug exposed by gcc4 on s390, xmlTextReaderNext bug
(Rob Richards), Schemas decimal type fixes (William Brack),
xmlByteConsumed static buffer (Ben Maurer).
- improvement: speedup parsing comments and DTDs, dictionnary support for
- improvement: speedup parsing comments and DTDs, dictionary support for
hash tables, Schemas Identity constraints (Kasimier), streaming XPath
subset, xmlTextReaderReadString added (Bjorn Reese), Schemas canonical
values handling (Kasimier), add xmlTextReaderByteConsumed (Aron
Expand Down Expand Up @@ -1454,7 +1454,7 @@ Do not use or package 2.6.25
URI on SYSTEM lookup failure, XInclude parse flags inheritance (William),
XInclude and XPointer fixes for entities (William), XML parser bug
reported by Holger Rauch, nanohttp fd leak (William), regexps char
groups '-' handling (William), dictionnary reference counting problems,
groups '-' handling (William), dictionary reference counting problems,
do not close stderr.
- performance patches from Petr Pajas
- Documentation fixes: XML_CATALOG_FILES in man pages (Mike Hommey)
Expand Down Expand Up @@ -1482,7 +1482,7 @@ Do not use or package 2.6.25
William) reported by Yuuichi Teranishi
- bugfixes: make test and path issues, xmlWriter attribute serialization
(William Brack), xmlWriter indentation (William), schemas validation
(Eric Haszlakiewicz), XInclude dictionnaries issues (William and Oleg
(Eric Haszlakiewicz), XInclude dictionaries issues (William and Oleg
Paraschenko), XInclude empty fallback (William), HTML warnings (William),
XPointer in XInclude (William), Python namespace serialization,
isolat1ToUTF8 bound error (Alfred Mickautsch), output of parameter
Expand All @@ -1503,7 +1503,7 @@ Do not use or package 2.6.25


2.6.5: Jan 25 2004:
- Bugfixes: dictionnaries for schemas (William Brack), regexp segfault
- Bugfixes: dictionaries for schemas (William Brack), regexp segfault
(William), xs:all problem (William), a number of XPointer bugfixes
(William), xmllint error go to stderr, DTD validation problem with
namespace, memory leak (William), SAX1 cleanup and minimal options fixes
Expand All @@ -1515,14 +1515,14 @@ Do not use or package 2.6.25
Fleck), doc (Sven Zimmerman), I/O example.
- Python bindings: fixes (William), enum support (Stéphane Bidoul),
structured error reporting (Stéphane Bidoul)
- XInclude: various fixes for conformance, problem related to dictionnary
- XInclude: various fixes for conformance, problem related to dictionary
references (William & me), recursion (William)
- xmlWriter: indentation (Lucas Brasilino), memory leaks (Alfred
Mickautsch),
- xmlSchemas: normalizedString datatype (John Belmonte)
- code cleanup for strings functions (William)
- Windows: compiler patches (Mark Vakoc)
- Parser optimizations, a few new XPath and dictionnary APIs for future
- Parser optimizations, a few new XPath and dictionary APIs for future
XSLT optimizations.


Expand Down Expand Up @@ -1617,8 +1617,8 @@ Do not use or package 2.6.25
of change
- Increased the library modularity, far more options can be stripped out,
a --with-minimum configuration will weight around 160KBytes
- Use per parser and per document dictionnary, allocate names and small
text nodes from the dictionnary
- Use per parser and per document dictionary, allocate names and small
text nodes from the dictionary
- Switch to a SAX2 like parser rewrote most of the XML parser core,
provides namespace resolution and defaulted attributes, minimize memory
allocations and copies, namespace checking and specific error handling,
Expand Down Expand Up @@ -1665,7 +1665,7 @@ Do not use or package 2.6.25
(William), xmlCleanupParser (Marc Liyanage), CDATA output (William), HTTP
error handling.
- xmllint options: --dtdvalidfpi for Tobias Reif, --sax1 for compat
testing, --nodict for building without tree dictionnary, --nocdata to
testing, --nodict for building without tree dictionary, --nocdata to
replace CDATA by text, --nsclean to remove surperfluous namespace
declarations
- added xml2-config --libtool-libs option from Kevin P. Fleming
Expand Down
10 changes: 5 additions & 5 deletions debugXML.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ struct _xmlDebugCtxt {
int depth; /* current depth */
xmlDocPtr doc; /* current document */
xmlNodePtr node; /* current node */
xmlDictPtr dict; /* the doc dictionnary */
xmlDictPtr dict; /* the doc dictionary */
int check; /* do just checkings */
int errors; /* number of errors found */
int nodict; /* if the document has no dictionnary */
int nodict; /* if the document has no dictionary */
int options; /* options */
};

Expand Down Expand Up @@ -243,7 +243,7 @@ xmlCtxtCheckString(xmlDebugCtxtPtr ctxt, const xmlChar * str)
* @ctxt: the debug context
* @name: the name
*
* Do debugging on the name, for example the dictionnary status and
* Do debugging on the name, for example the dictionary status and
* conformance to the Name production.
*/
static void
Expand All @@ -265,7 +265,7 @@ xmlCtxtCheckName(xmlDebugCtxtPtr ctxt, const xmlChar * name)
((ctxt->doc == NULL) ||
((ctxt->doc->parseFlags & (XML_PARSE_SAX1 | XML_PARSE_NODICT)) == 0))) {
xmlDebugErr3(ctxt, XML_CHECK_OUTSIDE_DICT,
"Name is not from the document dictionnary '%s'",
"Name is not from the document dictionary '%s'",
(const char *) name);
}
}
Expand All @@ -292,7 +292,7 @@ xmlCtxtGenericNodeCheck(xmlDebugCtxtPtr ctxt, xmlNodePtr node) {
/* desactivated right now as it raises too many errors */
if (doc->type == XML_DOCUMENT_NODE)
xmlDebugErr(ctxt, XML_CHECK_NO_DICT,
"Document has no dictionnary\n");
"Document has no dictionary\n");
#endif
ctxt->nodict = 1;
}
Expand Down
50 changes: 25 additions & 25 deletions dict.c
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ typedef unsigned __int32 uint32_t;
#endif /* WITH_BIG_KEY */

/*
* An entry in the dictionnary
* An entry in the dictionary
*/
typedef struct _xmlDictEntry xmlDictEntry;
typedef xmlDictEntry *xmlDictEntryPtr;
Expand All @@ -110,7 +110,7 @@ struct _xmlDictStrings {
xmlChar array[1];
};
/*
* The entire dictionnary
* The entire dictionary
*/
struct _xmlDict {
int ref_counter;
Expand Down Expand Up @@ -229,7 +229,7 @@ xmlDictCleanup(void) {

/*
* xmlDictAddString:
* @dict: the dictionnary
* @dict: the dictionary
* @name: the name of the userdata
* @len: the length of the name
*
Expand Down Expand Up @@ -291,7 +291,7 @@ xmlDictAddString(xmlDictPtr dict, const xmlChar *name, unsigned int namelen) {

/*
* xmlDictAddQString:
* @dict: the dictionnary
* @dict: the dictionary
* @prefix: the prefix of the userdata
* @plen: the prefix length
* @name: the name of the userdata
Expand Down Expand Up @@ -533,7 +533,7 @@ xmlDictComputeFastQKey(const xmlChar *prefix, int plen,
*
* Create a new dictionary
*
* Returns the newly created dictionnary, or NULL if an error occured.
* Returns the newly created dictionary, or NULL if an error occured.
*/
xmlDictPtr
xmlDictCreate(void) {
Expand Down Expand Up @@ -573,14 +573,14 @@ xmlDictCreate(void) {

/**
* xmlDictCreateSub:
* @sub: an existing dictionnary
* @sub: an existing dictionary
*
* Create a new dictionary, inheriting strings from the read-only
* dictionnary @sub. On lookup, strings are first searched in the
* new dictionnary, then in @sub, and if not found are created in the
* new dictionnary.
* dictionary @sub. On lookup, strings are first searched in the
* new dictionary, then in @sub, and if not found are created in the
* new dictionary.
*
* Returns the newly created dictionnary, or NULL if an error occured.
* Returns the newly created dictionary, or NULL if an error occured.
*/
xmlDictPtr
xmlDictCreateSub(xmlDictPtr sub) {
Expand All @@ -599,7 +599,7 @@ xmlDictCreateSub(xmlDictPtr sub) {

/**
* xmlDictReference:
* @dict: the dictionnary
* @dict: the dictionary
*
* Increment the reference counter of a dictionary
*
Expand All @@ -620,10 +620,10 @@ xmlDictReference(xmlDictPtr dict) {

/**
* xmlDictGrow:
* @dict: the dictionnary
* @size: the new size of the dictionnary
* @dict: the dictionary
* @size: the new size of the dictionary
*
* resize the dictionnary
* resize the dictionary
*
* Returns 0 in case of success, -1 in case of failure
*/
Expand Down Expand Up @@ -755,7 +755,7 @@ xmlDictGrow(xmlDictPtr dict, size_t size) {

/**
* xmlDictFree:
* @dict: the dictionnary
* @dict: the dictionary
*
* Free the hash @dict and its contents. The userdata is
* deallocated with @f if provided.
Expand Down Expand Up @@ -817,11 +817,11 @@ xmlDictFree(xmlDictPtr dict) {

/**
* xmlDictLookup:
* @dict: the dictionnary
* @dict: the dictionary
* @name: the name of the userdata
* @len: the length of the name, if -1 it is recomputed
*
* Add the @name to the dictionnary @dict if not present.
* Add the @name to the dictionary @dict if not present.
*
* Returns the internal copy of the name or NULL in case of internal error
*/
Expand Down Expand Up @@ -957,11 +957,11 @@ xmlDictLookup(xmlDictPtr dict, const xmlChar *name, int len) {

/**
* xmlDictExists:
* @dict: the dictionnary
* @dict: the dictionary
* @name: the name of the userdata
* @len: the length of the name, if -1 it is recomputed
*
* Check if the @name exists in the dictionnary @dict.
* Check if the @name exists in the dictionary @dict.
*
* Returns the internal copy of the name or NULL if not found.
*/
Expand Down Expand Up @@ -1065,7 +1065,7 @@ xmlDictExists(xmlDictPtr dict, const xmlChar *name, int len) {

/**
* xmlDictQLookup:
* @dict: the dictionnary
* @dict: the dictionary
* @prefix: the prefix
* @name: the name
*
Expand Down Expand Up @@ -1170,7 +1170,7 @@ xmlDictQLookup(xmlDictPtr dict, const xmlChar *prefix, const xmlChar *name) {

/**
* xmlDictOwns:
* @dict: the dictionnary
* @dict: the dictionary
* @str: the string
*
* check if a string is owned by the disctionary
Expand All @@ -1197,11 +1197,11 @@ xmlDictOwns(xmlDictPtr dict, const xmlChar *str) {

/**
* xmlDictSize:
* @dict: the dictionnary
* @dict: the dictionary
*
* Query the number of elements installed in the hash @dict.
*
* Returns the number of elements in the dictionnary or
* Returns the number of elements in the dictionary or
* -1 in case of error
*/
int
Expand All @@ -1215,7 +1215,7 @@ xmlDictSize(xmlDictPtr dict) {

/**
* xmlDictSetLimit:
* @dict: the dictionnary
* @dict: the dictionary
* @limit: the limit in bytes
*
* Set a size limit for the dictionary
Expand All @@ -1236,7 +1236,7 @@ xmlDictSetLimit(xmlDictPtr dict, size_t limit) {

/**
* xmlDictGetUsage:
* @dict: the dictionnary
* @dict: the dictionary
*
* Get how much memory is used by a dictionary for strings
* Added in 2.9.0
Expand Down
Loading

0 comments on commit bb654fe

Please sign in to comment.