You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@corinthia.apache.org by pm...@apache.org on 2015/04/24 18:18:20 UTC
[53/55] [abbrv] incubator-corinthia git commit: Revert the '; ;
' "fix", since VC needs them.
Revert the ';;' "fix", since VC needs them.
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/42e833ab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/42e833ab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/42e833ab
Branch: refs/heads/stable
Commit: 42e833abc3f84dfd840f0f7af997f4bae90db265
Parents: b552819
Author: Gabriela Gibson <gb...@apache.org>
Authored: Thu Apr 16 17:24:22 2015 +0100
Committer: Gabriela Gibson <gb...@apache.org>
Committed: Thu Apr 16 17:24:22 2015 +0100
----------------------------------------------------------------------
DocFormats/core/src/xml/DFChanges.c | 2 +-
DocFormats/core/src/xml/DFNameMap.c | 14 +++++++-------
DocFormats/core/src/xml/DFXML.c | 10 +++++-----
3 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/42e833ab/DocFormats/core/src/xml/DFChanges.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/xml/DFChanges.c b/DocFormats/core/src/xml/DFChanges.c
index 8b1ebe5..c67b0f0 100644
--- a/DocFormats/core/src/xml/DFChanges.c
+++ b/DocFormats/core/src/xml/DFChanges.c
@@ -129,7 +129,7 @@ static void DFRecordChanges(DFNode *parent1, Tag idAttr, DFHashTable *map)
parent1->changed = 1; // keep going - still want to check the children
if (!identicalAttributesExcept(parent1,parent2,0))
- parent1->changed = 1; // keep going - still want to check the children
+ parent1->changed = 1;; // keep going - still want to check the children
DFNode *child1 = parent1->first;
DFNode *child2 = parent2->first;
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/42e833ab/DocFormats/core/src/xml/DFNameMap.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/xml/DFNameMap.c b/DocFormats/core/src/xml/DFNameMap.c
index a175944..eb5d868 100644
--- a/DocFormats/core/src/xml/DFNameMap.c
+++ b/DocFormats/core/src/xml/DFNameMap.c
@@ -64,7 +64,7 @@ static uint32_t DFNameHashTableHash(const char *name, const char *URI)
static const DFNameEntry *DFNameHashTableGet(DFNameHashTable *table, const char *name, const char *URI)
{
if (URI == NULL)
- URI = "";
+ URI = "";;
uint32_t hash = DFNameHashTableHash(name,URI)%HASH_TABLE_SIZE;
for (DFNameEntry *entry = table->bins[hash]; entry != NULL; entry = entry->next) {
if (!strcmp(name,entry->name) && !strcmp(URI,entry->URI))
@@ -77,7 +77,7 @@ static void DFNameHashTableAdd(DFNameHashTable *table, const char *name, const c
Tag tag, unsigned int namespaceID)
{
if (URI == NULL)
- URI = "";
+ URI = "";;
uint32_t hash = DFNameHashTableHash(name,URI)%HASH_TABLE_SIZE;
DFNameEntry *entry = (DFNameEntry *)xmalloc(sizeof(DFNameEntry));
entry->name = xstrdup(name);
@@ -218,7 +218,7 @@ void DFNameMapFree(DFNameMap *map)
static NamespaceID NameMap_namespaceIDForURI(DFNameMap *map, const char *URI)
{
if (URI == NULL)
- return NAMESPACE_NULL;
+ return NAMESPACE_NULL;;
DFNamespaceInfo *ns = DFHashTableLookup(map->namespacesByURI,(const char *)URI);
if (ns == NULL) {
ns = DFHashTableLookup(defaultNamespacesByURI,(const char *)URI);
@@ -246,7 +246,7 @@ NamespaceID DFNameMapFoundNamespace(DFNameMap *map, const char *URI, const char
return existing->nsId;
existing = DFHashTableLookup(map->namespacesByURI,(const char *)URI);
if (existing != NULL)
- return existing->nsId;
+ return existing->nsId;;
NamespaceID nsId = map->nextNamespaceId++;
DFNameMapAddNamespace(map,nsId,URI,prefix);
return nsId;
@@ -255,7 +255,7 @@ NamespaceID DFNameMapFoundNamespace(DFNameMap *map, const char *URI, const char
const NamespaceDecl *DFNameMapNamespaceForID(DFNameMap *map, NamespaceID nsId)
{
if (nsId < PREDEFINED_NAMESPACE_COUNT)
- return &PredefinedNamespaces[nsId];
+ return &PredefinedNamespaces[nsId];;
DFNamespaceInfo *ns = DFHashTableLookupInt(map->namespacesByID,nsId);
assert(ns != NULL);
return ns->decl;
@@ -269,7 +269,7 @@ NamespaceID DFNameMapNamespaceCount(DFNameMap *map)
const TagDecl *DFNameMapNameForTag(DFNameMap *map, Tag tag)
{
if (tag < PREDEFINED_TAG_COUNT)
- return &PredefinedTags[tag];
+ return &PredefinedTags[tag];;
DFTagInfo *info = DFHashTableLookupInt(map->tagsByID,tag);
assert(info != NULL);
return info->decl;
@@ -282,7 +282,7 @@ Tag DFNameMapTagForName(DFNameMap *map, const char *URI, const char *localName)
entry = DFNameHashTableGet(map->localTagsByNameURI,localName,URI);
if (entry != NULL)
- return entry->tag;
+ return entry->tag;;
// Dynamically allocate new tag
NamespaceID nsId = NameMap_namespaceIDForURI(map,URI);
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/42e833ab/DocFormats/core/src/xml/DFXML.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/xml/DFXML.c b/DocFormats/core/src/xml/DFXML.c
index 4c9ea3e..449f2e1 100644
--- a/DocFormats/core/src/xml/DFXML.c
+++ b/DocFormats/core/src/xml/DFXML.c
@@ -239,7 +239,7 @@ static void SAXComment(void *ctx, const xmlChar *value)
{
DFSAXParser *parser = (DFSAXParser *)ctx;
if (parser->ignoreDepth > 0)
- return;
+ return;;
DFNode *comment = DFCreateComment(parser->document,(const char *)value);
assert(parser->parent != NULL);
DFAppendChild(parser->parent,comment);
@@ -263,7 +263,7 @@ static void SAXProcessingInstruction(void *ctx, const xmlChar *target, const xml
{
DFSAXParser *parser = (DFSAXParser *)ctx;
if (parser->ignoreDepth > 0)
- return;
+ return;;
DFNode *pi = DFCreateProcessingInstruction(parser->document,(const char *)target,(const char *)data);
assert(parser->parent != NULL);
DFAppendChild(parser->parent,pi);
@@ -334,7 +334,7 @@ static void writeNode(Serialization *serialization, DFNode *node, int depth);
static void findUsedNamespaces(DFDocument *doc, DFNode *node, char *used, NamespaceID count)
{
if (node->tag < MIN_ELEMENT_TAG)
- return;
+ return;;
const TagDecl *tagDecl = DFNameMapNameForTag(doc->map,node->tag);
assert(tagDecl != NULL);
assert(tagDecl->namespaceID < count);
@@ -554,7 +554,7 @@ DFDocument *DFParseXMLFile(const char *filename, DFError **error)
{
DFBuffer *buf = DFBufferReadFromFile(filename,error);
if (buf == NULL)
- return NULL;
+ return NULL;;
DFDocument *doc = DFParseXMLString(buf->data,error);
DFBufferRelease(buf);
return doc;
@@ -564,7 +564,7 @@ DFDocument *DFParseXMLStorage(DFStorage *storage, const char *filename, DFError
{
DFBuffer *content = DFBufferReadFromStorage(storage,filename,error);
if (content == NULL)
- return NULL;
+ return NULL;;
DFDocument *doc = DFParseXMLString(content->data,error);
DFBufferRelease(content);
return doc;