Merge branch 'pw/p4-docs-and-tests'

diff --git a/vcs-svn/repo_tree.c b/vcs-svn/repo_tree.c
index d722e3212fa7db5e3b3f6ddbd32765b5172b7063..c3f198d29a4b90ee5959be750de0b764b5ea59e6 100644 (file)
--- a/vcs-svn/repo_tree.c
+++ b/vcs-svn/repo_tree.c
@@ -38,7 +38,7 @@ static uint32_t mark;
 static int repo_dirent_name_cmp(const void *a, const void *b);
 
 /* Treap for directory entries */
-trp_gen(static, dent_, struct repo_dirent, children, dent, repo_dirent_name_cmp);
+trp_gen(static, dent_, struct repo_dirent, children, dent, repo_dirent_name_cmp)
 
 uint32_t next_blob_mark(void)
 {
@@ -109,7 +109,7 @@ static struct repo_dirent *repo_read_dirent(uint32_t revision,
 static void repo_write_dirent(const uint32_t *path, uint32_t mode,
                              uint32_t content_offset, uint32_t del)
 {
-       uint32_t name, revision, dir_o = ~0, parent_dir_o = ~0;
+       uint32_t name, revision, dir_o = ~0U, parent_dir_o = ~0U;
        struct repo_dir *dir;
        struct repo_dirent *key;
        struct repo_dirent *dent = NULL;
@@ -278,8 +278,9 @@ void repo_diff(uint32_t r1, uint32_t r2)
                    repo_commit_root_dir(commit_pointer(r2)));
 }
 
-void repo_commit(uint32_t revision, const char *author, char *log,
-                const char *uuid, const char *url, unsigned long timestamp)
+void repo_commit(uint32_t revision, const char *author,
+               const struct strbuf *log, const char *uuid, const char *url,
+               unsigned long timestamp)
 {
        fast_export_commit(revision, author, log, uuid, url, timestamp);
        dent_commit();