Changeset a978dfc79bb261749d8bab1fbbb61d554a3f6418

Timestamp:

06/22/08 23:41:25 (5 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

5cfffd934afa1f4352f56daee3be948e72de8685

Children:

8b020ddf395e7133fa3900592b83f95864479578

git-committer:

Armin Burgmeier <armin@arbur.net> / 2008-06-22T23:41:25Z+0200

Message:

Fixed a missing return value in load_document in documentinfostorage.cpp

2008-06-22 Armin Burgmeier <armin@…>

• src/operations/documentinfostorage.cpp: Added return value for load_document, fixed storage of "root" node (was in top-level <documents> instead of <document>),

• src/operations/operation-open.cpp: Added a TODO comment to remmove memmove.

Files:

• ChangeLog (modified) (1 diff)
• src/operations/documentinfostorage.cpp (modified) (2 diffs)
• src/operations/operation-open.cpp (modified) (1 diff)

ChangeLog

@@ +1 @@
+2008-06-22  Armin Burgmeier  <armin@0x539.de>
+
+        * src/operations/documentinfostorage.cpp: Added return value for
+        load_document, fixed storage of "root" node (was in top-level
+        <documents> instead of <document>), 
+
+        * src/operations/operation-open.cpp: Added a TODO comment to remmove
+        memmove.
+
 2008-06-22  Armin Burgmeier  <armin@0x539.de>
 

src/operations/documentinfostorage.cpp

@@ -79 +79 @@
                                 info.encoding = text->get_content();
                 }
+
+                return root;
         }
 
@@ -165 +167 @@
                         xmlpp::Element* child = root->add_child("document");
 
-                        xmlpp::Element* root_child = root->add_child("root");
+                        xmlpp::Element* root_child = child->add_child("root");
                         root_child->set_child_text(iter->first);
 

src/operations/operation-open.cpp

@@ -250 +250 @@
         const char to_find[] = { '\r', '\n', '\0' };
 
+        /* TODO: Write directly into the buffer here,
+         * instead of memmoving stuff. */
         while( (pos = std::find_first_of<char*>(prev, outbuf,
                 to_find, to_find + sizeof(to_find))) != outbuf)